diff --git a/bt5/erp5_pdm/ActionTemplateItem/portal_types/Component%20Module/converted_inventory_report.xml b/bt5/erp5_pdm/ActionTemplateItem/portal_types/Component%20Module/converted_inventory_report.xml deleted file mode 100644 index 852fcb77bad3858a5c1205588564303a74b57a8b..0000000000000000000000000000000000000000 --- a/bt5/erp5_pdm/ActionTemplateItem/portal_types/Component%20Module/converted_inventory_report.xml +++ /dev/null @@ -1,79 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>action</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>categories</string> </key> - <value> - <tuple> - <string>action_type/object_report</string> - </tuple> - </value> - </item> - <item> - <key> <string>category</string> </key> - <value> <string>object_report</string> </value> - </item> - <item> - <key> <string>condition</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>icon</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>converted_inventory_report</string> </value> - </item> - <item> - <key> <string>permissions</string> </key> - <value> - <tuple> - <string>View</string> - </tuple> - </value> - </item> - <item> - <key> <string>priority</string> </key> - <value> <float>2.0</float> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Converted Inventory Report</string> </value> - </item> - <item> - <key> <string>visible</string> </key> - <value> <int>1</int> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <global name="Expression" module="Products.CMFCore.Expression"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>text</string> </key> - <value> <string>string:${object_url}/ResourceModule_viewConvertedInventoryReportDialog</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_pdm/ActionTemplateItem/portal_types/Product%20Module/converted_inventory_report.xml b/bt5/erp5_pdm/ActionTemplateItem/portal_types/Product%20Module/converted_inventory_report.xml deleted file mode 100644 index 852fcb77bad3858a5c1205588564303a74b57a8b..0000000000000000000000000000000000000000 --- a/bt5/erp5_pdm/ActionTemplateItem/portal_types/Product%20Module/converted_inventory_report.xml +++ /dev/null @@ -1,79 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>action</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>categories</string> </key> - <value> - <tuple> - <string>action_type/object_report</string> - </tuple> - </value> - </item> - <item> - <key> <string>category</string> </key> - <value> <string>object_report</string> </value> - </item> - <item> - <key> <string>condition</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>icon</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>converted_inventory_report</string> </value> - </item> - <item> - <key> <string>permissions</string> </key> - <value> - <tuple> - <string>View</string> - </tuple> - </value> - </item> - <item> - <key> <string>priority</string> </key> - <value> <float>2.0</float> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Converted Inventory Report</string> </value> - </item> - <item> - <key> <string>visible</string> </key> - <value> <int>1</int> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <global name="Expression" module="Products.CMFCore.Expression"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>text</string> </key> - <value> <string>string:${object_url}/ResourceModule_viewConvertedInventoryReportDialog</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_pdm/ActionTemplateItem/portal_types/Service%20Module/converted_inventory_report.xml b/bt5/erp5_pdm/ActionTemplateItem/portal_types/Service%20Module/converted_inventory_report.xml deleted file mode 100644 index 2e81b54cc7126fec660d3a4800981bc520e796d6..0000000000000000000000000000000000000000 --- a/bt5/erp5_pdm/ActionTemplateItem/portal_types/Service%20Module/converted_inventory_report.xml +++ /dev/null @@ -1,79 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>action</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>categories</string> </key> - <value> - <tuple> - <string>action_type/object_report</string> - </tuple> - </value> - </item> - <item> - <key> <string>category</string> </key> - <value> <string>object_report</string> </value> - </item> - <item> - <key> <string>condition</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>icon</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>converted_inventory_report</string> </value> - </item> - <item> - <key> <string>permissions</string> </key> - <value> - <tuple> - <string>View</string> - </tuple> - </value> - </item> - <item> - <key> <string>priority</string> </key> - <value> <float>1.0</float> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Converted Inventory Report</string> </value> - </item> - <item> - <key> <string>visible</string> </key> - <value> <int>1</int> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <global name="Expression" module="Products.CMFCore.Expression"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>text</string> </key> - <value> <string>string:${object_url}/ResourceModule_viewConvertedInventoryReportDialog</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getConvertedInventoryList.py b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getConvertedInventoryList.py deleted file mode 100644 index f3b087ce09e6d96a3f8740bfe64d640aa9370837..0000000000000000000000000000000000000000 --- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getConvertedInventoryList.py +++ /dev/null @@ -1,9 +0,0 @@ -kw['resource_uid'] = context.ResourceModule_getSelection().getUidList() - -if kw.setdefault('inventory_list', 1): - kw.update(group_by_node = 1, group_by_resource = 0) -else: - kw.update(ignore_group_by = 1) - -return context.getPortalObject().portal_simulation \ - .getConvertedInventoryList(simulation_period='All', **kw) diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getConvertedInventoryList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getConvertedInventoryList.xml deleted file mode 100644 index f9c074d1289f6466ae2cf004b272293fc36e263e..0000000000000000000000000000000000000000 --- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getConvertedInventoryList.xml +++ /dev/null @@ -1,62 +0,0 @@ -<?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>**kw</string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>ResourceModule_getConvertedInventoryList</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getConvertedInventoryStat.py b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getConvertedInventoryStat.py deleted file mode 100644 index d7f858619297d169b29ebfc864ce3ba8cbaa33c9..0000000000000000000000000000000000000000 --- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getConvertedInventoryStat.py +++ /dev/null @@ -1 +0,0 @@ -return context.ResourceModule_getConvertedInventoryList(inventory_list=0, **kw) diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getConvertedInventoryStat.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getConvertedInventoryStat.xml deleted file mode 100644 index 9a7c43fd0d05f3a256db49f45a96349cbf8eacd7..0000000000000000000000000000000000000000 --- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getConvertedInventoryStat.xml +++ /dev/null @@ -1,62 +0,0 @@ -<?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>**kw</string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>ResourceModule_getConvertedInventoryStat</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getSelection.py b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getSelection.py index bf4f23dd4bdbc1c9c5038591cf70f33ee8068b6e..991c796aecdddd1abafedc7b01178d67d91a3b79 100644 --- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getSelection.py +++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getSelection.py @@ -40,8 +40,8 @@ class ResourceSelection: """ traverse = self.portal.portal_categories['metric_type'].restrictedTraverse display = getPreferredCategoryDisplayMethodId() - return sorted((getattr(traverse(metric_type),display)(), metric_type) - for metric_type in self.getCommonMetricTypeList()) + return sorted([(getattr(traverse(metric_type),display)(), metric_type) + for metric_type in self.getCommonMetricTypeList()]) def getCommonQuantityUnitItemList(self): """ diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog.xml deleted file mode 100644 index 2f5f06416d73d1646060951b5d96d489fb176238..0000000000000000000000000000000000000000 --- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog.xml +++ /dev/null @@ -1,137 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="ERP5 Form" module="erp5.portal_type"/> - </pickle> - <pickle> - <dictionary> - <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/> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>_objects</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>action</string> </key> - <value> <string>ResourceModule_viewConvertedInventoryReportDialog</string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>edit_order</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>encoding</string> </key> - <value> <string>UTF-8</string> </value> - </item> - <item> - <key> <string>enctype</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>group_list</string> </key> - <value> - <list> - <string>left</string> - <string>hidden</string> - <string>bottom</string> - </list> - </value> - </item> - <item> - <key> <string>groups</string> </key> - <value> - <dictionary> - <item> - <key> <string>bottom</string> </key> - <value> - <list> - <string>listbox</string> - </list> - </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>left</string> </key> - <value> - <list> - <string>your_metric_type</string> - <string>your_quantity_unit</string> - </list> - </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>ResourceModule_viewConvertedInventoryReportDialog</string> </value> - </item> - <item> - <key> <string>method</string> </key> - <value> <string>POST</string> </value> - </item> - <item> - <key> <string>name</string> </key> - <value> <string>ResourceModule_viewConvertedInventoryReportDialog</string> </value> - </item> - <item> - <key> <string>pt</string> </key> - <value> <string>form_dialog</string> </value> - </item> - <item> - <key> <string>row_length</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>stored_encoding</string> </key> - <value> <string>UTF-8</string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Converted Inventory Report</string> </value> - </item> - <item> - <key> <string>unicode_mode</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>update_action</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog/listbox.xml deleted file mode 100644 index 39a6e89eb03b9938c92746dfd604214439d3395d..0000000000000000000000000000000000000000 --- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog/listbox.xml +++ /dev/null @@ -1,235 +0,0 @@ -<?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>title</string> - <string>columns</string> - <string>list_method</string> - <string>stat_method</string> - <string>stat_columns</string> - <string>enabled</string> - <string>editable</string> - </list> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>listbox</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>columns</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>editable</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>enabled</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>list_method</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>stat_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> - </dictionary> - </value> - </item> - <item> - <key> <string>values</string> </key> - <value> - <dictionary> - <item> - <key> <string>all_editable_columns</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>columns</string> </key> - <value> - <list> - <tuple> - <string>node_title</string> - <string>Site or Warehouse</string> - </tuple> - <tuple> - <string>current_converted_quantity</string> - <string>Current</string> - </tuple> - <tuple> - <string>available_converted_quantity</string> - <string>Available</string> - </tuple> - <tuple> - <string>future_converted_quantity</string> - <string>Future</string> - </tuple> - </list> - </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> - <key> <string>field_id</string> </key> - <value> <string>my_view_mode_listbox</string> </value> - </item> - <item> - <key> <string>form_id</string> </key> - <value> <string>Base_viewFieldLibrary</string> </value> - </item> - <item> - <key> <string>list_method</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> - </value> - </item> - <item> - <key> <string>stat_columns</string> </key> - <value> - <list> - <tuple> - <string>current_converted_quantity</string> - <string>current_converted_quantity</string> - </tuple> - <tuple> - <string>available_converted_quantity</string> - <string>available_converted_quantity</string> - </tuple> - <tuple> - <string>future_converted_quantity</string> - <string>future_converted_quantity</string> - </tuple> - </list> - </value> - </item> - <item> - <key> <string>stat_method</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> - </value> - </item> - <item> - <key> <string>target</string> </key> - <value> <string>Click to edit the target</string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Stock</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>python: (lambda mt, qu: mt and qu and mt.split(\'/\')[0] == qu.split(\'/\')[0])(request.get(\'metric_type\'), request.get(\'quantity_unit\'))</string> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> - <pickle> - <global name="Method" module="Products.Formulator.MethodField"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>method_name</string> </key> - <value> <string>ResourceModule_getConvertedInventoryList</string> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="4" aka="AAAAAAAAAAQ="> - <pickle> - <global name="Method" module="Products.Formulator.MethodField"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>method_name</string> </key> - <value> <string>ResourceModule_getConvertedInventoryStat</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog/your_metric_type.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog/your_metric_type.xml deleted file mode 100644 index 4dca20b6f67e4c7d7346e12faba21770d35dfb39..0000000000000000000000000000000000000000 --- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog/your_metric_type.xml +++ /dev/null @@ -1,126 +0,0 @@ -<?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>title</string> - <string>items</string> - </list> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>your_metric_type</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>items</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>target</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</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_category</string> </value> - </item> - <item> - <key> <string>form_id</string> </key> - <value> <string>Base_viewFieldLibrary</string> </value> - </item> - <item> - <key> <string>items</string> </key> - <value> - <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> - <value> <string>Metric Type</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>python: here.ResourceModule_getSelection().getCommonMetricTypeItemList()</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog/your_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog/your_quantity_unit.xml deleted file mode 100644 index 7d9913dabd504cff21faf59d585cd45818fcbe24..0000000000000000000000000000000000000000 --- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog/your_quantity_unit.xml +++ /dev/null @@ -1,126 +0,0 @@ -<?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>title</string> - <string>items</string> - </list> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>your_quantity_unit</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>items</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>target</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</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_category</string> </value> - </item> - <item> - <key> <string>form_id</string> </key> - <value> <string>Base_viewFieldLibrary</string> </value> - </item> - <item> - <key> <string>items</string> </key> - <value> - <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> - <value> <string>Quantity Unit</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>python: here.ResourceModule_getSelection().getCommonQuantityUnitItemList()</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_zGetCommonMetricTypeList.sql b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_zGetCommonMetricTypeList.sql deleted file mode 100644 index 1d0134b68c11463dd06da6bd30213858542d712b..0000000000000000000000000000000000000000 --- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_zGetCommonMetricTypeList.sql +++ /dev/null @@ -1,12 +0,0 @@ -SELECT catalog.* -FROM (SELECT metric_type_uid, - COUNT(DISTINCT resource_uid) AS resource_count - FROM measure - WHERE <dtml-sqltest resource_uid type="int" multiple> - GROUP BY metric_type_uid - ) AS measure, - catalog -WHERE catalog.uid = measure.metric_type_uid - AND <dtml-sqltest column="measure.resource_count" - expr="_.len(resource_uid)" - type="int"> diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_zGetCommonMetricTypeList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_zGetCommonMetricTypeList.xml deleted file mode 100644 index 35edd03dce79ad806bfae2820fbef26c946b8faf..0000000000000000000000000000000000000000 --- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_zGetCommonMetricTypeList.xml +++ /dev/null @@ -1,661 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="SQL" module="Products.ZSQLMethods.SQL"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_col</string> </key> - <value> - <list> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>uid</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>l</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>4</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>security_uid</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>i</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>1</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>owner</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>t</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>4</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>viewable_owner</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>t</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>4</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>path</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>t</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>51</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>relative_url</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>t</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>27</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>parent_uid</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>l</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>4</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>id</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>t</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>10</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>description</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>t</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>0</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>title</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>t</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>10</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>meta_type</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>t</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>13</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>portal_type</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>t</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>8</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>opportunity_state</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>t</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>0</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>corporate_registration_code</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>t</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>0</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>ean13_code</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>t</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>0</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>validation_state</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>t</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>8</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>simulation_state</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>t</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>0</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>causality_state</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>t</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>0</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>invoice_state</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>t</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>0</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>payment_state</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>t</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>0</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>event_state</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>t</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>0</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>immobilisation_state</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>t</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>0</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>reference</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>t</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>4</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>grouping_reference</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>t</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>0</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>source_reference</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>t</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>0</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>destination_reference</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>t</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>0</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>string_index</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>t</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>0</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>int_index</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>i</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>0</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>float_index</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>n</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>0</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>has_cell_content</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>i</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>1</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>creation_date</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>d</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>19</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>modification_date</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>d</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>19</int> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>name</string> </key> - <value> <string>indexation_timestamp</string> </value> - </item> - <item> - <key> <string>null</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>d</string> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>19</int> </value> - </item> - </dictionary> - </list> - </value> - </item> - <item> - <key> <string>allow_simple_one_argument_traversal</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>arguments_src</string> </key> - <value> <string>resource_uid</string> </value> - </item> - <item> - <key> <string>cache_time_</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>class_file_</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>class_name_</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>connection_hook</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>connection_id</string> </key> - <value> <string>erp5_sql_connection</string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>ResourceModule_zGetCommonMetricTypeList</string> </value> - </item> - <item> - <key> <string>max_cache_</string> </key> - <value> <int>100</int> </value> - </item> - <item> - <key> <string>max_rows_</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_pdm/bt/template_action_path_list b/bt5/erp5_pdm/bt/template_action_path_list index b126f8a0c08f03e3a1b604d39bdcc7c66299ce2f..96893235deb1b31d6efb647e799dfee7daa89d84 100644 --- a/bt5/erp5_pdm/bt/template_action_path_list +++ b/bt5/erp5_pdm/bt/template_action_path_list @@ -1,5 +1,4 @@ Component Individual Variation | view -Component Module | converted_inventory_report Component Module | view Component | internal_price_view Component | inventory_chart @@ -36,7 +35,6 @@ Organisation | jump_to_purchase_supply Organisation | jump_to_sale_supply Product Individual Variation | image_list Product Individual Variation | view -Product Module | converted_inventory_report Product Module | transformed_inventory_report Product Module | view Product | internal_price_view @@ -96,7 +94,6 @@ Sale Supply Module | view Sale Supply | view Sale Supply | view_profile Service Individual Variation | view -Service Module | converted_inventory_report Service Module | view Service | internal_price_view Service | jump_to_related_supply_line diff --git a/product/ERP5/bootstrap/erp5_core/ToolComponentTemplateItem/portal_components/tool.erp5.SimulationTool.py b/product/ERP5/bootstrap/erp5_core/ToolComponentTemplateItem/portal_components/tool.erp5.SimulationTool.py index 5de52acaa590d75aa189ca15fabcec959da45d12..8a477f7275476e86ce58bce4d5c631f134a4aa7c 100644 --- a/product/ERP5/bootstrap/erp5_core/ToolComponentTemplateItem/portal_components/tool.erp5.SimulationTool.py +++ b/product/ERP5/bootstrap/erp5_core/ToolComponentTemplateItem/portal_components/tool.erp5.SimulationTool.py @@ -1650,25 +1650,6 @@ class SimulationTool(BaseTool): ), ) - security.declareProtected(Permissions.AccessContentsInformation, - 'getConvertedInventoryList') - def getConvertedInventoryList(self, simulation_period='', **kw): - """ - Return list of inventory with a 'converted_quantity' additional column, - which contains the sum of measurements for the specified metric type, - expressed in the 'quantity_unit' unit. - - metric_type - category - quantity_unit - category - """ - - warn('getConvertedInventoryList is Deprecated, use ' \ - 'getInventory instead.', DeprecationWarning) - - method = getattr(self,'get%sInventoryList' % simulation_period) - - return method(**kw) - security.declareProtected(Permissions.AccessContentsInformation, 'getAllInventoryList') def getAllInventoryList(self, src__=0, **kw): @@ -1677,6 +1658,11 @@ class SimulationTool(BaseTool): Performs 1 SQL request for each simulation state, and merge the results. Rename relevant columns with a '${simulation}_' prefix (ex: 'total_price' -> 'current_total_price'). + + Warning: this method is not convered by any test and does not return actual + InventoryListBrain ( because mergeZRDBResults does not support them ), so + the available attribute on result items are different from a traditional + getInventoryList result. """ columns = ('total_quantity', 'total_price', 'converted_quantity') diff --git a/product/ERP5Type/CodingStyle.py b/product/ERP5Type/CodingStyle.py index e810c783aa71bcbccd1f34e22fdcf5c3e6d613cc..917c965adde170ab8105c79f357c6bde79e251d7 100644 --- a/product/ERP5Type/CodingStyle.py +++ b/product/ERP5Type/CodingStyle.py @@ -118,8 +118,6 @@ ignored_skin_id_set = { 'resolveUid', 'IndividualVariation_init', 'QuantityUnitConversion_getQuantityUnitList', - 'ResourceModule_getConvertedInventoryList', - 'ResourceModule_getConvertedInventoryStat', 'ResourceModule_getSelection', 'DeliveryModule_getDeliveryLineList', 'DeliveryModule_getDeliveryLineReportSectionList',