Skip to content

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

Review PDM terms and report dialogs 

For PDM/Trade we use:
 - "Site" for node category
 - "Warehouse" for node
 - "Owner" for section category
 - "Owner" for section

For Invoicing/Accounting this does not change.

Also, since in PDM/Trade context we are sometimes only taking care of physical movements/quantities and not the ownership, make sure that:
 - "Site" is first in report dialogs
 - "Section Category" is not initialised from preference, so that reports show the quantities in a location regardless of the ownership

See merge request nexedi/erp5!1202
parents de40440f 2df5287b
Hide whitespace changes
Inline Side-by-side
Showing with 245 additions and 11 deletions
bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/AccountingTransactionModule_viewInvoiceReport/your_section_category.xml
View file @ d8ab59d1
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string>Base_viewTradeFieldLibrary</string> </value> <value> <string>Base_viewInvoicingFieldLibrary</string> </value>
</item> </item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
......
bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/AccountingTransactionModule_viewInvoiceReportDialog/your_section_category.xml
View file @ d8ab59d1
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string>Base_viewTradeFieldLibrary</string> </value> <value> <string>Base_viewInvoicingFieldLibrary</string> </value>
</item> </item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
......
bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Base_viewInvoicingFieldLibrary.xml
View file @ d8ab59d1
...@@ -87,6 +87,9 @@ ...@@ -87,6 +87,9 @@
<string>my_view_mode_destination_title</string> <string>my_view_mode_destination_title</string>
<string>my_view_mode_source_administration_title</string> <string>my_view_mode_source_administration_title</string>
<string>my_view_mode_source_section_title</string> <string>my_view_mode_source_section_title</string>
<string>my_dialog_mode_invoice_simulation_state</string>
<string>my_dialog_mode_section_category</string>
<string>my_report_mode_section_category</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Base_viewInvoicingFieldLibrary/my_dialog_mode_section_category.xml 0 → 100644
View file @ d8ab59d1
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_dialog_mode_section_category</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_dialog_mode_section_category</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Base_viewInvoicingFieldLibrary/my_report_mode_section_category.xml 0 → 100644
View file @ d8ab59d1
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>default</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_report_mode_section_category</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_dialog_mode_section_category</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewInvoicingFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>request/section_category | nothing</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox.xml
View file @ d8ab59d1
...@@ -96,11 +96,11 @@ ...@@ -96,11 +96,11 @@
</tuple> </tuple>
<tuple> <tuple>
<string>node_title</string> <string>node_title</string>
<string>Site or Warehouse</string> <string>Warehouse</string>
</tuple> </tuple>
<tuple> <tuple>
<string>section_title</string> <string>section_title</string>
<string>Organisation</string> <string>Owner</string>
</tuple> </tuple>
<tuple> <tuple>
<string>resource_title</string> <string>resource_title</string>
......
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Base_viewPDMFieldLibrary/my_dialog_mode_section_category.xml
View file @ d8ab59d1
...@@ -9,7 +9,10 @@ ...@@ -9,7 +9,10 @@
<item> <item>
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list/> <list>
<string>default</string>
<string>title</string>
</list>
</value> </value>
</item> </item>
<item> <item>
...@@ -69,6 +72,10 @@ ...@@ -69,6 +72,10 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_dialog_mode_section_category</string> </value> <value> <string>my_dialog_mode_section_category</string> </value>
...@@ -81,6 +88,10 @@ ...@@ -81,6 +88,10 @@
<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>
<key> <string>title</string> </key>
<value> <string>Owner</string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
......
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryDialog.xml
View file @ d8ab59d1
...@@ -105,8 +105,8 @@ ...@@ -105,8 +105,8 @@
<value> <value>
<list> <list>
<string>my_title</string> <string>my_title</string>
<string>your_section_category</string>
<string>your_node_category</string> <string>your_node_category</string>
<string>your_section_category</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryDialog/listbox.xml
View file @ d8ab59d1
...@@ -328,7 +328,7 @@ ...@@ -328,7 +328,7 @@
<list> <list>
<tuple> <tuple>
<string>node_title</string> <string>node_title</string>
<string>Site or Warehouse</string> <string>Warehouse</string>
</tuple> </tuple>
<tuple> <tuple>
<string>variation_category_item_list</string> <string>variation_category_item_list</string>
......
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistoryDialog/listbox.xml
View file @ d8ab59d1
...@@ -305,7 +305,7 @@ ...@@ -305,7 +305,7 @@
</tuple> </tuple>
<tuple> <tuple>
<string>node_title</string> <string>node_title</string>
<string>Stock</string> <string>Warehouse</string>
</tuple> </tuple>
<tuple> <tuple>
<string>section_title</string> <string>section_title</string>
......
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory/listbox.xml
View file @ d8ab59d1
...@@ -366,7 +366,7 @@ ...@@ -366,7 +366,7 @@
<list> <list>
<tuple> <tuple>
<string>node_title</string> <string>node_title</string>
<string>Site or Warehouse</string> <string>Warehouse</string>
</tuple> </tuple>
<tuple> <tuple>
<string>resource_title</string> <string>resource_title</string>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_dialog_mode_section_category.xml
View file @ d8ab59d1
...@@ -9,7 +9,10 @@ ...@@ -9,7 +9,10 @@
<item> <item>
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list/> <list>
<string>default</string>
<string>title</string>
</list>
</value> </value>
</item> </item>
<item> <item>
...@@ -50,6 +53,10 @@ ...@@ -50,6 +53,10 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -69,6 +76,10 @@ ...@@ -69,6 +76,10 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_dialog_mode_section_category</string> </value> <value> <string>my_dialog_mode_section_category</string> </value>
...@@ -81,6 +92,10 @@ ...@@ -81,6 +92,10 @@
<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>
<key> <string>title</string> </key>
<value> <string>Owner</string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox.xml
View file @ d8ab59d1
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
<list> <list>
<tuple> <tuple>
<string>node_title</string> <string>node_title</string>
<string>Stock</string> <string>Warehouse</string>
</tuple> </tuple>
<tuple> <tuple>
<string>resource_title</string> <string>resource_title</string>
......
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