Index: openacs-4/packages/contacts/sql/postgresql/contacts-list-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/sql/postgresql/contacts-list-create.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/sql/postgresql/contacts-list-create.sql	26 Jun 2006 06:36:51 -0000	1.1
+++ openacs-4/packages/contacts/sql/postgresql/contacts-list-create.sql	3 Jan 2021 15:33:17 -0000	1.2
@@ -118,11 +118,11 @@
         'acs_object',
         null, 
         0, 
-        null,
+        cast(null as integer),
         'acs_object', 
         null,
         0, 
-        null
+        cast(null as integer)
     );
 
 select define_function_args('contact_owner__new','rel_id,rel_type;contact_owner,object_id_one,object_id_two,creation_user,creation_ip');
Index: openacs-4/packages/contacts/tcl/contacts-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-install-procs.tcl,v
diff -u -r1.30 -r1.31
--- openacs-4/packages/contacts/tcl/contacts-install-procs.tcl	12 Aug 2018 12:30:06 -0000	1.30
+++ openacs-4/packages/contacts/tcl/contacts-install-procs.tcl	3 Jan 2021 15:33:17 -0000	1.31
@@ -94,7 +94,7 @@
     content::type::attribute::new \
 	-content_type "contact_complaint" \
 	-attribute_name "turnover" \
-	-datatype "money" \
+	-datatype "currency" \
 	-pretty_name "Turnover" \
 	-sort_order 2 \
 	-column_spec "float"
@@ -118,7 +118,7 @@
     content::type::attribute::new \
 	-content_type "contact_complaint" \
 	-attribute_name "paid" \
-	-datatype "money" \
+	-datatype "currency" \
 	-pretty_name "Paid" \
 	-sort_order 5 \
 	-column_spec "float"
@@ -153,7 +153,7 @@
     content::type::attribute::new \
 	-content_type "contact_complaint" \
 	-attribute_name "refund_amount" \
-	-datatype "money" \
+	-datatype "currency" \
 	-pretty_name "Refund Amount" \
 	-sort_order 9 \
 	-column_spec "float"
@@ -444,7 +444,7 @@
 		content::type::attribute::new \
 		    -content_type "contact_complaint" \
 		    -attribute_name "turnover" \
-		    -datatype "money" \
+		    -datatype "currency" \
 		    -pretty_name "Turnover" \
 		    -sort_order 2 \
 		    -column_spec "float"
@@ -468,7 +468,7 @@
 		content::type::attribute::new \
 		    -content_type "contact_complaint" \
 		    -attribute_name "paid" \
-		    -datatype "money" \
+		    -datatype "currency" \
 		    -pretty_name "Paid" \
 		    -sort_order 5 \
 		    -column_spec "float"
@@ -520,7 +520,7 @@
 		content::type::attribute::new \
 		    -content_type "contact_complaint" \
 		    -attribute_name "refund_amount" \
-		    -datatype "money" \
+		    -datatype "currency" \
 		    -pretty_name "Refund" \
 		    -sort_order 9 \
 		    -column_spec "float"
Index: openacs-4/packages/contacts/www/contact-rels.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact-rels.tcl,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/contacts/www/contact-rels.tcl	8 Sep 2006 12:07:50 -0000	1.28
+++ openacs-4/packages/contacts/www/contact-rels.tcl	3 Jan 2021 15:33:17 -0000	1.29
@@ -83,7 +83,7 @@
 set format "normal"
 
 set bulk_actions [list "[_ contacts.contact_rel_change]" "../relationship-bulk-move" "[_ contacts.contact_rel_change]"]
-set admin_p [ad_permission_p [ad_conn package_id] admin]
+set admin_p [permission::permission_p -party_id [ad_conn user_id] -object_id [ad_conn package_id] -privilege admin]
 #set default_group_id [contacts::default_group_id]
 set title "Contacts"
 set context {}
Index: openacs-4/packages/contacts/www/search-help.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/search-help.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/contacts/www/search-help.tcl	7 Jun 2005 07:45:40 -0000	1.3
+++ openacs-4/packages/contacts/www/search-help.tcl	3 Jan 2021 15:33:17 -0000	1.4
@@ -7,7 +7,7 @@
 } {
 } -validate {
 }
-set admin_p [ad_permission_p [ad_conn package_id] admin]
+set admin_p [permission::permission_p -party_id [ad_conn user_id] -object_id [ad_conn package_id] -privilege admin]
 #set default_group_id [contacts::default_group_id]
 set title "[_ contacts.Search_Help]"
 set context [list $title]
Index: openacs-4/packages/contacts/www/settings.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/settings.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/contacts/www/settings.tcl	12 Aug 2018 12:22:49 -0000	1.7
+++ openacs-4/packages/contacts/www/settings.tcl	3 Jan 2021 15:33:17 -0000	1.8
@@ -12,7 +12,7 @@
 set context [list $title]
 set package_id [ad_conn package_id]
 set party_id [ad_conn user_id]
-set admin_p [ad_permission_p [ad_conn package_id] admin]
+set admin_p [permission::permission_p -party_id [ad_conn user_id] -object_id [ad_conn package_id] -privilege admin]
 
 template::list::create \
     -name "signatures" \