From c99565d6e6beebb826a169140bda2a6e77c01576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Thu, 21 Aug 2008 12:38:31 +0000 Subject: [PATCH] Add some better columns for relationfields listbox. Use "proxy_listbox_ids" feature to reuse Organisations and Persons listboxs fix destination_section_title who was using all nodes and not only Organisation/Person git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@23080 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../my_destination_administration_title.xml | 6 +- .../my_destination_decision_title.xml | 48 ++++++++++++++++ .../my_destination_payment_title.xml | 52 +++++++++++++++-- .../my_destination_section_title.xml | 56 ++++++++++++++++++- .../my_destination_title.xml | 48 ++++++++++++++++ .../my_source_administration_title.xml | 48 ++++++++++++++++ .../my_source_decision_title.xml | 48 ++++++++++++++++ .../my_source_section_title.xml | 48 ++++++++++++++++ .../my_source_title.xml | 48 ++++++++++++++++ bt5/erp5_trade/bt/revision | 2 +- 10 files changed, 394 insertions(+), 10 deletions(-) diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_administration_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_administration_title.xml index dae6fe0b30..3242da1a7e 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_administration_title.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_administration_title.xml @@ -77,7 +77,7 @@ <value> <dictionary> <item> - <key> <string>description</string> </key> + <key> <string>description</string> </key> <value> <string>The person or organisation which the invoice should be sent to and who is in charge of handling administrative paperwork for the client.</string> </value> </item> <item> @@ -89,7 +89,7 @@ <value> <string>Base_viewFieldLibrary</string> </value> </item> <item> - <key> <string>portal_type</string> </key> + <key> <string>portal_type</string> </key> <value> <list> <tuple> @@ -108,7 +108,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Invoice Recipient</string> </value> </item> </dictionary> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_decision_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_decision_title.xml index f7c1f0af53..dd595ac90f 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_decision_title.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_decision_title.xml @@ -16,6 +16,8 @@ <string>title</string> <string>description</string> <string>portal_type</string> + <string>columns</string> + <string>proxy_listbox_ids</string> </list> </value> </item> @@ -76,6 +78,37 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>columns</string> </key> + <value> + <list> + <tuple> + <string>title</string> + <string>Usual Name</string> + </tuple> + <tuple> + <string>description</string> + <string>Description</string> + </tuple> + <tuple> + <string>getDefaultTelephoneText</string> + <string>Telephone</string> + </tuple> + <tuple> + <string>getDefaultAddressText</string> + <string>Address</string> + </tuple> + <tuple> + <string>translated_portal_type</string> + <string>Type</string> + </tuple> + <tuple> + <string>translated_validation_state_title</string> + <string>State</string> + </tuple> + </list> + </value> + </item> <item> <key> <string>description</string> </key> <value> <string>The person or organisation in charge of selecting the supplier or taking the decision to place the order.</string> </value> @@ -103,6 +136,21 @@ </list> </value> </item> + <item> + <key> <string>proxy_listbox_ids</string> </key> + <value> + <list> + <tuple> + <string>OrganisationModule_viewOrganisationList/listbox</string> + <string>Organisations</string> + </tuple> + <tuple> + <string>PersonModule_viewPersonList/listbox</string> + <string>Persons</string> + </tuple> + </list> + </value> + </item> <item> <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_payment_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_payment_title.xml index 45a8a49ac4..c9fd0e469d 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_payment_title.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_payment_title.xml @@ -15,6 +15,8 @@ <list> <string>title</string> <string>portal_type</string> + <string>columns</string> + <string>proxy_listbox_ids</string> </list> </value> </item> @@ -76,8 +78,35 @@ <value> <dictionary> <item> - <key> <string>description</string> </key> - <value> <string>The organisation or person in charge of paying for the client.</string> </value> + <key> <string>columns</string> </key> + <value> + <list> + <tuple> + <string>title</string> + <string>Usual Name</string> + </tuple> + <tuple> + <string>description</string> + <string>Description</string> + </tuple> + <tuple> + <string>getDefaultTelephoneText</string> + <string>Telephone</string> + </tuple> + <tuple> + <string>getDefaultAddressText</string> + <string>Address</string> + </tuple> + <tuple> + <string>translated_portal_type</string> + <string>Type</string> + </tuple> + <tuple> + <string>translated_validation_state_title</string> + <string>State</string> + </tuple> + </list> + </value> </item> <item> <key> <string>field_id</string> </key> @@ -88,7 +117,7 @@ <value> <string>Base_viewFieldLibrary</string> </value> </item> <item> - <key> <string>portal_type</string> </key> + <key> <string>portal_type</string> </key> <value> <list> <tuple> @@ -102,12 +131,27 @@ </list> </value> </item> + <item> + <key> <string>proxy_listbox_ids</string> </key> + <value> + <list> + <tuple> + <string>OrganisationModule_viewOrganisationList/listbox</string> + <string>Organisations</string> + </tuple> + <tuple> + <string>PersonModule_viewPersonList/listbox</string> + <string>Persons</string> + </tuple> + </list> + </value> + </item> <item> <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Payer</string> </value> </item> </dictionary> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_section_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_section_title.xml index f9d046efd0..9a73b51902 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_section_title.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_section_title.xml @@ -16,6 +16,8 @@ <string>title</string> <string>description</string> <string>portal_type</string> + <string>columns</string> + <string>proxy_listbox_ids</string> </list> </value> </item> @@ -82,6 +84,37 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>columns</string> </key> + <value> + <list> + <tuple> + <string>title</string> + <string>Usual Name</string> + </tuple> + <tuple> + <string>description</string> + <string>Description</string> + </tuple> + <tuple> + <string>getDefaultTelephoneText</string> + <string>Telephone</string> + </tuple> + <tuple> + <string>getDefaultAddressText</string> + <string>Address</string> + </tuple> + <tuple> + <string>translated_portal_type</string> + <string>Type</string> + </tuple> + <tuple> + <string>translated_validation_state_title</string> + <string>State</string> + </tuple> + </list> + </value> + </item> <item> <key> <string>description</string> </key> <value> <string>The invoiced person or organisation.</string> </value> @@ -99,8 +132,27 @@ <value> <list> <tuple> - <string>Node Group</string> - <string>Node Group</string> + <string>Organisation</string> + <string>Organisation</string> + </tuple> + <tuple> + <string>Person</string> + <string>Person</string> + </tuple> + </list> + </value> + </item> + <item> + <key> <string>proxy_listbox_ids</string> </key> + <value> + <list> + <tuple> + <string>OrganisationModule_viewOrganisationList/listbox</string> + <string>Organisations</string> + </tuple> + <tuple> + <string>PersonModule_viewPersonList/listbox</string> + <string>Persons</string> </tuple> </list> </value> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_title.xml index 70ed712e31..f7d8644e7b 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_title.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_title.xml @@ -16,6 +16,8 @@ <string>title</string> <string>description</string> <string>portal_type</string> + <string>columns</string> + <string>proxy_listbox_ids</string> </list> </value> </item> @@ -76,6 +78,37 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>columns</string> </key> + <value> + <list> + <tuple> + <string>title</string> + <string>Usual Name</string> + </tuple> + <tuple> + <string>description</string> + <string>Description</string> + </tuple> + <tuple> + <string>getDefaultTelephoneText</string> + <string>Telephone</string> + </tuple> + <tuple> + <string>getDefaultAddressText</string> + <string>Address</string> + </tuple> + <tuple> + <string>translated_portal_type</string> + <string>Type</string> + </tuple> + <tuple> + <string>translated_validation_state_title</string> + <string>State</string> + </tuple> + </list> + </value> + </item> <item> <key> <string>description</string> </key> <value> <string>The organisation or person to whom merchandise or service is delivered over or provided to.</string> </value> @@ -103,6 +136,21 @@ </list> </value> </item> + <item> + <key> <string>proxy_listbox_ids</string> </key> + <value> + <list> + <tuple> + <string>OrganisationModule_viewOrganisationList/listbox</string> + <string>Organisations</string> + </tuple> + <tuple> + <string>PersonModule_viewPersonList/listbox</string> + <string>Persons</string> + </tuple> + </list> + </value> + </item> <item> <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_source_administration_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_source_administration_title.xml index 5970a46876..bd4346419e 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_source_administration_title.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_source_administration_title.xml @@ -16,6 +16,8 @@ <string>title</string> <string>description</string> <string>portal_type</string> + <string>columns</string> + <string>proxy_listbox_ids</string> </list> </value> </item> @@ -76,6 +78,37 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>columns</string> </key> + <value> + <list> + <tuple> + <string>title</string> + <string>Usual Name</string> + </tuple> + <tuple> + <string>description</string> + <string>Description</string> + </tuple> + <tuple> + <string>getDefaultTelephoneText</string> + <string>Telephone</string> + </tuple> + <tuple> + <string>getDefaultAddressText</string> + <string>Address</string> + </tuple> + <tuple> + <string>translated_portal_type</string> + <string>Type</string> + </tuple> + <tuple> + <string>translated_validation_state_title</string> + <string>State</string> + </tuple> + </list> + </value> + </item> <item> <key> <string>description</string> </key> <value> <string>The person or organisation in charge of sending the invoice or handling administrative paperwork for the supplier.</string> </value> @@ -103,6 +136,21 @@ </list> </value> </item> + <item> + <key> <string>proxy_listbox_ids</string> </key> + <value> + <list> + <tuple> + <string>OrganisationModule_viewOrganisationList/listbox</string> + <string>Organisations</string> + </tuple> + <tuple> + <string>PersonModule_viewPersonList/listbox</string> + <string>Persons</string> + </tuple> + </list> + </value> + </item> <item> <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_source_decision_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_source_decision_title.xml index d73a38535d..21ac7a8762 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_source_decision_title.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_source_decision_title.xml @@ -16,6 +16,8 @@ <string>title</string> <string>description</string> <string>portal_type</string> + <string>columns</string> + <string>proxy_listbox_ids</string> </list> </value> </item> @@ -76,6 +78,37 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>columns</string> </key> + <value> + <list> + <tuple> + <string>title</string> + <string>Usual Name</string> + </tuple> + <tuple> + <string>description</string> + <string>Description</string> + </tuple> + <tuple> + <string>getDefaultTelephoneText</string> + <string>Telephone</string> + </tuple> + <tuple> + <string>getDefaultAddressText</string> + <string>Address</string> + </tuple> + <tuple> + <string>translated_portal_type</string> + <string>Type</string> + </tuple> + <tuple> + <string>translated_validation_state_title</string> + <string>State</string> + </tuple> + </list> + </value> + </item> <item> <key> <string>description</string> </key> <value> <string>The person or organisation in charge of handling the sales process or of taking the sales decision.</string> </value> @@ -103,6 +136,21 @@ </list> </value> </item> + <item> + <key> <string>proxy_listbox_ids</string> </key> + <value> + <list> + <tuple> + <string>OrganisationModule_viewOrganisationList/listbox</string> + <string>Organisations</string> + </tuple> + <tuple> + <string>PersonModule_viewPersonList/listbox</string> + <string>Persons</string> + </tuple> + </list> + </value> + </item> <item> <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_source_section_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_source_section_title.xml index 9e31c60fc1..d65187b250 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_source_section_title.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_source_section_title.xml @@ -16,6 +16,8 @@ <string>title</string> <string>description</string> <string>portal_type</string> + <string>columns</string> + <string>proxy_listbox_ids</string> </list> </value> </item> @@ -76,6 +78,37 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>columns</string> </key> + <value> + <list> + <tuple> + <string>title</string> + <string>Usual Name</string> + </tuple> + <tuple> + <string>description</string> + <string>Description</string> + </tuple> + <tuple> + <string>getDefaultTelephoneText</string> + <string>Telephone</string> + </tuple> + <tuple> + <string>getDefaultAddressText</string> + <string>Address</string> + </tuple> + <tuple> + <string>translated_portal_type</string> + <string>Type</string> + </tuple> + <tuple> + <string>translated_validation_state_title</string> + <string>State</string> + </tuple> + </list> + </value> + </item> <item> <key> <string>description</string> </key> <value> <string>The invoicing person or organisation.</string> </value> @@ -103,6 +136,21 @@ </list> </value> </item> + <item> + <key> <string>proxy_listbox_ids</string> </key> + <value> + <list> + <tuple> + <string>OrganisationModule_viewOrganisationList/listbox</string> + <string>Organisations</string> + </tuple> + <tuple> + <string>PersonModule_viewPersonList/listbox</string> + <string>Persons</string> + </tuple> + </list> + </value> + </item> <item> <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_source_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_source_title.xml index 9ffcdeadb3..babd28e007 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_source_title.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_source_title.xml @@ -16,6 +16,8 @@ <string>title</string> <string>description</string> <string>portal_type</string> + <string>columns</string> + <string>proxy_listbox_ids</string> </list> </value> </item> @@ -76,6 +78,37 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>columns</string> </key> + <value> + <list> + <tuple> + <string>title</string> + <string>Usual Name</string> + </tuple> + <tuple> + <string>description</string> + <string>Description</string> + </tuple> + <tuple> + <string>getDefaultTelephoneText</string> + <string>Telephone</string> + </tuple> + <tuple> + <string>getDefaultAddressText</string> + <string>Address</string> + </tuple> + <tuple> + <string>translated_portal_type</string> + <string>Type</string> + </tuple> + <tuple> + <string>translated_validation_state_title</string> + <string>State</string> + </tuple> + </list> + </value> + </item> <item> <key> <string>description</string> </key> <value> <string>The organisation or person who sends merchandise or provides service.</string> </value> @@ -103,6 +136,21 @@ </list> </value> </item> + <item> + <key> <string>proxy_listbox_ids</string> </key> + <value> + <list> + <tuple> + <string>OrganisationModule_viewOrganisationList/listbox</string> + <string>Organisations</string> + </tuple> + <tuple> + <string>PersonModule_viewPersonList/listbox</string> + <string>Persons</string> + </tuple> + </list> + </value> + </item> <item> <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index 4c9bbbfa9a..281cd66131 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -468 \ No newline at end of file +469 \ No newline at end of file -- 2.30.9