Skip to content

E
erp5_workflow
Commit 383b4e9e authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

pdm: Display quantity unit next to priced quantity on supply lines

parent 56177932
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 6 deletions
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view.xml
View file @ 383b4e9e
...@@ -86,8 +86,8 @@ ...@@ -86,8 +86,8 @@
<string>my_resource_title</string> <string>my_resource_title</string>
<string>my_source_reference</string> <string>my_source_reference</string>
<string>my_priced_quantity</string> <string>my_priced_quantity</string>
<string>your_quantity_unit</string>
<string>my_base_unit_price</string> <string>my_base_unit_price</string>
<string>my_quantity_unit</string>
<string>my_price_currency</string> <string>my_price_currency</string>
<string>my_destination_account</string> <string>my_destination_account</string>
<string>my_start_date_range_min</string> <string>my_start_date_range_min</string>
......
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_quantity_unit.xml → bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/your_quantity_unit.xml
View file @ 383b4e9e
...@@ -9,12 +9,16 @@ ...@@ -9,12 +9,16 @@
<item> <item>
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list/> <list>
<string>default</string>
<string>editable</string>
<string>enabled</string>
</list>
</value> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_quantity_unit</string> </value> <value> <string>your_quantity_unit</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -50,6 +54,20 @@ ...@@ -50,6 +54,20 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>extra_context</string> </key> <key> <string>extra_context</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -62,6 +80,10 @@ ...@@ -62,6 +80,10 @@
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -69,6 +91,18 @@ ...@@ -69,6 +91,18 @@
<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>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>extra_context</string> </key> <key> <string>extra_context</string> </key>
<value> <value>
...@@ -89,4 +123,17 @@ ...@@ -89,4 +123,17 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </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>python: context.getResource() and context.getResourceValue().getQuantityUnit()</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view.xml
View file @ 383b4e9e
...@@ -96,8 +96,8 @@ ...@@ -96,8 +96,8 @@
<string>my_resource_title</string> <string>my_resource_title</string>
<string>my_destination_reference</string> <string>my_destination_reference</string>
<string>my_priced_quantity</string> <string>my_priced_quantity</string>
<string>your_quantity_unit</string>
<string>my_base_unit_price</string> <string>my_base_unit_price</string>
<string>my_quantity_unit</string>
<string>my_price_currency</string> <string>my_price_currency</string>
<string>my_source_account</string> <string>my_source_account</string>
<string>my_start_date_range_min</string> <string>my_start_date_range_min</string>
......
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_quantity_unit.xml → bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/your_quantity_unit.xml
View file @ 383b4e9e
...@@ -9,12 +9,16 @@ ...@@ -9,12 +9,16 @@
<item> <item>
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list/> <list>
<string>default</string>
<string>editable</string>
<string>enabled</string>
</list>
</value> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_quantity_unit</string> </value> <value> <string>your_quantity_unit</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -50,6 +54,20 @@ ...@@ -50,6 +54,20 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>extra_context</string> </key> <key> <string>extra_context</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -62,6 +80,10 @@ ...@@ -62,6 +80,10 @@
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -69,6 +91,18 @@ ...@@ -69,6 +91,18 @@
<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>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>extra_context</string> </key> <key> <string>extra_context</string> </key>
<value> <value>
...@@ -89,4 +123,17 @@ ...@@ -89,4 +123,17 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </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>python: context.getResource() and context.getResourceValue().getQuantityUnit()</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
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