Skip to content

GitLab

Commit dadd047d authored by Julien Muchembled's avatar Julien Muchembled
Browse files

amount_generator: refresh "Trade Model" view on deliveries and delivery lines

parent e29ba689
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 39 deletions
bt5/erp5_invoicing/ActionTemplateItem/portal_types/Invoice%20Line/view_trade_model.xml
View file @ dadd047d
......@@ -71,7 +71,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/DeliveryLine_viewAggregatedAmountList</string> </value>
<value> <string>string:${object_url}/Base_viewAggregatedAmountList</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_trade_model.xml
View file @ dadd047d
......@@ -71,7 +71,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/Delivery_viewAggregatedAmountList</string> </value>
<value> <string>string:${object_url}/Base_viewAggregatedAmountList</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/view_trade_model.xml
View file @ dadd047d
......@@ -71,7 +71,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/Delivery_viewAggregatedAmountList</string> </value>
<value> <string>string:${object_url}/Base_viewAggregatedAmountList</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/view_trade_model.xml
View file @ dadd047d
......@@ -30,7 +30,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
......@@ -71,7 +73,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/DeliveryLine_viewAggregatedAmountList</string> </value>
<value> <string>string:${object_url}/Base_viewAggregatedAmountList</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view_trade_model.xml
View file @ dadd047d
......@@ -30,7 +30,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
......@@ -71,7 +73,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/Delivery_viewAggregatedAmountList</string> </value>
<value> <string>string:${object_url}/Base_viewAggregatedAmountList</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/view_trade_model.xml
View file @ dadd047d
......@@ -30,7 +30,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
......@@ -71,7 +73,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/DeliveryLine_viewAggregatedAmountList</string> </value>
<value> <string>string:${object_url}/Base_viewAggregatedAmountList</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_trade_model.xml
View file @ dadd047d
......@@ -30,7 +30,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
......@@ -71,7 +73,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/Delivery_viewAggregatedAmountList</string> </value>
<value> <string>string:${object_url}/Base_viewAggregatedAmountList</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getAggregatedAmountList.py 0 → 100644
View file @ dadd047d
return context.getAggregatedAmountList(rounding=rounding,
amount_generator_type_list=amount_generator_type_list)
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getAggregatedAmountList.xml 0 → 100644
View file @ dadd047d
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>rounding=False, amount_generator_type_list=None, *args, **kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_getAggregatedAmountList</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getGeneratedAmountList.py 0 → 100644
View file @ dadd047d
return context.getGeneratedAmountList(rounding=rounding,
amount_generator_type_list=amount_generator_type_list)
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getSpecialisedAggregatedAmountList.xml → bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getGeneratedAmountList.xml
View file @ dadd047d
......@@ -50,11 +50,11 @@
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>*args, **kwargs</string> </value>
<value> <string>rounding=False, amount_generator_type_list=None, *args, **kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_getSpecialisedAggregatedAmountList</string> </value>
<value> <string>Base_getGeneratedAmountList</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getSpecialisedAggregatedAmountList.py deleted 100644 → 0
View file @ e29ba689
specialise = context.getSpecialiseValue(portal_type=('Purchase Trade Condition',
'Sale Trade Condition',
'Internal Trade Condition',))
if specialise is not None:
rounding = kwargs.get('rounding', False)
return specialise.getAggregatedAmountList(context, rounding=rounding)
return []
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList.xml → bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewAggregatedAmountList.xml
View file @ dadd047d
......@@ -117,7 +117,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Delivery_viewAggregatedAmountList</string> </value>
<value> <string>Base_viewAggregatedAmountList</string> </value>
</item>
<item>
<key> <string>method</string> </key>
......@@ -141,7 +141,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Trade Model</string> </value>
<value> <string>Aggregated Amounts</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
......@@ -151,6 +151,10 @@
<key> <string>update_action</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>update_action_title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox.xml → bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewAggregatedAmountList/listbox.xml
View file @ dadd047d
......@@ -12,8 +12,8 @@
<list>
<string>columns</string>
<string>editable_columns</string>
<string>lines</string>
<string>list_method</string>
<string>sort</string>
<string>title</string>
<string>url_columns</string>
</list>
......@@ -57,6 +57,14 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable_columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
......@@ -65,10 +73,22 @@
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>lines</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>list_method</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>url_columns</string> </key>
<value>
......@@ -92,7 +112,7 @@
</tuple>
<tuple>
<string>resource_title</string>
<string>Model</string>
<string>Resource</string>
</tuple>
<tuple>
<string>quantity</string>
......@@ -157,20 +177,13 @@
<value> <string>Base_viewTradeFieldLibrary</string> </value>
</item>
<item>
<key> <string>list_method</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
<key> <string>lines</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>sort</string> </key>
<key> <string>list_method</string> </key>
<value>
<list>
<tuple>
<string>float_index</string>
<string>float_index</string>
</tuple>
</list>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
......@@ -179,7 +192,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Applied Model Lines</string> </value>
<value> <string>Aggregated Amounts</string> </value>
</item>
<item>
<key> <string>url_columns</string> </key>
......@@ -214,7 +227,7 @@
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>Base_getSpecialisedAggregatedAmountList</string> </value>
<value> <string>Base_getAggregatedAmountList</string> </value>
</item>
</dictionary>
</pickle>
......
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