Committing customer/vendor address save fix

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2093 4979c152-3d1c-0410-bac9-87ea11338e46

2 files changed, 5 insertions, 6 deletions

diff --git a/UI/Contact/contact.html b/UI/Contact/contact.html
index 2acd274f..759d374b 100644
--- a/UI/Contact/contact.html
+++ b/UI/Contact/contact.html
@@ -473,7 +473,7 @@ problems with multi-word single-quoted constructs in PI tags. -CT  -->
 			value_attr = "id"
 			default_values = [country]
 			options = country_list
-			name = "country"
+			name = "country_code"
 			label = text('Country:') 
 		} ?>
 	</div>
diff --git a/sql/modules/Company.sql b/sql/modules/Company.sql
index feddd8e0..faffe92e 100644
--- a/sql/modules/Company.sql
+++ b/sql/modules/Company.sql
@@ -396,17 +396,16 @@ CREATE OR REPLACE FUNCTION company__next_id() returns bigint as $$
 $$ language 'sql';
 
 CREATE OR REPLACE FUNCTION company__location_save (
-    in_company_id int,
+    in_entity_id int, in_location_id int,
     in_location_class int, in_line_one text, in_line_two text, 
-    in_city_province TEXT, in_mail_code text, in_country_code int,
+    in_city TEXT, in_state TEXT, in_mail_code text, in_country_code int,
     in_created date
 ) returns int AS $$
     BEGIN
     return _entity_location_save(
-        in_company_id,
+        in_entity_id, in_location_id,
         in_location_class, in_line_one, in_line_two, 
-        in_city_province , in_mail_code, in_country_code,
-        in_created);
+        '', in_city , in_state, in_mail_code, in_country_code);
     END;
 
 $$ language 'plpgsql';