Index: openacs-4/packages/contacts/contacts.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/contacts.info,v
diff -u -r1.82 -r1.83
--- openacs-4/packages/contacts/contacts.info	13 Dec 2006 13:17:52 -0000	1.82
+++ openacs-4/packages/contacts/contacts.info	14 Dec 2006 09:19:29 -0000	1.83
@@ -7,14 +7,14 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="1.2b21" url="http://openacs.org/repository/download/apm/contacts-1.2b21.apm">
+    <version name="1.2b23" url="http://openacs.org/repository/download/apm/contacts-1.2b23.apm">
         <owner url="mailto:openacs@geddert.com">Matthew Geddert</owner>
         <summary>This application lets you collaboratively view, edit and categorize contacts.</summary>
         <release-date>2006-06-25</release-date>
         <description format="text/plain">Contacts is an application for managing all those people and or organization you need to keep track of. It has a complete UI for storing and categorizing contacts. Each contact can have an arbitrary number of custom attributes associated with it, including other contacts (i.e. a certain contact &quot;belongs&quot; to a certain organization). It also functions as a service contract provider for attributes related to users in your system</description>
         <maturity>0</maturity>
 
-        <provides url="contacts" version="1.2b21"/>
+        <provides url="contacts" version="1.2b23"/>
         <requires url="acs-datetime" version="4.1"/>
         <requires url="acs-events" version="0.5d3"/>
         <requires url="acs-tcl" version="5.3.0d2"/>
Index: openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml	18 May 2006 18:02:59 -0000	1.28
+++ openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml	14 Dec 2006 09:19:30 -0000	1.29
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="contacts" package_version="1.2b11" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="contacts" package_version="1.2b22" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="--_select_a_group_--">-- eine Gruppe markieren --</msg>
   <msg key="--add_column--">-- Reihe hinzuf�gen --</msg>
@@ -433,6 +433,8 @@
   <msg key="Mail_Merge">Adresszusammenstellung</msg>
   <msg key="Mail_Merge_Results">Resultate der Mail Zusammenfassung (mail merge)</msg>
   <msg key="Mail_to_contact">Dateien an Kontakt schicken</msg>
+  <msg key="mailing_subject">Betreff</msg>
+  <msg key="mailing_subject_help">Geben Sie den Betreff ein f�r den Fall das die Vorlage dies unterst�tzt.</msg>
   <msg key="Make_Current">aktuell machen</msg>
   <msg key="Make_Public">ver�ffentlichen</msg>
   <msg key="Make_the_checked_contacts_current">Die markierten Kontakte aktuell machen</msg>
@@ -500,6 +502,7 @@
   <msg key="Person_Form">Personen Formblatt</msg>
   <msg key="Please_choose_a_contact">Bitte w�hlen Sie einen Kontakt</msg>
   <msg key="pp">i.V.</msg>
+  <msg key="preferred_locale">Kommunikationssprache</msg>
   <msg key="Pretty_name">Angezeigter Name</msg>
   <msg key="pretty_name_help">Der Name der bei dieser Liste als �berschrift angezeigt wird.</msg>
   <msg key="Preview">Voransicht</msg>
Index: openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml,v
diff -u -r1.91 -r1.92
--- openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml	13 Dec 2006 13:17:52 -0000	1.91
+++ openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml	14 Dec 2006 09:19:30 -0000	1.92
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="contacts" package_version="1.2b19" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="contacts" package_version="1.2b22" locale="en_US" charset="ISO-8859-1">
 
   <msg key="--_select_a_group_--">-- select a group --</msg>
   <msg key="--add_column--">-- add column --</msg>
@@ -511,6 +511,8 @@
   <msg key="Mail_to_contact">Mail to contact</msg>
   <msg key="mailing_allowed">mailing allowed</msg>
   <msg key="mailing_not_allowed">mailing not allowed</msg>
+  <msg key="mailing_subject">Subject</msg>
+  <msg key="mailing_subject_help">Enter the subject of e.g. the letter if the template supports this</msg>
   <msg key="Make_Current">Make Current</msg>
   <msg key="Make_Public">Make Public</msg>
   <msg key="Make_the_checked_contacts_current">Make the checked contacts current</msg>
@@ -552,6 +554,8 @@
   <msg key="oo_email_subject_help">Subject of the email. &lt;font color=red&gt;&lt;b&gt;Leave empty to print&lt;/b&gt;&lt;/font&gt;</msg>
   <msg key="oo_mailing">Open Office Mailing</msg>
   <msg key="oo_message">OO message</msg>
+  <msg key="OOTemplate">OpenOffice Template</msg>
+  <msg key="OOTemplate_help_text">Which OpenOffice mailing template should be used for this?</msg>
   <msg key="open">Open</msg>
   <msg key="Options">Options</msg>
   <msg key="or">or</msg>
@@ -589,6 +593,7 @@
   <msg key="Please_choose_a_contact">Please choose a contact</msg>
   <msg key="Populate_CRM">Populate CRM</msg>
   <msg key="pp">pp.</msg>
+  <msg key="preferred_locale">Preferred locale</msg>
   <msg key="Pretty_name">Pretty Name</msg>
   <msg key="pretty_name_help">The Pretty Name to use in the list label.</msg>
   <msg key="Preview">Preview</msg>
Index: openacs-4/packages/contacts/sql/postgresql/contacts-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/sql/postgresql/contacts-create.sql,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/contacts/sql/postgresql/contacts-create.sql	1 Dec 2006 16:47:56 -0000	1.16
+++ openacs-4/packages/contacts/sql/postgresql/contacts-create.sql	14 Dec 2006 09:19:30 -0000	1.17
@@ -235,3 +235,6 @@
 \i contacts-list-create.sql
 
 
+-- Change the user_preferences table as at least with contacts it is a party references table
+alter table user_preferences drop constraint user_prefs_user_id_fk;
+alter table user_preferences add constraint user_prefs_user_id_fk foreign key  (user_id) references parties (party_id);
Index: openacs-4/packages/contacts/sql/postgresql/contacts-messages-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/sql/postgresql/contacts-messages-create.sql,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/contacts/sql/postgresql/contacts-messages-create.sql	15 Feb 2006 10:06:36 -0000	1.9
+++ openacs-4/packages/contacts/sql/postgresql/contacts-messages-create.sql	14 Dec 2006 09:19:30 -0000	1.10
@@ -33,6 +33,8 @@
 				constraint contact_message_items_locale_fk references ad_locales(locale),
         -- Banner contains the path to an image which can be inserted into the open office mailing document
         banner                 varchar(500),
+	-- Template contains the path to the oo_template directory for the template that is being used
+	oo_template	       varchar(500),
         -- PS is the post scriptum, which is commonly used in mailings.
         ps                      varchar(500)
 );
@@ -44,6 +46,7 @@
 	   cmi.locale,
            cmi.banner,
            cmi.ps,
+	   cmi.oo_template,
            cr.title,
            cr.description,
            cr.content,
Index: openacs-4/packages/contacts/sql/postgresql/upgrade/upgrade-1.2b21-1.2b22.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/sql/postgresql/upgrade/upgrade-1.2b21-1.2b22.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/contacts/sql/postgresql/upgrade/upgrade-1.2b21-1.2b22.sql	14 Dec 2006 09:19:30 -0000	1.1
@@ -0,0 +1,21 @@
+alter table contact_message_items add column oo_template varchar(500);
+drop view contact_messages;
+create view contact_messages as 
+    select cmi.item_id, 
+           cmi.owner_id,
+           cmi.message_type,
+	   cmi.locale,
+           cmi.banner,
+           cmi.ps,
+	   cmi.oo_template,
+           cr.title,
+           cr.description,
+           cr.content,
+           cr.mime_type as content_format,
+           ao.package_id
+      from contact_message_items cmi, cr_items ci, cr_revisions cr, acs_objects ao
+     where cmi.item_id = cr.item_id
+       and ci.publish_status not in ( 'expired' )
+       and ci.live_revision = cr.revision_id
+       and ci.item_id = ao.object_id
+;
Index: openacs-4/packages/contacts/sql/postgresql/upgrade/upgrade-1.2b22-1.2b23.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/sql/postgresql/upgrade/Attic/upgrade-1.2b22-1.2b23.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/contacts/sql/postgresql/upgrade/upgrade-1.2b22-1.2b23.sql	14 Dec 2006 09:19:30 -0000	1.1
@@ -0,0 +1,2 @@
+alter table user_preferences drop constraint user_prefs_user_id_fk;
+alter table user_preferences add constraint user_prefs_user_id_fk foreign key  (user_id) references parties (party_id);
\ No newline at end of file