Skip to content

erp5
erp5
Commit c99565d6 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

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
parent 513ba3cc
Hide whitespace changes
Inline Side-by-side
Showing with 394 additions and 10 deletions
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_administration_title.xml
View file @ c99565d6
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<value> <value>
<dictionary> <dictionary>
<item> <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> <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>
<item> <item>
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<value> <string>Base_viewFieldLibrary</string> </value> <value> <string>Base_viewFieldLibrary</string> </value>
</item> </item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <value>
<list> <list>
<tuple> <tuple>
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Invoice Recipient</string> </value> <value> <string>Invoice Recipient</string> </value>
</item> </item>
</dictionary> </dictionary>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_decision_title.xml
View file @ c99565d6
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
<string>title</string> <string>title</string>
<string>description</string> <string>description</string>
<string>portal_type</string> <string>portal_type</string>
<string>columns</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -76,6 +78,37 @@ ...@@ -76,6 +78,37 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <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> <item>
<key> <string>description</string> </key> <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> <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 @@ ...@@ -103,6 +136,21 @@
</list> </list>
</value> </value>
</item> </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> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_payment_title.xml
View file @ c99565d6
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
<list> <list>
<string>title</string> <string>title</string>
<string>portal_type</string> <string>portal_type</string>
<string>columns</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -76,8 +78,35 @@ ...@@ -76,8 +78,35 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>description</string> </key> <key> <string>columns</string> </key>
<value> <string>The organisation or person in charge of paying for the client.</string> </value> <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>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
...@@ -88,7 +117,7 @@ ...@@ -88,7 +117,7 @@
<value> <string>Base_viewFieldLibrary</string> </value> <value> <string>Base_viewFieldLibrary</string> </value>
</item> </item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <value>
<list> <list>
<tuple> <tuple>
...@@ -102,12 +131,27 @@ ...@@ -102,12 +131,27 @@
</list> </list>
</value> </value>
</item> </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> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Payer</string> </value> <value> <string>Payer</string> </value>
</item> </item>
</dictionary> </dictionary>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_section_title.xml
View file @ c99565d6
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
<string>title</string> <string>title</string>
<string>description</string> <string>description</string>
<string>portal_type</string> <string>portal_type</string>
<string>columns</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -82,6 +84,37 @@ ...@@ -82,6 +84,37 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <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> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>The invoiced person or organisation.</string> </value> <value> <string>The invoiced person or organisation.</string> </value>
...@@ -99,8 +132,27 @@ ...@@ -99,8 +132,27 @@
<value> <value>
<list> <list>
<tuple> <tuple>
<string>Node Group</string> <string>Organisation</string>
<string>Node Group</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> </tuple>
</list> </list>
</value> </value>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_title.xml
View file @ c99565d6
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
<string>title</string> <string>title</string>
<string>description</string> <string>description</string>
<string>portal_type</string> <string>portal_type</string>
<string>columns</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -76,6 +78,37 @@ ...@@ -76,6 +78,37 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <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> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>The organisation or person to whom merchandise or service is delivered over or provided to.</string> </value> <value> <string>The organisation or person to whom merchandise or service is delivered over or provided to.</string> </value>
...@@ -103,6 +136,21 @@ ...@@ -103,6 +136,21 @@
</list> </list>
</value> </value>
</item> </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> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_source_administration_title.xml
View file @ c99565d6
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
<string>title</string> <string>title</string>
<string>description</string> <string>description</string>
<string>portal_type</string> <string>portal_type</string>
<string>columns</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -76,6 +78,37 @@ ...@@ -76,6 +78,37 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <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> <item>
<key> <string>description</string> </key> <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> <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 @@ ...@@ -103,6 +136,21 @@
</list> </list>
</value> </value>
</item> </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> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_source_decision_title.xml
View file @ c99565d6
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
<string>title</string> <string>title</string>
<string>description</string> <string>description</string>
<string>portal_type</string> <string>portal_type</string>
<string>columns</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -76,6 +78,37 @@ ...@@ -76,6 +78,37 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <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> <item>
<key> <string>description</string> </key> <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> <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 @@ ...@@ -103,6 +136,21 @@
</list> </list>
</value> </value>
</item> </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> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_source_section_title.xml
View file @ c99565d6
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
<string>title</string> <string>title</string>
<string>description</string> <string>description</string>
<string>portal_type</string> <string>portal_type</string>
<string>columns</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -76,6 +78,37 @@ ...@@ -76,6 +78,37 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <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> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>The invoicing person or organisation.</string> </value> <value> <string>The invoicing person or organisation.</string> </value>
...@@ -103,6 +136,21 @@ ...@@ -103,6 +136,21 @@
</list> </list>
</value> </value>
</item> </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> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_source_title.xml
View file @ c99565d6
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
<string>title</string> <string>title</string>
<string>description</string> <string>description</string>
<string>portal_type</string> <string>portal_type</string>
<string>columns</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -76,6 +78,37 @@ ...@@ -76,6 +78,37 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <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> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>The organisation or person who sends merchandise or provides service.</string> </value> <value> <string>The organisation or person who sends merchandise or provides service.</string> </value>
...@@ -103,6 +136,21 @@ ...@@ -103,6 +136,21 @@
</list> </list>
</value> </value>
</item> </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> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
......
bt5/erp5_trade/bt/revision
View file @ c99565d6
468 469
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7