Index: openacs-4/packages/contacts/contacts.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/contacts.info,v diff -u -r1.8 -r1.9 --- openacs-4/packages/contacts/contacts.info 4 Jun 2005 12:36:44 -0000 1.8 +++ openacs-4/packages/contacts/contacts.info 10 Jun 2005 21:52:19 -0000 1.9 @@ -5,7 +5,7 @@ Contacts Contacts f - f + t Matthew Geddert @@ -22,6 +22,7 @@ + @@ -33,6 +34,7 @@ + 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.5 -r1.6 --- openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml 8 Jun 2005 16:36:05 -0000 1.5 +++ openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml 10 Jun 2005 21:52:19 -0000 1.6 @@ -46,7 +46,7 @@ Selektierten Kontakten eine E-mail or einen Brief schreiben Instanz Berechtigungen - !NOCH UNFERTIG! Gehen Sie sicher, dass Sie nicht die gleichen Attribute zu mehreren Gruppen hinzuf�gen - folgenden Bedingungen:<br> + der folgenden Bedingungen:<br> Von Gruppe entfernen Die Standardgruppe muss den Vornamen und den Nachnamen f�r ein Personenformblatt enthalten sowie einen Organisationsnamen f�r ein Organisationsformblatt, beide ben�tigen eine E-Mail Adresse. Dies ist meine Standard Signatur @@ -56,6 +56,7 @@ N�chster Parameter Organisation Organisationen Formblatt + Organisationen �bergeordnete Gruppe Kontakte Berechtigungen @@ -66,10 +67,13 @@ Beziehungen Von Gruppe entfernen Ergebnisse: + Zur�ck zu %title% Speichern Speichern und Weiteren hinzuf�gen Speichern als + Speichern dieser Suche Suchen + Suche nach Einstellungen Anzeigen: Signatur 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.14 -r1.15 --- openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml 9 Jun 2005 20:16:58 -0000 1.14 +++ openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml 10 Jun 2005 21:52:19 -0000 1.15 @@ -166,8 +166,8 @@ remember that you can use <a href="message-help">mail merge substitutions</a>. the most common wildcards are \{name\} \{first_names\}, \{last_name\}, \{home_address\} and \{date\} Remove from Selected Group(s) Remove from this Group - Some of the required elements for this form are missing. Please contact an administrator and make sure that the following attributes are included in the default group's form for this object type:<ul><li>[join $missing_elements - Some of the required elements for this form are missing. Please contact an administrator and make sure that the following attributes are included:<ul><li>[join $missing_elements + Some of the required elements for this form are missing. Please contact an administrator and make sure that the following attributes are included in the default group's form for this object type: + Some of the required elements for this form are missing. Please contact an administrator and make sure that the following attributes are included: state/province is not -> the action supplied is not valid The contact specified does not exist @@ -267,6 +267,7 @@ Save and Add Another Save As Save Message As + Save this Search Search Search for Search Help 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.6 -r1.7 --- openacs-4/packages/contacts/tcl/contacts-install-procs.tcl 9 Jun 2005 08:12:32 -0000 1.6 +++ openacs-4/packages/contacts/tcl/contacts-install-procs.tcl 10 Jun 2005 21:52:19 -0000 1.7 @@ -89,7 +89,7 @@ -package_key "contacts" \ -object_type "person" \ -list_name "${package_id}__-2" \ - -pretty_name "Contacts-Person" \ + -pretty_name "Person - Registered Users" \ -description "" \ -description_mime_type ""] @@ -183,7 +183,7 @@ -package_key "contacts" \ -object_type "organization" \ -list_name "${package_id}__-2" \ - -pretty_name "#contacts.Organization#" \ + -pretty_name "Organization - Registered Users" \ -description "" \ -description_mime_type ""] @@ -235,7 +235,6 @@ @error } { contacts::populate::crm -package_id $package_id - contacts::populate::wieners -package_id $package_id } ad_proc -public contacts::insert_map { Index: openacs-4/packages/contacts/tcl/contacts-populate-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-populate-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/contacts/tcl/contacts-populate-procs.tcl 9 Jun 2005 08:12:32 -0000 1.1 +++ openacs-4/packages/contacts/tcl/contacts-populate-procs.tcl 10 Jun 2005 21:52:20 -0000 1.2 @@ -13,7 +13,7 @@ {-package_id ""} } { Procedure to install ams Attributes for a good CRM solution (at - least in our idea). + least in our idea). @author Malte Sussdorff (sussdorff@sussdorff.de) @creation-date 2005-06-05 @@ -22,7 +22,6 @@ @error } { - ams::widgets_init if {[empty_string_p $package_id]} { @@ -45,33 +44,80 @@ # Hopefully all is now setup to map the groups accordingly. + # We already have the registered users lists setup, so we only need + # the list_id.. Actually we should never have to extend registered + # users, but what the heck... - # We already have the registered users lists setup, so we only - # need the list_id.. - # Actually we should never have to extend registered users, but - # what the heck... - - - ############################ - # # Person:: Registered Users - # - ############################ set list_id [ams::list::get_list_id \ -package_key "contacts" \ -object_type "person" \ -list_name "${contacts_package_id}__${registered_user_group_id}" ] - ns_log Notice "reg_list_id:: $list_id" + set attribute_id [attribute::new \ + -object_type "person" \ + -attribute_name "first_names" \ + -datatype "string" \ + -pretty_name "First Name(s)" \ + -pretty_plural "First Name(s)" \ + -table_name "" \ + -column_name "" \ + -default_value "" \ + -min_n_values "0" \ + -max_n_values "1" \ + -sort_order "1" \ + -storage "type_specific" \ + -static_p "f" \ + -if_does_not_exist] + ams::attribute::new \ + -attribute_id $attribute_id \ + -widget "textbox" \ + -dynamic_p "f" + + ams::list::attribute::map \ + -list_id $list_id \ + -attribute_id $attribute_id \ + -sort_order "10" \ + -required_p "f" \ + -section_heading "" + set attribute_id [attribute::new \ -object_type "person" \ + -attribute_name "last_name" \ + -datatype "string" \ + -pretty_name "Last Name" \ + -pretty_plural "Last Names" \ + -table_name "" \ + -column_name "" \ + -default_value "" \ + -min_n_values "0" \ + -max_n_values "1" \ + -sort_order "1" \ + -storage "type_specific" \ + -static_p "f" \ + -if_does_not_exist] + + ams::attribute::new \ + -attribute_id $attribute_id \ + -widget "textbox" \ + -dynamic_p "f" + + ams::list::attribute::map \ + -list_id $list_id \ + -attribute_id $attribute_id \ + -sort_order "20" \ + -required_p "f" \ + -section_heading "" + + set attribute_id [attribute::new \ + -object_type "person" \ -attribute_name "salutation" \ -datatype "string" \ - -pretty_name "#acs-translations.person_salutation#" \ - -pretty_plural "#acs-translations.person_salutation_plural#" \ + -pretty_name "Salutation" \ + -pretty_plural "Salutations" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -82,9 +128,6 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations person_salutation "Salutation" - lang::message::register en_US acs-translations person_salutation_plural "Salutations" - ams::attribute::new \ -attribute_id $attribute_id \ -widget "select" \ @@ -99,46 +142,34 @@ set option_id [ams::option::new \ -attribute_id $attribute_id \ - -option "#acs-translations.person_salutation_Dear_Mr_#"] + -option "Dear Mr. "] - lang::message::register en_US acs-translations person_salutation_Dear_Mr_ "Dear Mr. " - set option_id [ams::option::new \ -attribute_id $attribute_id \ - -option "#acs-translations.person_salutation_Dear_Mrs_#"] + -option "Dear Mrs. "] - lang::message::register en_US acs-translations person_salutation_Dear_Mrs_ "Dear Mrs. " - set option_id [ams::option::new \ -attribute_id $attribute_id \ - -option "#acs-translations.person_salutation_Dear_Ms_#"] + -option "Dear Ms. "] - lang::message::register en_US acs-translations person_salutation_Dear_Ms_ "Dear Ms. " - set option_id [ams::option::new \ -attribute_id $attribute_id \ - -option "#acs-translations.person_salutation_Dear_#"] + -option "Dear "] - lang::message::register en_US acs-translations person_salutation_Dear_ "Dear " - set option_id [ams::option::new \ -attribute_id $attribute_id \ - -option "#acs-translations.person_salutation_Dear_Professor#"] + -option "Dear Professor"] - lang::message::register en_US acs-translations person_salutation_Dear_Professor "Dear Professor" - set option_id [ams::option::new \ -attribute_id $attribute_id \ - -option "#acs-translations.person_salutation_Dear_Dr#"] + -option "Dear Dr."] - lang::message::register en_US acs-translations person_salutation_Dear_Dr "Dear Dr." - set attribute_id [attribute::new \ -object_type "person" \ -attribute_name "person_title" \ -datatype "string" \ - -pretty_name "#acs-translations.person_title#" \ - -pretty_plural "#acs-translations.person_title_plural#" \ + -pretty_name "Title" \ + -pretty_plural "Titles" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -149,9 +180,6 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations person_title "Title" - lang::message::register en_US acs-translations person_title_plural "Titles" - ams::attribute::new \ -attribute_id $attribute_id \ -widget "textbox" \ @@ -168,8 +196,8 @@ -object_type "person" \ -attribute_name "home_address" \ -datatype "string" \ - -pretty_name "#acs-translations.person_home_address#" \ - -pretty_plural "#acs-translations.person_home_address_plural#" \ + -pretty_name "Home Address" \ + -pretty_plural "Home Addresses" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -180,9 +208,6 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations person_home_address "Home Address" - lang::message::register en_US acs-translations person_home_address_plural "Home Addresses" - ams::attribute::new \ -attribute_id $attribute_id \ -widget "postal_address" \ @@ -199,8 +224,8 @@ -object_type "person" \ -attribute_name "home_phone" \ -datatype "string" \ - -pretty_name "#acs-translations.person_home_phone#" \ - -pretty_plural "#acs-translations.person_home_phone_plural#" \ + -pretty_name "Home Phone" \ + -pretty_plural "Home Phones" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -211,9 +236,6 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations person_home_phone "Home Phone" - lang::message::register en_US acs-translations person_home_phone_plural "Home Phones" - ams::attribute::new \ -attribute_id $attribute_id \ -widget "telecom_number" \ @@ -228,10 +250,10 @@ set attribute_id [attribute::new \ -object_type "person" \ - -attribute_name "mobile_phone" \ + -attribute_name "private_fax" \ -datatype "string" \ - -pretty_name "#acs-translations.person_mobile_phone#" \ - -pretty_plural "#acs-translations.person_mobile_phone_plural#" \ + -pretty_name "Private Fax No." \ + -pretty_plural "Private Fax Numbers" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -242,9 +264,6 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations person_mobile_phone "Mobile Phone" - lang::message::register en_US acs-translations person_mobile_phone_plural "Mobile Phones" - ams::attribute::new \ -attribute_id $attribute_id \ -widget "telecom_number" \ @@ -259,10 +278,10 @@ set attribute_id [attribute::new \ -object_type "person" \ - -attribute_name "privateemail" \ - -datatype "email" \ - -pretty_name "#acs-translations.person_privateemail#" \ - -pretty_plural "#acs-translations.person_privateemail_plural#" \ + -attribute_name "private_mobile_phone" \ + -datatype "string" \ + -pretty_name "Private Mobile No." \ + -pretty_plural "Private Mobile Numbers" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -273,12 +292,9 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations person_privateemail "Private E-Mail Address" - lang::message::register en_US acs-translations person_privateemail_plural "Private E-Mail Addresses" - ams::attribute::new \ -attribute_id $attribute_id \ - -widget "email" \ + -widget "telecom_number" \ -dynamic_p "t" ams::list::attribute::map \ @@ -289,11 +305,39 @@ -section_heading "" set attribute_id [attribute::new \ + -object_type "party" \ + -attribute_name "email" \ + -datatype "string" \ + -pretty_name "Email Address" \ + -pretty_plural "Email Addresses" \ + -table_name "" \ + -column_name "" \ + -default_value "" \ + -min_n_values "0" \ + -max_n_values "1" \ + -sort_order "1" \ + -storage "type_specific" \ + -static_p "f" \ + -if_does_not_exist] + + ams::attribute::new \ + -attribute_id $attribute_id \ + -widget "email" \ + -dynamic_p "f" + + ams::list::attribute::map \ + -list_id $list_id \ + -attribute_id $attribute_id \ + -sort_order "84" \ + -required_p "f" \ + -section_heading "" + + set attribute_id [attribute::new \ -object_type "person" \ -attribute_name "birthdate" \ -datatype "date" \ - -pretty_name "#acs-translations.person_birthdate#" \ - -pretty_plural "#acs-translations.person_birthdate_plural#" \ + -pretty_name "Birthdate" \ + -pretty_plural "Birthdates" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -304,9 +348,6 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations person_birthdate "Birthdate" - lang::message::register en_US acs-translations person_birthdate_plural "Birthdates" - ams::attribute::new \ -attribute_id $attribute_id \ -widget "date" \ @@ -323,8 +364,8 @@ -object_type "person" \ -attribute_name "personnotes" \ -datatype "text" \ - -pretty_name "#acs-translations.person_personnotes#" \ - -pretty_plural "#acs-translations.person_personnotes_plural#" \ + -pretty_name "Notes About Person" \ + -pretty_plural "Notes About Person" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -335,9 +376,6 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations person_personnotes "Notes About Person" - lang::message::register en_US acs-translations person_personnotes_plural "Notes About Person" - ams::attribute::new \ -attribute_id $attribute_id \ -widget "textarea" \ @@ -350,28 +388,20 @@ -required_p "f" \ -section_heading "" - ##################### - # - # Person: Suppliers - # - ##################### + # ORGA - REG - set list_id [ams::list::new \ + set list_id [ams::list::get_list_id \ -package_key "contacts" \ - -object_type "person" \ - -list_name "${contacts_package_id}__${supplier_id}" \ - -pretty_name "#${contacts_package_id}__${supplier_id}#" \ - -description "" \ - -description_mime_type ""] + -object_type "organization" \ + -list_name "${contacts_package_id}__${registered_user_group_id}" + ] - ns_log Notice "reg_list_id:: $list_id" - set attribute_id [attribute::new \ - -object_type "person" \ - -attribute_name "bankaccountnumber" \ + -object_type "organization" \ + -attribute_name "name" \ -datatype "string" \ - -pretty_name "#acs-translations.person_bankaccountnumber#" \ - -pretty_plural "#acs-translations.person_bankaccountnumber_plural#" \ + -pretty_name "Company Name" \ + -pretty_plural "Organization Names" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -382,9 +412,6 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations person_bankaccountnumber "Bank Account Number" - lang::message::register en_US acs-translations person_bankaccountnumber_plural "Bank Account Numbers" - ams::attribute::new \ -attribute_id $attribute_id \ -widget "textbox" \ @@ -398,11 +425,11 @@ -section_heading "" set attribute_id [attribute::new \ - -object_type "person" \ - -attribute_name "bankcode" \ + -object_type "organization" \ + -attribute_name "company_name_ext" \ -datatype "string" \ - -pretty_name "#acs-translations.person_bankcode#" \ - -pretty_plural "#acs-translations.person_bankcode_plural#" \ + -pretty_name "Company Name Extensions" \ + -pretty_plural "Company Name Extensions" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -413,9 +440,6 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations person_bankcode "Bank Code" - lang::message::register en_US acs-translations person_bankcode_plural "Bank Codes" - ams::attribute::new \ -attribute_id $attribute_id \ -widget "textbox" \ @@ -429,11 +453,11 @@ -section_heading "" set attribute_id [attribute::new \ - -object_type "person" \ - -attribute_name "bankname" \ + -object_type "organization" \ + -attribute_name "company_address" \ -datatype "string" \ - -pretty_name "#acs-translations.person_bankname#" \ - -pretty_plural "#acs-translations.person_bankname_plural#" \ + -pretty_name "Company Address" \ + -pretty_plural "Company Addresses" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -444,27 +468,186 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations person_bankname "Name of Bank" - lang::message::register en_US acs-translations person_bankname_plural "Name of Banks" + ams::attribute::new \ + -attribute_id $attribute_id \ + -widget "postal_address" \ + -dynamic_p "t" + ams::list::attribute::map \ + -list_id $list_id \ + -attribute_id $attribute_id \ + -sort_order "30" \ + -required_p "f" \ + -section_heading "" + + set attribute_id [attribute::new \ + -object_type "organization" \ + -attribute_name "company_url" \ + -datatype "url" \ + -pretty_name "Company URL" \ + -pretty_plural "Company URLs" \ + -table_name "" \ + -column_name "" \ + -default_value "" \ + -min_n_values "1" \ + -max_n_values "1" \ + -sort_order "1" \ + -storage "generic" \ + -static_p "f" \ + -if_does_not_exist] + ams::attribute::new \ -attribute_id $attribute_id \ + -widget "url" \ + -dynamic_p "t" + + ams::list::attribute::map \ + -list_id $list_id \ + -attribute_id $attribute_id \ + -sort_order "40" \ + -required_p "f" \ + -section_heading "" + + set attribute_id [attribute::new \ + -object_type "organization" \ + -attribute_name "company_phone" \ + -datatype "string" \ + -pretty_name "Company Phone No." \ + -pretty_plural "Company Phone Numbers" \ + -table_name "" \ + -column_name "" \ + -default_value "" \ + -min_n_values "1" \ + -max_n_values "1" \ + -sort_order "1" \ + -storage "generic" \ + -static_p "f" \ + -if_does_not_exist] + + ams::attribute::new \ + -attribute_id $attribute_id \ + -widget "telecom_number" \ + -dynamic_p "t" + + ams::list::attribute::map \ + -list_id $list_id \ + -attribute_id $attribute_id \ + -sort_order "50" \ + -required_p "f" \ + -section_heading "" + + set attribute_id [attribute::new \ + -object_type "organization" \ + -attribute_name "industrysector" \ + -datatype "string" \ + -pretty_name "Industry Sector" \ + -pretty_plural "Industry Sectors" \ + -table_name "" \ + -column_name "" \ + -default_value "" \ + -min_n_values "1" \ + -max_n_values "1" \ + -sort_order "1" \ + -storage "generic" \ + -static_p "f" \ + -if_does_not_exist] + + ams::attribute::new \ + -attribute_id $attribute_id \ + -widget "select" \ + -dynamic_p "t" + + ams::list::attribute::map \ + -list_id $list_id \ + -attribute_id $attribute_id \ + -sort_order "60" \ + -required_p "f" \ + -section_heading "" + + set option_id [ams::option::new \ + -attribute_id $attribute_id \ + -option "Agency - Full Service"] + + set option_id [ams::option::new \ + -attribute_id $attribute_id \ + -option "Agency - Special"] + + set option_id [ams::option::new \ + -attribute_id $attribute_id \ + -option "Agency - PR"] + + set attribute_id [attribute::new \ + -object_type "organization" \ + -attribute_name "company_notes" \ + -datatype "text" \ + -pretty_name "Notes on Company" \ + -pretty_plural "Notes on Company" \ + -table_name "" \ + -column_name "" \ + -default_value "" \ + -min_n_values "1" \ + -max_n_values "1" \ + -sort_order "1" \ + -storage "generic" \ + -static_p "f" \ + -if_does_not_exist] + + ams::attribute::new \ + -attribute_id $attribute_id \ + -widget "textarea" \ + -dynamic_p "t" + + ams::list::attribute::map \ + -list_id $list_id \ + -attribute_id $attribute_id \ + -sort_order "70" \ + -required_p "f" \ + -section_heading "" + + # PERSON - SUPPLY + + set list_id [ams::list::new \ + -package_key "contacts" \ + -object_type "person" \ + -list_name "${contacts_package_id}__${supplier_id}" \ + -pretty_name "Person - Supplier" \ + -description "" \ + -description_mime_type ""] + + set attribute_id [attribute::new \ + -object_type "person" \ + -attribute_name "bankaccountnumber" \ + -datatype "string" \ + -pretty_name "Bank Account Number" \ + -pretty_plural "Bank Account Numbers" \ + -table_name "" \ + -column_name "" \ + -default_value "" \ + -min_n_values "1" \ + -max_n_values "1" \ + -sort_order "1" \ + -storage "generic" \ + -static_p "f" \ + -if_does_not_exist] + + ams::attribute::new \ + -attribute_id $attribute_id \ -widget "textbox" \ -dynamic_p "t" ams::list::attribute::map \ -list_id $list_id \ -attribute_id $attribute_id \ - -sort_order "30" \ + -sort_order "10" \ -required_p "f" \ -section_heading "" set attribute_id [attribute::new \ -object_type "person" \ - -attribute_name "accountowner" \ + -attribute_name "bankcode" \ -datatype "string" \ - -pretty_name "#acs-translations.person_accountowner#" \ - -pretty_plural "#acs-translations.person_accountowner_plural#" \ + -pretty_name "Bank Code" \ + -pretty_plural "Bank Codes" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -475,9 +658,34 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations person_accountowner "Owner of Account" - lang::message::register en_US acs-translations person_accountowner_plural "Owners of Account" + ams::attribute::new \ + -attribute_id $attribute_id \ + -widget "textbox" \ + -dynamic_p "t" + ams::list::attribute::map \ + -list_id $list_id \ + -attribute_id $attribute_id \ + -sort_order "20" \ + -required_p "f" \ + -section_heading "" + + set attribute_id [attribute::new \ + -object_type "person" \ + -attribute_name "bankname" \ + -datatype "string" \ + -pretty_name "Name of Bank" \ + -pretty_plural "Name of Banks" \ + -table_name "" \ + -column_name "" \ + -default_value "" \ + -min_n_values "1" \ + -max_n_values "1" \ + -sort_order "1" \ + -storage "generic" \ + -static_p "f" \ + -if_does_not_exist] + ams::attribute::new \ -attribute_id $attribute_id \ -widget "textbox" \ @@ -486,16 +694,16 @@ ams::list::attribute::map \ -list_id $list_id \ -attribute_id $attribute_id \ - -sort_order "40" \ + -sort_order "30" \ -required_p "f" \ -section_heading "" set attribute_id [attribute::new \ -object_type "person" \ -attribute_name "languages" \ -datatype "string" \ - -pretty_name "#acs-translations.person_languages#" \ - -pretty_plural "#acs-translations.person_languages_plural#" \ + -pretty_name "Languages" \ + -pretty_plural "Languages" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -506,9 +714,6 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations person_languages "Languages" - lang::message::register en_US acs-translations person_languages_plural "Languages" - ams::attribute::new \ -attribute_id $attribute_id \ -widget "multiselect" \ @@ -523,40 +728,30 @@ set option_id [ams::option::new \ -attribute_id $attribute_id \ - -option "#acs-translations.person_languages_EnglishUK#"] + -option "English:UK"] - lang::message::register en_US acs-translations person_languages_EnglishUK "English:UK" - set option_id [ams::option::new \ -attribute_id $attribute_id \ - -option "#acs-translations.person_languages_English_US#"] + -option "English_US"] - lang::message::register en_US acs-translations person_languages_English_US "English_US" - set option_id [ams::option::new \ -attribute_id $attribute_id \ - -option "#acs-translations.person_languages_French#"] + -option "French"] - lang::message::register en_US acs-translations person_languages_French "French" - set option_id [ams::option::new \ -attribute_id $attribute_id \ - -option "#acs-translations.person_languages_German#"] + -option "German"] - lang::message::register en_US acs-translations person_languages_German "German" - set option_id [ams::option::new \ -attribute_id $attribute_id \ - -option "#acs-translations.person_languages_Spanish#"] + -option "Spanish"] - lang::message::register en_US acs-translations person_languages_Spanish "Spanish" - set attribute_id [attribute::new \ -object_type "person" \ -attribute_name "availability" \ -datatype "text" \ - -pretty_name "#acs-translations.person_availability#" \ - -pretty_plural "#acs-translations.person_availability_plural#" \ + -pretty_name "Availability" \ + -pretty_plural "Availabilities" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -567,9 +762,6 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations person_availability "Availability" - lang::message::register en_US acs-translations person_availability_plural "Availabilities" - ams::attribute::new \ -attribute_id $attribute_id \ -widget "textarea" \ @@ -586,8 +778,8 @@ -object_type "person" \ -attribute_name "subjectarea" \ -datatype "string" \ - -pretty_name "#acs-translations.person_subjectarea#" \ - -pretty_plural "#acs-translations.person_subjectarea_plural#" \ + -pretty_name "Subject Areas" \ + -pretty_plural "Subject Areas" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -598,9 +790,6 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations person_subjectarea "Subject Area" - lang::message::register en_US acs-translations person_subjectarea_plural "Subject Areas" - ams::attribute::new \ -attribute_id $attribute_id \ -widget "multiselect" \ @@ -615,48 +804,68 @@ set option_id [ams::option::new \ -attribute_id $attribute_id \ - -option "#acs-translations.person_subjectarea_Advertisement#"] + -option "Advertisement"] - lang::message::register en_US acs-translations person_subjectarea_Advertisement "Advertisement" - set option_id [ams::option::new \ -attribute_id $attribute_id \ - -option "#acs-translations.person_subjectarea_lt_Computers_-_Webbased_#"] + -option "Computers - Webbased Technologies"] - lang::message::register en_US acs-translations person_subjectarea_lt_Computers_-_Webbased_ "Computers - Webbased Technologies" - set option_id [ams::option::new \ -attribute_id $attribute_id \ - -option "#acs-translations.person_subjectarea_Engineering#"] + -option "Engineering"] - lang::message::register en_US acs-translations person_subjectarea_Engineering "Engineering" - set option_id [ams::option::new \ -attribute_id $attribute_id \ - -option "#acs-translations.person_subjectarea_Law#"] + -option "Law"] - lang::message::register en_US acs-translations person_subjectarea_Law "Law" - set option_id [ams::option::new \ -attribute_id $attribute_id \ - -option "#acs-translations.person_subjectarea_Public_Relations#"] + -option "Public Relations"] - lang::message::register en_US acs-translations person_subjectarea_Public_Relations "Public Relations" + set attribute_id [attribute::new \ + -object_type "person" \ + -attribute_name "freelancernotes" \ + -datatype "text" \ + -pretty_name "Notes on Freelancer" \ + -pretty_plural "Notes on Freelancer" \ + -table_name "" \ + -column_name "" \ + -default_value "" \ + -min_n_values "1" \ + -max_n_values "1" \ + -sort_order "1" \ + -storage "generic" \ + -static_p "f" \ + -if_does_not_exist] + ams::attribute::new \ + -attribute_id $attribute_id \ + -widget "textarea" \ + -dynamic_p "t" - # For registered users we already setup the organizations list + ams::list::attribute::map \ + -list_id $list_id \ + -attribute_id $attribute_id \ + -sort_order "71" \ + -required_p "f" \ + -section_heading "" - set list_id [ams::list::get_list_id \ + # Organization - Supplier + + set list_id [ams::list::new \ -package_key "contacts" \ -object_type "organization" \ - -list_name "${contacts_package_id}__${registered_user_group_id}" - ] + -list_name "${contacts_package_id}__${supplier_id}" \ + -pretty_name "Organization - Supplier" \ + -description "" \ + -description_mime_type ""] + set attribute_id [attribute::new \ -object_type "organization" \ - -attribute_name "company_address" \ + -attribute_name "bankaccountnumber" \ -datatype "string" \ - -pretty_name "#acs-translations.organization_company_address#" \ - -pretty_plural "#acs-translations.organization_company_address_plural#" \ + -pretty_name "Bank Account No." \ + -pretty_plural "Bank Account Numbers*" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -667,27 +876,24 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations organization_company_address "Company Address" - lang::message::register en_US acs-translations organization_company_address_plural "Company Addresses" - ams::attribute::new \ -attribute_id $attribute_id \ - -widget "postal_address" \ + -widget "textbox" \ -dynamic_p "t" ams::list::attribute::map \ -list_id $list_id \ -attribute_id $attribute_id \ - -sort_order "20" \ + -sort_order "1" \ -required_p "f" \ -section_heading "" set attribute_id [attribute::new \ - -object_type "person" \ - -attribute_name "organization_url" \ + -object_type "organization" \ + -attribute_name "bankcode" \ -datatype "string" \ - -pretty_name "#acs-translations.person_organization_url#" \ - -pretty_plural "#acs-translations.person_organization_url_plural#" \ + -pretty_name "Bank Code" \ + -pretty_plural "Bank Codes*" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -698,28 +904,52 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations person_organization_url "Organization URL" + ams::attribute::new \ + -attribute_id $attribute_id \ + -widget "textbox" \ + -dynamic_p "t" - lang::message::register en_US acs-translations person_organization_url_plural "Organization URLs" + ams::list::attribute::map \ + -list_id $list_id \ + -attribute_id $attribute_id \ + -sort_order "2" \ + -required_p "f" \ + -section_heading "" + set attribute_id [attribute::new \ + -object_type "organization" \ + -attribute_name "bankname" \ + -datatype "string" \ + -pretty_name "Name of Bank" \ + -pretty_plural "Name of Banks*" \ + -table_name "" \ + -column_name "" \ + -default_value "" \ + -min_n_values "1" \ + -max_n_values "1" \ + -sort_order "1" \ + -storage "generic" \ + -static_p "f" \ + -if_does_not_exist] + ams::attribute::new \ -attribute_id $attribute_id \ - -widget "url" \ + -widget "textbox" \ -dynamic_p "t" ams::list::attribute::map \ -list_id $list_id \ -attribute_id $attribute_id \ - -sort_order "30" \ + -sort_order "3" \ -required_p "f" \ -section_heading "" set attribute_id [attribute::new \ -object_type "organization" \ - -attribute_name "company_phone" \ + -attribute_name "speciliazedlanguages" \ -datatype "string" \ - -pretty_name "#acs-translations.organization_company_phone#" \ - -pretty_plural "#acs-translations.organization_company_phone_plural#" \ + -pretty_name "Specialized Languages" \ + -pretty_plural "Speciliazed Languages*" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -730,27 +960,44 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations organization_company_phone "Company Phone Number" - lang::message::register en_US acs-translations organization_company_phone_plural "Company Phone Numbers" - ams::attribute::new \ -attribute_id $attribute_id \ - -widget "telecom_number" \ + -widget "multiselect" \ -dynamic_p "t" ams::list::attribute::map \ -list_id $list_id \ -attribute_id $attribute_id \ - -sort_order "40" \ + -sort_order "4" \ -required_p "f" \ -section_heading "" + set option_id [ams::option::new \ + -attribute_id $attribute_id \ + -option "English_UK"] + + set option_id [ams::option::new \ + -attribute_id $attribute_id \ + -option "English_US"] + + set option_id [ams::option::new \ + -attribute_id $attribute_id \ + -option "French"] + + set option_id [ams::option::new \ + -attribute_id $attribute_id \ + -option "German"] + + set option_id [ams::option::new \ + -attribute_id $attribute_id \ + -option "Spanish"] + set attribute_id [attribute::new \ -object_type "organization" \ - -attribute_name "industrysector" \ + -attribute_name "specializedsubjectareas" \ -datatype "string" \ - -pretty_name "#acs-translations.organization_industrysector#" \ - -pretty_plural "#acs-translations.organization_industrysector_plural#" \ + -pretty_name "Specialized Subject Areas" \ + -pretty_plural "Specialized Subject Areas*" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -761,45 +1008,73 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations organization_industrysector "Industry Sector" - lang::message::register en_US acs-translations organization_industrysector_plural "Industry Sectors" - ams::attribute::new \ -attribute_id $attribute_id \ - -widget "select" \ + -widget "multiselect" \ -dynamic_p "t" ams::list::attribute::map \ -list_id $list_id \ -attribute_id $attribute_id \ - -sort_order "50" \ + -sort_order "5" \ -required_p "f" \ -section_heading "" set option_id [ams::option::new \ -attribute_id $attribute_id \ - -option "#acs-translations.organization_industrysector_lt_Agency_-_Full_Service#"] + -option "Advertisement"] - lang::message::register en_US acs-translations organization_industrysector_lt_Agency_-_Full_Service "Agency - Full Service" + set option_id [ams::option::new \ + -attribute_id $attribute_id \ + -option "Computers \ +- Webbased Technologies"] set option_id [ams::option::new \ -attribute_id $attribute_id \ - -option "#acs-translations.organization_industrysector_Agency_-_Special#"] + -option "Engineering"] - lang::message::register en_US acs-translations organization_industrysector_Agency_-_Special "Agency - Special" + set option_id [ams::option::new \ + -attribute_id $attribute_id \ + -option "Law"] set option_id [ams::option::new \ -attribute_id $attribute_id \ - -option "#acs-translations.organization_industrysector_Agency_-_PR#"] + -option "Public Relations"] - lang::message::register en_US acs-translations organization_industrysector_Agency_-_PR "Agency - PR" + set attribute_id [attribute::new \ + -object_type "organization" \ + -attribute_name "accountmgr_supplier" \ + -datatype "string" \ + -pretty_name "Account Manager Supplier" \ + -pretty_plural "Account Managers Supplier" \ + -table_name "" \ + -column_name "" \ + -default_value "" \ + -min_n_values "1" \ + -max_n_values "1" \ + -sort_order "1" \ + -storage "generic" \ + -static_p "f" \ + -if_does_not_exist] + ams::attribute::new \ + -attribute_id $attribute_id \ + -widget "textbox" \ + -dynamic_p "t" + + ams::list::attribute::map \ + -list_id $list_id \ + -attribute_id $attribute_id \ + -sort_order "6" \ + -required_p "f" \ + -section_heading "" + set attribute_id [attribute::new \ -object_type "organization" \ - -attribute_name "company_notes" \ + -attribute_name "collaboration_notes" \ -datatype "text" \ - -pretty_name "#acs-translations.organization_company_notes#" \ - -pretty_plural "#acs-translations.organization_company_notes_plural#" \ + -pretty_name "Notes on Collaboration" \ + -pretty_plural "Notes on Collaboration" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -810,9 +1085,6 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations organization_company_notes "Notes on Company" - lang::message::register en_US acs-translations organization_company_notes_plural "Notes on Company" - ams::attribute::new \ -attribute_id $attribute_id \ -widget "textarea" \ @@ -821,31 +1093,26 @@ ams::list::attribute::map \ -list_id $list_id \ -attribute_id $attribute_id \ - -sort_order "51" \ + -sort_order "7" \ -required_p "f" \ -section_heading "" - ################################# - # - # Organization: Customers - # - ################################## + # Organization - Customer + set list_id [ams::list::new \ -package_key "contacts" \ -object_type "organization" \ -list_name "${contacts_package_id}__${customers_id}" \ - -pretty_name "#${contacts_package_id}__${customers_id}#" \ + -pretty_name "Organization - Customer" \ -description "" \ -description_mime_type ""] -# callback contacts::populate::customer_attributes -list_id $list_id - set attribute_id [attribute::new \ -object_type "organization" \ -attribute_name "clienttype" \ -datatype "string" \ - -pretty_name "#acs-translations.organization_clienttype#" \ - -pretty_plural "#acs-translations.organization_clienttype_plural#" \ + -pretty_name "Type of Customer" \ + -pretty_plural "Types of Customer" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -856,11 +1123,6 @@ -static_p "f" \ -if_does_not_exist] - - lang::message::register en_US acs-translations organization_clienttype "Type of Customer" - lang::message::register en_US acs-translations organization_clienttype_plural "Types of Customer" - - ams::attribute::new \ -attribute_id $attribute_id \ -widget "select" \ @@ -869,46 +1131,36 @@ ams::list::attribute::map \ -list_id $list_id \ -attribute_id $attribute_id \ - -sort_order "1" \ + -sort_order "10" \ -required_p "f" \ -section_heading "" set option_id [ams::option::new \ -attribute_id $attribute_id \ - -option "#acs-translations.organization_clienttype_VIP_Customer#"] + -option "VIP Customer"] - lang::message::register en_US acs-translations organization_clienttype_VIP_Customer "VIP Customer" - set option_id [ams::option::new \ -attribute_id $attribute_id \ - -option "#acs-translations.organization_clienttype_Good_Customer#"] + -option "Good Customer"] - lang::message::register en_US acs-translations organization_clienttype_Good_Customer "Good Customer" - set option_id [ams::option::new \ -attribute_id $attribute_id \ - -option "#acs-translations.organization_clienttype_Normal_Customer#"] + -option "Normal Customer"] - lang::message::register en_US acs-translations organization_clienttype_Normal_Customer "Normal Customer" - set option_id [ams::option::new \ -attribute_id $attribute_id \ - -option "#acs-translations.organization_clienttype_Sporadic_Customer#"] + -option "Sporadic Customer"] - lang::message::register en_US acs-translations organization_clienttype_Sporadic_Customer "Sporadic Customer" - set option_id [ams::option::new \ -attribute_id $attribute_id \ - -option "#acs-translations.organization_clienttype_Follow-up_Customer#"] + -option "Follow-up Customer"] - lang::message::register en_US acs-translations organization_clienttype_Follow-up_Customer "Follow-up Customer" - set attribute_id [attribute::new \ -object_type "organization" \ -attribute_name "customer_since" \ -datatype "date" \ - -pretty_name "#acs-translations.organization_customer_since#" \ - -pretty_plural "#acs-translations.organization_customer_since_plural#" \ + -pretty_name "Customer Since" \ + -pretty_plural "Customers Since" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -919,9 +1171,6 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations organization_customer_since "Customer Since" - lang::message::register en_US acs-translations organization_customer_since_plural "Customers Since" - ams::attribute::new \ -attribute_id $attribute_id \ -widget "date" \ @@ -930,16 +1179,56 @@ ams::list::attribute::map \ -list_id $list_id \ -attribute_id $attribute_id \ - -sort_order "2" \ + -sort_order "20" \ -required_p "f" \ -section_heading "" set attribute_id [attribute::new \ -object_type "organization" \ + -attribute_name "keyaccountmanager" \ + -datatype "string" \ + -pretty_name "Key Account Manager" \ + -pretty_plural "Key Account Managers" \ + -table_name "" \ + -column_name "" \ + -default_value "" \ + -min_n_values "1" \ + -max_n_values "1" \ + -sort_order "1" \ + -storage "generic" \ + -static_p "f" \ + -if_does_not_exist] + + ams::attribute::new \ + -attribute_id $attribute_id \ + -widget "select" \ + -dynamic_p "t" + + ams::list::attribute::map \ + -list_id $list_id \ + -attribute_id $attribute_id \ + -sort_order "30" \ + -required_p "f" \ + -section_heading "" + + set option_id [ams::option::new \ + -attribute_id $attribute_id \ + -option "GL"] + + set option_id [ams::option::new \ + -attribute_id $attribute_id \ + -option "RW"] + + set option_id [ams::option::new \ + -attribute_id $attribute_id \ + -option "TK"] + + set attribute_id [attribute::new \ + -object_type "organization" \ -attribute_name "customernotes" \ -datatype "text" \ - -pretty_name "#acs-translations.organization_customernotes#" \ - -pretty_plural "#acs-translations.organization_customernotes_plural#" \ + -pretty_name "Notes on Customer" \ + -pretty_plural "Notes on Customer" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -950,9 +1239,6 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations organization_customernotes "Notes on Customer" - lang::message::register en_US acs-translations organization_customernotes_plural "Notes on Customer" - ams::attribute::new \ -attribute_id $attribute_id \ -widget "textarea" \ @@ -961,30 +1247,26 @@ ams::list::attribute::map \ -list_id $list_id \ -attribute_id $attribute_id \ - -sort_order "3" \ + -sort_order "40" \ -required_p "f" \ -section_heading "" - - ########################### - # - # Organization: Suppliers - # - ########################### + # Person - Customer + set list_id [ams::list::new \ -package_key "contacts" \ - -object_type "organization" \ - -list_name "${contacts_package_id}__${supplier_id}" \ - -pretty_name "#${contacts_package_id}__${supplier_id}#" \ + -object_type "person" \ + -list_name "${contacts_package_id}__${customers_id}" \ + -pretty_name "1247__1264" \ -description "" \ -description_mime_type ""] set attribute_id [attribute::new \ - -object_type "organization" \ - -attribute_name "bankaccountnumber" \ + -object_type "person" \ + -attribute_name "department" \ -datatype "string" \ - -pretty_name "#acs-translations.organization_bankaccountnumber#" \ - -pretty_plural "#acs-translations.organization_bankaccountnumber_plural#" \ + -pretty_name "Department" \ + -pretty_plural "Departments" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -995,9 +1277,6 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations organization_bankaccountnumber "Bank Account No.o" - lang::message::register en_US acs-translations organization_bankaccountnumber_plural "Bank Account Numbers*" - ams::attribute::new \ -attribute_id $attribute_id \ -widget "textbox" \ @@ -1006,16 +1285,16 @@ ams::list::attribute::map \ -list_id $list_id \ -attribute_id $attribute_id \ - -sort_order "1" \ + -sort_order "10" \ -required_p "f" \ -section_heading "" set attribute_id [attribute::new \ - -object_type "organization" \ - -attribute_name "bankcode" \ + -object_type "person" \ + -attribute_name "jobtitle" \ -datatype "string" \ - -pretty_name "#acs-translations.organization_bankcode#" \ - -pretty_plural "#acs-translations.organization_bankcode_plural#" \ + -pretty_name "Job Title" \ + -pretty_plural "Job Titles" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -1026,9 +1305,6 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations organization_bankcode "Bank Codeo" - lang::message::register en_US acs-translations organization_bankcode_plural "Bank Codes*" - ams::attribute::new \ -attribute_id $attribute_id \ -widget "textbox" \ @@ -1037,16 +1313,16 @@ ams::list::attribute::map \ -list_id $list_id \ -attribute_id $attribute_id \ - -sort_order "2" \ + -sort_order "20" \ -required_p "f" \ -section_heading "" set attribute_id [attribute::new \ - -object_type "organization" \ - -attribute_name "bankname" \ + -object_type "person" \ + -attribute_name "directphoneno" \ -datatype "string" \ - -pretty_name "#acs-translations.organization_bankname#" \ - -pretty_plural "#acs-translations.organization_bankname_plural#" \ + -pretty_name "Direct Phone No." \ + -pretty_plural "Direct Phone Numbers" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -1057,27 +1333,24 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations organization_bankname "Name of Banko" - lang::message::register en_US acs-translations organization_bankname_plural "Name of Banks*" - ams::attribute::new \ -attribute_id $attribute_id \ - -widget "textbox" \ + -widget "telecom_number" \ -dynamic_p "t" ams::list::attribute::map \ -list_id $list_id \ -attribute_id $attribute_id \ - -sort_order "3" \ + -sort_order "30" \ -required_p "f" \ -section_heading "" set attribute_id [attribute::new \ - -object_type "organization" \ - -attribute_name "speciliazedlanguages" \ + -object_type "person" \ + -attribute_name "telephone_other" \ -datatype "string" \ - -pretty_name "#acs-translations.organization_speciliazedlanguages#" \ - -pretty_plural "#acs-translations.organization_speciliazedlanguages_plural#" \ + -pretty_name "Other Tel. No." \ + -pretty_plural "Other Tel. Numbers" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -1088,57 +1361,108 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations organization_speciliazedlanguages "Speciliazed Languageso" - lang::message::register en_US acs-translations organization_speciliazedlanguages_plural "Speciliazed Languages*" - ams::attribute::new \ -attribute_id $attribute_id \ - -widget "multiselect" \ + -widget "telecom_number" \ -dynamic_p "t" ams::list::attribute::map \ -list_id $list_id \ -attribute_id $attribute_id \ - -sort_order "4" \ + -sort_order "40" \ -required_p "f" \ -section_heading "" - set option_id [ams::option::new \ - -attribute_id $attribute_id \ - -option "#acs-translations.organization_speciliazedlanguages_English_UK#"] + set attribute_id [attribute::new \ + -object_type "person" \ + -attribute_name "directfaxno" \ + -datatype "string" \ + -pretty_name "Direct Fax No." \ + -pretty_plural "Direct Fax Numbers" \ + -table_name "" \ + -column_name "" \ + -default_value "" \ + -min_n_values "1" \ + -max_n_values "1" \ + -sort_order "1" \ + -storage "generic" \ + -static_p "f" \ + -if_does_not_exist] - lang::message::register en_US acs-translations organization_speciliazedlanguages_English_UK "English_UK" + ams::attribute::new \ + -attribute_id $attribute_id \ + -widget "telecom_number" \ + -dynamic_p "t" - set option_id [ams::option::new \ - -attribute_id $attribute_id \ - -option "#acs-translations.organization_speciliazedlanguages_English_US#"] + ams::list::attribute::map \ + -list_id $list_id \ + -attribute_id $attribute_id \ + -sort_order "50" \ + -required_p "f" \ + -section_heading "" - lang::message::register en_US acs-translations organization_speciliazedlanguages_English_US "English_US" + set attribute_id [attribute::new \ + -object_type "person" \ + -attribute_name "mobile_phone" \ + -datatype "string" \ + -pretty_name "Mobile Phone No." \ + -pretty_plural "Mobile Phones" \ + -table_name "" \ + -column_name "" \ + -default_value "" \ + -min_n_values "1" \ + -max_n_values "1" \ + -sort_order "1" \ + -storage "generic" \ + -static_p "f" \ + -if_does_not_exist] - set option_id [ams::option::new \ - -attribute_id $attribute_id \ - -option "#acs-translations.organization_speciliazedlanguages_French#"] + ams::attribute::new \ + -attribute_id $attribute_id \ + -widget "telecom_number" \ + -dynamic_p "t" - lang::message::register en_US acs-translations organization_speciliazedlanguages_French "French" + ams::list::attribute::map \ + -list_id $list_id \ + -attribute_id $attribute_id \ + -sort_order "60" \ + -required_p "f" \ + -section_heading "" - set option_id [ams::option::new \ - -attribute_id $attribute_id \ - -option "#acs-translations.organization_speciliazedlanguages_German#"] + set attribute_id [attribute::new \ + -object_type "person" \ + -attribute_name "directemail" \ + -datatype "email" \ + -pretty_name "E-Mail Adress" \ + -pretty_plural "E-Mail Adresses" \ + -table_name "" \ + -column_name "" \ + -default_value "" \ + -min_n_values "1" \ + -max_n_values "1" \ + -sort_order "1" \ + -storage "generic" \ + -static_p "f" \ + -if_does_not_exist] - lang::message::register en_US acs-translations organization_speciliazedlanguages_German "German" + ams::attribute::new \ + -attribute_id $attribute_id \ + -widget "email" \ + -dynamic_p "t" - set option_id [ams::option::new \ - -attribute_id $attribute_id \ - -option "#acs-translations.organization_speciliazedlanguages_Spanish#"] + ams::list::attribute::map \ + -list_id $list_id \ + -attribute_id $attribute_id \ + -sort_order "70" \ + -required_p "f" \ + -section_heading "" - lang::message::register en_US acs-translations organization_speciliazedlanguages_Spanish "Spanish" - set attribute_id [attribute::new \ - -object_type "organization" \ - -attribute_name "specializedsubjectareas" \ + -object_type "person" \ + -attribute_name "delivery_address" \ -datatype "string" \ - -pretty_name "#acs-translations.organization_specializedsubjectareas#" \ - -pretty_plural "#acs-translations.organization_specializedsubjectareas_plural#" \ + -pretty_name "Delivery Address" \ + -pretty_plural "Delivery Addresses" \ -table_name "" \ -column_name "" \ -default_value "" \ @@ -1149,51 +1473,74 @@ -static_p "f" \ -if_does_not_exist] - lang::message::register en_US acs-translations organization_specializedsubjectareas "Specialized Subject Areaso" - lang::message::register en_US acs-translations organization_specializedsubjectareas_plural "Specialized Subject Areas*" - ams::attribute::new \ -attribute_id $attribute_id \ - -widget "multiselect" \ + -widget "postal_address" \ -dynamic_p "t" ams::list::attribute::map \ -list_id $list_id \ -attribute_id $attribute_id \ - -sort_order "5" \ + -sort_order "80" \ -required_p "f" \ -section_heading "" - set option_id [ams::option::new \ - -attribute_id $attribute_id \ - -option "#acs-translations.organization_specializedsubjectareas_Advertisement#"] + set attribute_id [attribute::new \ + -object_type "person" \ + -attribute_name "visitaddress" \ + -datatype "string" \ + -pretty_name "Visit Adress" \ + -pretty_plural "Visit Addresses" \ + -table_name "" \ + -column_name "" \ + -default_value "" \ + -min_n_values "1" \ + -max_n_values "1" \ + -sort_order "1" \ + -storage "generic" \ + -static_p "f" \ + -if_does_not_exist] - lang::message::register en_US acs-translations organization_specializedsubjectareas_Advertisement "Advertisement" + ams::attribute::new \ + -attribute_id $attribute_id \ + -widget "postal_address" \ + -dynamic_p "t" - set option_id [ams::option::new \ - -attribute_id $attribute_id \ - -option "#acs-translations.organization_specializedsubjectareas_lt_Computers_-_Webbased_#"] + ams::list::attribute::map \ + -list_id $list_id \ + -attribute_id $attribute_id \ + -sort_order "90" \ + -required_p "f" \ + -section_heading "" - lang::message::register en_US acs-translations organization_specializedsubjectareas_lt_Computers_-_Webbased_ "Computers - Webbased Technologies" + set attribute_id [attribute::new \ + -object_type "person" \ + -attribute_name "collaboration_notes" \ + -datatype "text" \ + -pretty_name "Notes on Collboration" \ + -pretty_plural "Notes on Collboration" \ + -table_name "" \ + -column_name "" \ + -default_value "" \ + -min_n_values "1" \ + -max_n_values "1" \ + -sort_order "1" \ + -storage "generic" \ + -static_p "f" \ + -if_does_not_exist] - set option_id [ams::option::new \ - -attribute_id $attribute_id \ - -option "#acs-translations.organization_specializedsubjectareas_Engineering#"] + ams::attribute::new \ + -attribute_id $attribute_id \ + -widget "textarea" \ + -dynamic_p "t" - lang::message::register en_US acs-translations organization_specializedsubjectareas_Engineering "Engineering" + ams::list::attribute::map \ + -list_id $list_id \ + -attribute_id $attribute_id \ + -sort_order "100" \ + -required_p "f" \ + -section_heading "" - set option_id [ams::option::new \ - -attribute_id $attribute_id \ - -option "#acs-translations.organization_specializedsubjectareas_Law#"] - - lang::message::register en_US acs-translations organization_specializedsubjectareas_Law "Law" - - set option_id [ams::option::new \ - -attribute_id $attribute_id \ - -option "#acs-translations.organization_specializedsubjectareas_Public_Relations#"] - - lang::message::register en_US acs-translations organization_specializedsubjectareas_Public_Relations "Public Relations" - # Register Relationships rel_types::create_role -role "parent_company" -pretty_name "Parent Company" -pretty_plural "Parent Companies" @@ -1208,5 +1555,79 @@ "organization" \ "0" \ "" + # Contact Rels Employement + set list_id [ams::list::new \ + -package_key "contacts" \ + -object_type "contact_rels_employment" \ + -list_name "$contacts_package_id" \ + -pretty_name "Contact Rels Employement" \ + -description "" \ + -description_mime_type ""] + + set attribute_id [attribute::new \ + -object_type "contact_rels_employment" \ + -attribute_name "employed_since" \ + -datatype "string" \ + -pretty_name "Employment Since" \ + -pretty_plural "Employments since" \ + -table_name "" \ + -column_name "" \ + -default_value "" \ + -min_n_values "1" \ + -max_n_values "1" \ + -sort_order "1" \ + -storage "generic" \ + -static_p "f" \ + -if_does_not_exist] + + ams::attribute::new \ + -attribute_id $attribute_id \ + -widget "textbox" \ + -dynamic_p "t" + + ams::list::attribute::map \ + -list_id $list_id \ + -attribute_id $attribute_id \ + -sort_order "1" \ + -required_p "f" \ + -section_heading "" + + # Contact Rels Subsidiary + + set list_id [ams::list::new \ + -package_key "contacts" \ + -object_type "contact_rels_subsidiary" \ + -list_name "$contacts_package_id" \ + -pretty_name "Contact Rels Subsidiary" \ + -description "" \ + -description_mime_type ""] + + set attribute_id [attribute::new \ + -object_type "contact_rels_subsidiary" \ + -attribute_name "shares" \ + -datatype "integer" \ + -pretty_name "Shares" \ + -pretty_plural "Shares" \ + -table_name "" \ + -column_name "" \ + -default_value "" \ + -min_n_values "1" \ + -max_n_values "1" \ + -sort_order "1" \ + -storage "generic" \ + -static_p "f" \ + -if_does_not_exist] + + ams::attribute::new \ + -attribute_id $attribute_id \ + -widget "integer" \ + -dynamic_p "t" + + ams::list::attribute::map \ + -list_id $list_id \ + -attribute_id $attribute_id \ + -sort_order "1" \ + -required_p "f" \ + -section_heading "" } \ No newline at end of file Index: openacs-4/packages/contacts/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/index.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/contacts/www/index.tcl 10 Jun 2005 09:23:27 -0000 1.6 +++ openacs-4/packages/contacts/www/index.tcl 10 Jun 2005 21:52:20 -0000 1.7 @@ -316,3 +316,8 @@ } -on_submit { } -after_submit { } + +# Make the Navigation bar context sensitive + +set person_add_url [export_vars -base "contact-add" -url {{object_type "person"} group_id}] +set organization_add_url [export_vars -base "contact-add" -url {{object_type "organization"} group_id}] \ No newline at end of file Index: openacs-4/packages/contacts/www/search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/search.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/contacts/www/search.tcl 10 Jun 2005 09:23:27 -0000 1.5 +++ openacs-4/packages/contacts/www/search.tcl 10 Jun 2005 21:52:20 -0000 1.6 @@ -83,8 +83,8 @@ set object_type_pretty $object_type_pretty_name($object_type) append form_elements { {object_type:text(hidden) {value $object_type}} - {object_type_pretty:text(inform) {label {Search for}} {value "$object_type_pretty"} {after_html "[_ contacts.which_match]"}} - {all_or_any:text(select),optional {label ""} {options {{All all} {Any any}}} {after_html "[_ contacts.lt_of_the_following_cond]
"}} + {object_type_pretty:text(inform) {label {[_ contacts.Search_for]}} {value "$object_type_pretty"} {after_html "[_ contacts.which_match]"}} + {all_or_any:text(select),optional {label ""} {options {{[_ acs-kernel.common_All] all} {[_ acs-kernel.common_Any] any}}} {after_html "[_ contacts.lt_of_the_following_cond]
"}} } } else { set object_type_options [list]