Skip to content

erp5
erp5
Commit 6d240d01 authored by Cédric Le Ninivin's avatar Cédric Le Ninivin Committed by Cédric Le Ninivin
Browse files
Options

Manufacturing/MRP: Moving Production Report to Manufacturing Execution

parent 80c23586
Hide whitespace changes
Inline Side-by-side
Showing with 179 additions and 175 deletions
bt5/erp5_l10n_pl_PL/MessageTranslationTemplateItem/pl/erp5_ui/translation.po
View file @ 6d240d01
......@@ -2208,19 +2208,19 @@ msgstr "Moduł listy paczek zamówień produkcyjnych"
msgid "Production Packing Lists"
msgstr "Listy paczek zamówień produkcyjnych"
msgid "Production Report"
msgid "Manufacturing Execution"
msgstr "Raport produkcyjny"
msgid "Production Report Cell"
msgid "Manufacturing Execution Cell"
msgstr "Komórka raportu produkcyjnego"
msgid "Production Report Line"
msgid "Manufacturing Execution Line"
msgstr "Linia raportu produkcyjnego"
msgid "Production Report Module"
msgid "Manufacturing Execution Module"
msgstr "Moduł raportów produkcyjnych"
msgid "Production Reports"
msgid "Manufacturing Executions"
msgstr "Raporty produkcyjne"
msgid "Products"
......@@ -2412,7 +2412,7 @@ msgstr "Obiekty powiązane"
msgid "Related Production Packing List"
msgstr "Powiązana lista paczek produkcyjnych"
msgid "Related Production Report"
msgid "Related Manufacturing Execution"
msgstr "Powiązany raport produkcyjny"
msgid "Related Purchase Invoice"
......
bt5/erp5_l10n_ru/MessageTranslationTemplateItem/ru/erp5_ui/translation.po
View file @ 6d240d01
......@@ -2270,19 +2270,19 @@ msgstr "Производственные Накладные"
msgid "Production Packing Lists to Confirm"
msgstr "Производственные Накладные к Подтверждению"
msgid "Production Report"
msgid "Manufacturing Execution"
msgstr "Производственный Отчет"
msgid "Production Report Line"
msgid "Manufacturing Execution Line"
msgstr "Строка Производственного Отчета"
msgid "Production Report Lines"
msgid "Manufacturing Execution Lines"
msgstr "Строки Производственного Отчета"
msgid "Production Reports"
msgid "Manufacturing Executions"
msgstr "Производственные Отчеты"
msgid "Production Reports to Confirm"
msgid "Manufacturing Executions to Confirm"
msgstr "Производственные Отчеты к Подтверждению"
msgid "Products"
......@@ -2567,7 +2567,7 @@ msgstr "Подчиненная Оплата"
msgid "Related Production Packing List"
msgstr "Подчиненная Производственная Накладная"
msgid "Related Production Report"
msgid "Related Manufacturing Execution"
msgstr "Подчиненный Производственный Отчет"
msgid "Related Purchase Invoice"
......
bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Line/view.xml → bt5/erp5_mrp/ActionTemplateItem/portal_types/Manufacturing%20Execution%20Line/view.xml
View file @ 6d240d01
......@@ -71,7 +71,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/ProductionReportLine_view</string> </value>
<value> <string>string:${object_url}/ManufacturingExecutionLine_view</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report%20Module/view.xml → bt5/erp5_mrp/ActionTemplateItem/portal_types/Manufacturing%20Execution%20Module/view.xml
View file @ 6d240d01
......@@ -71,7 +71,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/ProductionReportModule_viewProductionReportList</string> </value>
<value> <string>string:${object_url}/ManufacturingExecutionModule_viewManufacturingExecutionList</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report/packing_list_print.xml → bt5/erp5_mrp/ActionTemplateItem/portal_types/Manufacturing%20Execution/packing_list_print.xml
View file @ 6d240d01
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Print Production Report</string> </value>
<value> <string>Print Manufacturing Execution</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
......
bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Report/view.xml → bt5/erp5_mrp/ActionTemplateItem/portal_types/Manufacturing%20Execution/view.xml
View file @ 6d240d01
......@@ -71,7 +71,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/ProductionReport_view</string> </value>
<value> <string>string:${object_url}/ManufacturingExecution_view</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/jump_to_related_production_report.xml → bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order/jump_to_related_manufacturing_execution.xml
View file @ 6d240d01
......@@ -40,7 +40,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>jump_to_related_production_report</string> </value>
<value> <string>jump_to_related_manufacturing_execution</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
......@@ -56,7 +56,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Related Production Report</string> </value>
<value> <string>Related Manufacturing Execution</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
......@@ -75,7 +75,7 @@
<key> <string>text</string> </key>
<value> <string encoding="cdata"><![CDATA[
string:${object_url}/Base_jumpToRelatedObject?base_category=causality&portal_type=Production+Report
string:${object_url}/Base_jumpToRelatedObject?base_category=causality&portal_type=Manufacturing Execution
]]></string> </value>
</item>
......
bt5/erp5_mrp/ModuleTemplateItem/production_report_module.xml → bt5/erp5_mrp/ModuleTemplateItem/manufacturing_execution_module.xml
View file @ 6d240d01
......@@ -2,7 +2,7 @@
<category_list>
<category>business_application/pdm</category>
</category_list>
<id>production_report_module</id>
<id>manufacturing_execution_module</id>
<permission_list>
<permission type='tuple'>
<name>Access contents information</name>
......@@ -76,6 +76,6 @@
<role>Manager</role>
</permission>
</permission_list>
<portal_type>Production Report Module</portal_type>
<title>Production Reports</title>
<portal_type>Manufacturing Execution Module</portal_type>
<title>Manufacturing Executions</title>
</module>
\ No newline at end of file
bt5/erp5_mrp/PathTemplateItem/portal_deliveries/production_report_builder.xml → bt5/erp5_mrp/PathTemplateItem/portal_deliveries/manufacturing_execution_builder.xml
View file @ 6d240d01
......@@ -38,7 +38,7 @@
</item>
<item>
<key> <string>delivery_cell_portal_type</string> </key>
<value> <string>Production Report Cell</string> </value>
<value> <string>Manufacturing Execution Cell</string> </value>
</item>
<item>
<key> <string>delivery_cell_separate_order</string> </key>
......@@ -70,15 +70,15 @@
</item>
<item>
<key> <string>delivery_line_portal_type</string> </key>
<value> <string>Production Report Line</string> </value>
<value> <string>Manufacturing Execution Line</string> </value>
</item>
<item>
<key> <string>delivery_module</string> </key>
<value> <string>production_report_module</string> </value>
<value> <string>manufacturing_execution_module</string> </value>
</item>
<item>
<key> <string>delivery_portal_type</string> </key>
<value> <string>Production Report</string> </value>
<value> <string>Manufacturing Execution</string> </value>
</item>
<item>
<key> <string>description</string> </key>
......@@ -88,7 +88,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>production_report_builder</string> </value>
<value> <string>manufacturing_execution_builder</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
......@@ -96,11 +96,11 @@
</item>
<item>
<key> <string>simulation_select_method_id</string> </key>
<value> <string>ProductionReport_selectMovement</string> </value>
<value> <string>ManufacturingExecution_selectMovement</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Production Report Builder</string> </value>
<value> <string>Manufacturing Execution Builder</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_mrp/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
View file @ 6d240d01
<allowed_content_type_list>
<portal_type id="Manufacturing Execution">
<item>Manufacturing Execution Line</item>
</portal_type>
<portal_type id="Manufacturing Execution Line">
<item>Manufacturing Execution Cell</item>
</portal_type>
<portal_type id="Manufacturing Execution Module">
<item>Manufacturing Execution</item>
</portal_type>
<portal_type id="Production Order">
<item>Payment Condition</item>
<item>Production Order Line</item>
......@@ -18,15 +27,6 @@
<portal_type id="Production Packing List Module">
<item>Production Packing List</item>
</portal_type>
<portal_type id="Production Report">
<item>Production Report Line</item>
</portal_type>
<portal_type id="Production Report Line">
<item>Production Report Cell</item>
</portal_type>
<portal_type id="Production Report Module">
<item>Production Report</item>
</portal_type>
<portal_type id="Rule Tool">
<item>Transformation Simulation Rule</item>
<item>Transformation Sourcing Simulation Rule</item>
......
bt5/erp5_mrp/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
View file @ 6d240d01
<base_category_list>
<portal_type id="Manufacturing Execution Module">
<item>business_application</item>
</portal_type>
<portal_type id="Production Order Line">
<item>specialise</item>
</portal_type>
......@@ -8,7 +11,4 @@
<portal_type id="Production Packing List Module">
<item>business_application</item>
</portal_type>
<portal_type id="Production Report Module">
<item>business_application</item>
</portal_type>
</base_category_list>
\ No newline at end of file
bt5/erp5_mrp/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
View file @ 6d240d01
<hidden_content_type_list>
<portal_type id="Manufacturing Execution Line">
<item>Manufacturing Execution Cell</item>
</portal_type>
<portal_type id="Production Order Line">
<item>Delivery Cell</item>
<item>Production Order Cell</item>
......@@ -6,7 +9,4 @@
<portal_type id="Production Packing List Line">
<item>Delivery Cell</item>
</portal_type>
<portal_type id="Production Report Line">
<item>Production Report Cell</item>
</portal_type>
</hidden_content_type_list>
\ No newline at end of file
bt5/erp5_mrp/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
View file @ 6d240d01
<property_sheet_list>
<portal_type id="Manufacturing Execution">
<item>DeliveryCausalityStateConstraint</item>
</portal_type>
<portal_type id="Production Order Line">
<item>ProductionOrderLine</item>
</portal_type>
......
bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Report%20Cell.xml → bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Manufacturing%20Execution%20Cell.xml
View file @ 6d240d01
......@@ -41,7 +41,7 @@
</item>
<item>
<key> <string>content_meta_type</string> </key>
<value> <string>ERP5 Production Report Cell</string> </value>
<value> <string>ERP5 Manufacturing Execution Cell</string> </value>
</item>
<item>
<key> <string>description</string> </key>
......@@ -49,7 +49,7 @@
</item>
<item>
<key> <string>factory</string> </key>
<value> <string>addProductionReportCell</string> </value>
<value> <string>addManufacturingExecutionCell</string> </value>
</item>
<item>
<key> <string>filter_actions</string> </key>
......@@ -69,7 +69,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Production Report Cell</string> </value>
<value> <string>Manufacturing Execution Cell</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
......
bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Report%20Line.xml → bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Manufacturing%20Execution%20Line.xml
View file @ 6d240d01
......@@ -41,15 +41,15 @@
</item>
<item>
<key> <string>content_meta_type</string> </key>
<value> <string>ERP5 Production Report Line</string> </value>
<value> <string>ERP5 Manufacturing Execution Line</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Production Report Line defines quantity, prices, dates of resource that has to be consumed/produced.</string> </value>
<value> <string>Manufacturing Execution Line defines quantity, prices, dates of resource that has to be consumed/produced.</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
<value> <string>addProductionReportLine</string> </value>
<value> <string>addManufacturingExecutionLine</string> </value>
</item>
<item>
<key> <string>filter_actions</string> </key>
......@@ -69,7 +69,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Production Report Line</string> </value>
<value> <string>Manufacturing Execution Line</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
......
bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Report%20Module.xml → bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Manufacturing%20Execution%20Module.xml
View file @ 6d240d01
......@@ -45,7 +45,7 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Holds Production Reports</string> </value>
<value> <string>Holds Manufacturing Executions</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
......@@ -69,7 +69,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Production Report Module</string> </value>
<value> <string>Manufacturing Execution Module</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
......
bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Report.xml → bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Manufacturing%20Execution.xml
View file @ 6d240d01
......@@ -41,15 +41,15 @@
</item>
<item>
<key> <string>content_meta_type</string> </key>
<value> <string>ERP5 Production Report</string> </value>
<value> <string>ERP5 Manufacturing Execution</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>A Production Report allows for keeping a trace of goods or services which have been produced or consumed during production. Production Reports directly impact the inventory.</string> </value>
<value> <string>A Manufacturing Execution allows for keeping a trace of goods or services which have been produced or consumed during production. Manufacturing Executions directly impact the inventory.</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
<value> <string>addProductionReport</string> </value>
<value> <string>addManufacturingExecution</string> </value>
</item>
<item>
<key> <string>filter_actions</string> </key>
......@@ -69,7 +69,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Production Report</string> </value>
<value> <string>Manufacturing Execution</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
......
bt5/erp5_mrp/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
View file @ 6d240d01
<workflow_chain>
<chain>
<type>Manufacturing Execution</type>
<workflow>delivery_causality_interaction_workflow, delivery_causality_workflow, delivery_simulation_interaction_workflow, edit_workflow, production_packing_list_workflow</workflow>
</chain>
<chain>
<type>Manufacturing Execution Cell</type>
<workflow>delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow</workflow>
</chain>
<chain>
<type>Manufacturing Execution Line</type>
<workflow>delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, edit_workflow, production_matrix_workflow</workflow>
</chain>
<chain>
<type>Production Order</type>
<workflow>delivery_causality_interaction_workflow, delivery_causality_workflow, delivery_simulation_interaction_workflow, edit_workflow, production_order_workflow</workflow>
......@@ -23,18 +35,6 @@
<type>Production Packing List Line</type>
<workflow>delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, edit_workflow, production_matrix_workflow</workflow>
</chain>
<chain>
<type>Production Report</type>
<workflow>delivery_causality_interaction_workflow, delivery_causality_workflow, delivery_simulation_interaction_workflow, edit_workflow, production_packing_list_workflow</workflow>
</chain>
<chain>
<type>Production Report Cell</type>
<workflow>delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow</workflow>
</chain>
<chain>
<type>Production Report Line</type>
<workflow>delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, edit_workflow, production_matrix_workflow</workflow>
</chain>
<chain>
<type>Transformation Simulation Rule</type>
<workflow>edit_workflow, rule_validation_workflow</workflow>
......
bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReportCell_afterClone.xml → bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ManufacturingExecutionCell_afterClone.xml
View file @ 6d240d01
......@@ -60,7 +60,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ProductionReportCell_afterClone</string> </value>
<value> <string>ManufacturingExecutionCell_afterClone</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReportLine_afterClone.xml → bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ManufacturingExecutionLine_afterClone.xml
View file @ 6d240d01
......@@ -60,7 +60,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ProductionReportLine_afterClone</string> </value>
<value> <string>ManufacturingExecutionLine_afterClone</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReportLine_asCellRange.xml → bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ManufacturingExecutionLine_asCellRange.xml
View file @ 6d240d01
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ProductionReportLine_asCellRange</string> </value>
<value> <string>ManufacturingExecutionLine_asCellRange</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReportLine_view.xml → bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ManufacturingExecutionLine_view.xml
View file @ 6d240d01
......@@ -127,7 +127,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ProductionReportLine_view</string> </value>
<value> <string>ManufacturingExecutionLine_view</string> </value>
</item>
<item>
<key> <string>method</string> </key>
......@@ -135,7 +135,7 @@
</item>
<item>
<key> <string>name</string> </key>
<value> <string>ProductionReportLine_view</string> </value>
<value> <string>ManufacturingExecutionLine_view</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
......@@ -151,7 +151,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Production Report Line</string> </value>
<value> <string>Manufacturing Execution Line</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
......
bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReportModule_viewProductionReportList.xml → bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ManufacturingExecutionModule_viewManufacturingExecutionList.xml
View file @ 6d240d01
......@@ -73,7 +73,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ProductionReportModule_viewProductionReportList</string> </value>
<value> <string>ManufacturingExecutionModule_viewManufacturingExecutionList</string> </value>
</item>
<item>
<key> <string>method</string> </key>
......@@ -81,7 +81,7 @@
</item>
<item>
<key> <string>name</string> </key>
<value> <string>ProductionReportModule_viewProductionReportList</string> </value>
<value> <string>ManufacturingExecutionModule_viewManufacturingExecutionList</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
......@@ -97,7 +97,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Production Report</string> </value>
<value> <string>Manufacturing Execution</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
......
bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReportModule_viewProductionReportList/listbox.xml → bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ManufacturingExecutionModule_viewManufacturingExecutionList/listbox.xml
View file @ 6d240d01
......@@ -217,8 +217,8 @@
<value>
<list>
<tuple>
<string>Production Report</string>
<string>Production Report</string>
<string>Manufacturing Execution</string>
<string>Manufacturing Execution</string>
</tuple>
</list>
</value>
......@@ -288,7 +288,7 @@
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string>production_report_selection</string> </value>
<value> <string>manufacturing_execution_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
......@@ -370,7 +370,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Production Reports</string> </value>
<value> <string>Manufacturing Executions</string> </value>
</item>
</dictionary>
</value>
......
bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReport_afterClone.xml → bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ManufacturingExecution_afterClone.xml
View file @ 6d240d01
......@@ -60,7 +60,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ProductionReport_afterClone</string> </value>
<value> <string>ManufacturingExecution_afterClone</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReport_getRuleReference.xml → bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ManufacturingExecution_getRuleReference.xml
View file @ 6d240d01
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ProductionReport_getRuleReference</string> </value>
<value> <string>ManufacturingExecution_getRuleReference</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReport_selectMovement.xml → bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ManufacturingExecution_selectMovement.xml
View file @ 6d240d01
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ProductionReport_selectMovement</string> </value>
<value> <string>ManufacturingExecution_selectMovement</string> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReport_view.xml → bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ManufacturingExecution_view.xml
View file @ 6d240d01
......@@ -118,7 +118,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ProductionReport_view</string> </value>
<value> <string>ManufacturingExecution_view</string> </value>
</item>
<item>
<key> <string>method</string> </key>
......@@ -126,7 +126,7 @@
</item>
<item>
<key> <string>name</string> </key>
<value> <string>ProductionReport_view</string> </value>
<value> <string>ManufacturingExecution_view</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
......@@ -142,7 +142,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Production Report</string> </value>
<value> <string>Manufacturing Execution</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
......
bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReport_view/listbox.xml → bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ManufacturingExecution_view/listbox.xml
View file @ 6d240d01
......@@ -82,7 +82,7 @@
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string>production_report_line_selection</string> </value>
<value> <string>manufacturing_execution_line_selection</string> </value>
</item>
<item>
<key> <string>target</string> </key>
......@@ -90,7 +90,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Production Report Lines</string> </value>
<value> <string>Manufacturing Execution Lines</string> </value>
</item>
</dictionary>
</value>
......
bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionDelivery_generateReference.py
View file @ 6d240d01
......@@ -9,7 +9,7 @@ prefix = ''.join([x for x in object_type if x in uppercase_list])
# dirty hack
# Production Order upper case letters are same as Purchase Order upper case letters
# So I (Luke) replaced first letter with R - pRoduction, that way we have
# RO for Production Order, RPL for Production Packing List, RR for Production Report
# RO for Production Order, RPL for Production Packing List, RR for Manufacturing Execution
prefix = 'R' + prefix[1:]
id_group = '-'.join((parent_type, object_type))
......
bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_matrix_workflow/interactions/setVariationCategoryList.xml
View file @ 6d240d01
......@@ -60,7 +60,7 @@
<list>
<string>Production Order Line</string>
<string>Production Packing List Line</string>
<string>Production Report Line</string>
<string>Manufacturing Execution Line</string>
</list>
</value>
</item>
......
bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/worklists/06_draft_production_report_list.xml → bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/worklists/06_draft_manufacturing_execution_list.xml
View file @ 6d240d01
......@@ -12,13 +12,13 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Production Reports to Confirm (%(count)s)</string> </value>
<value> <string>Manufacturing Executions to Confirm (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
production_report_module?simulation_state=draft&portal_type=Production+Report&local_roles:list=Owner&reset=1
manufacturing_execution_module?simulation_state=draft&portal_type=Production+Report&local_roles:list=Owner&reset=1
]]></string> </value>
</item>
......@@ -34,7 +34,7 @@ production_report_module?simulation_state=draft&portal_type=Production+Report&lo
</item>
<item>
<key> <string>id</string> </key>
<value> <string>06_draft_production_report_list</string> </value>
<value> <string>06_draft_manufacturing_execution_list</string> </value>
</item>
<item>
<key> <string>var_matches</string> </key>
......@@ -82,7 +82,7 @@ production_report_module?simulation_state=draft&portal_type=Production+Report&lo
<key> <string>portal_type</string> </key>
<value>
<tuple>
<string>Production Report</string>
<string>Manufacturing Execution</string>
</tuple>
</value>
</item>
......
bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/worklists/07_confirmed_report_list.xml
View file @ 6d240d01
......@@ -12,13 +12,13 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Production Reports to Ready (%(count)s)</string> </value>
<value> <string>Manufacturing Executions to Ready (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
production_report_module?simulation_state=confirmed&portal_type=Production+Report&local_roles:list=Assignor&local_roles:list=Assignee&reset=1
manufacturing_execution_module?simulation_state=confirmed&portal_type=Production+Report&local_roles:list=Assignor&local_roles:list=Assignee&reset=1
]]></string> </value>
</item>
......@@ -83,7 +83,7 @@ production_report_module?simulation_state=confirmed&portal_type=Production+Repor
<key> <string>portal_type</string> </key>
<value>
<tuple>
<string>Production Report</string>
<string>Manufacturing Execution</string>
</tuple>
</value>
</item>
......
bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/worklists/08_ready_report_list.xml
View file @ 6d240d01
......@@ -12,13 +12,13 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Production Reports to Ship (%(count)s)</string> </value>
<value> <string>Manufacturing Executions to Ship (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
production_report_module?simulation_state=ready&portal_type=Production+Report&local_roles:list=Assignor&local_roles:list=Assignee&reset=1
manufacturing_execution_module?simulation_state=ready&portal_type=Production+Report&local_roles:list=Assignor&local_roles:list=Assignee&reset=1
]]></string> </value>
</item>
......@@ -83,7 +83,7 @@ production_report_module?simulation_state=ready&portal_type=Production+Report&lo
<key> <string>portal_type</string> </key>
<value>
<tuple>
<string>Production Report</string>
<string>Manufacturing Execution</string>
</tuple>
</value>
</item>
......
bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/worklists/09_started_report_list.xml
View file @ 6d240d01
......@@ -12,13 +12,13 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Production Reports to Receive (%(count)s)</string> </value>
<value> <string>Manufacturing Executions to Receive (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
production_report_module?simulation_state=started&portal_type=Production+Report&local_roles:list=Assignor&reset=1
manufacturing_execution_module?simulation_state=started&portal_type=Production+Report&local_roles:list=Assignor&reset=1
]]></string> </value>
</item>
......@@ -82,7 +82,7 @@ production_report_module?simulation_state=started&portal_type=Production+Report&
<key> <string>portal_type</string> </key>
<value>
<tuple>
<string>Production Report</string>
<string>Manufacturing Execution</string>
</tuple>
</value>
</item>
......
bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/worklists/10_stopped_report_list.xml
View file @ 6d240d01
......@@ -12,13 +12,13 @@
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Production Reports to Deliver (%(count)s)</string> </value>
<value> <string>Manufacturing Executions to Deliver (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
production_report_module?simulation_state=stopped&portal_type=Production+Report&local_roles:list=Assignor&reset=1
manufacturing_execution_module?simulation_state=stopped&portal_type=Production+Report&local_roles:list=Assignor&reset=1
]]></string> </value>
</item>
......@@ -82,7 +82,7 @@ production_report_module?simulation_state=stopped&portal_type=Production+Report&
<key> <string>portal_type</string> </key>
<value>
<tuple>
<string>Production Report</string>
<string>Manufacturing Execution</string>
</tuple>
</value>
</item>
......
bt5/erp5_mrp/bt/template_action_path_list
View file @ 6d240d01
Manufacturing Execution Cell | view
Manufacturing Execution Line | option_view
Manufacturing Execution Line | quantity_view
Manufacturing Execution Line | view
Manufacturing Execution Line | view_price
Manufacturing Execution Module | view
Manufacturing Execution | packing_list_print
Manufacturing Execution | view
Manufacturing Execution | view_stock
Production Order Cell | view
Production Order Line | jump_to_transformation
Production Order Line | price_view
......@@ -5,8 +14,8 @@ Production Order Line | quantity_view
Production Order Line | view
Production Order Module | production_order_module_planning
Production Order Module | view
Production Order | jump_to_related_manufacturing_execution
Production Order | jump_to_related_production_packing_list
Production Order | jump_to_related_production_report
Production Order | order_print
Production Order | payment_condition
Production Order | production_order_material_consumption
......@@ -24,15 +33,6 @@ Production Packing List Module | view
Production Packing List | packing_list_print
Production Packing List | view
Production Packing List | view_stock
Production Report Cell | view
Production Report Line | option_view
Production Report Line | quantity_view
Production Report Line | view
Production Report Line | view_price
Production Report Module | view
Production Report | packing_list_print
Production Report | view
Production Report | view_stock
System Preference | mrp_preference
Transformation Simulation Rule | view
Transformation Sourcing Simulation Rule | view
\ No newline at end of file
bt5/erp5_mrp/bt/template_module_id_list
View file @ 6d240d01
manufacturing_execution_module
production_order_module
production_packing_list_module
production_report_module
\ No newline at end of file
production_packing_list_module
\ No newline at end of file
bt5/erp5_mrp/bt/template_path_list
View file @ 6d240d01
portal_deliveries/manufacturing_execution_builder
portal_deliveries/manufacturing_execution_builder/**
portal_deliveries/production_packing_list_builder
portal_deliveries/production_packing_list_builder/**
portal_deliveries/production_report_builder
portal_deliveries/production_report_builder/**
portal_domains/production_order_module_specialise_domain
\ No newline at end of file
bt5/erp5_mrp/bt/template_portal_type_allowed_content_type_list
View file @ 6d240d01
Manufacturing Execution Line | Manufacturing Execution Cell
Manufacturing Execution Module | Manufacturing Execution
Manufacturing Execution | Manufacturing Execution Line
Production Order Line | Production Order Cell
Production Order Module | Production Order
Production Order | Payment Condition
......@@ -5,9 +8,6 @@ Production Order | Production Order Line
Production Packing List Line | Production Packing List Cell
Production Packing List Module | Production Packing List
Production Packing List | Production Packing List Line
Production Report Line | Production Report Cell
Production Report Module | Production Report
Production Report | Production Report Line
Rule Tool | Transformation Simulation Rule
Rule Tool | Transformation Sourcing Simulation Rule
Transformation Simulation Rule | Category Membership Divergence Tester
......
bt5/erp5_mrp/bt/template_portal_type_base_category_list
View file @ 6d240d01
Manufacturing Execution Module | business_application
Production Order Line | specialise
Production Order Module | business_application
Production Packing List Module | business_application
Production Report Module | business_application
\ No newline at end of file
Production Packing List Module | business_application
\ No newline at end of file
bt5/erp5_mrp/bt/template_portal_type_hidden_content_type_list
View file @ 6d240d01
Manufacturing Execution Line | Manufacturing Execution Cell
Production Order Line | Delivery Cell
Production Order Line | Production Order Cell
Production Packing List Line | Delivery Cell
Production Report Line | Production Report Cell
\ No newline at end of file
Production Packing List Line | Delivery Cell
\ No newline at end of file
bt5/erp5_mrp/bt/template_portal_type_id_list
View file @ 6d240d01
Manufacturing Execution
Manufacturing Execution Cell
Manufacturing Execution Line
Manufacturing Execution Module
Production Order
Production Order Cell
Production Order Line
......@@ -6,9 +10,5 @@ Production Packing List
Production Packing List Cell
Production Packing List Line
Production Packing List Module
Production Report
Production Report Cell
Production Report Line
Production Report Module
Transformation Simulation Rule
Transformation Sourcing Simulation Rule
\ No newline at end of file
bt5/erp5_mrp/bt/template_portal_type_property_sheet_list
View file @ 6d240d01
Manufacturing Execution | DeliveryCausalityStateConstraint
Production Order Line | ProductionOrderLine
Production Packing List | DeliveryCausalityStateConstraint
bt5/erp5_mrp/bt/template_portal_type_workflow_chain_list
View file @ 6d240d01
Manufacturing Execution Cell | delivery_movement_causality_interaction_workflow
Manufacturing Execution Cell | delivery_movement_simulation_interaction_workflow
Manufacturing Execution Line | delivery_movement_causality_interaction_workflow
Manufacturing Execution Line | delivery_movement_simulation_interaction_workflow
Manufacturing Execution Line | edit_workflow
Manufacturing Execution Line | production_matrix_workflow
Manufacturing Execution | delivery_causality_interaction_workflow
Manufacturing Execution | delivery_causality_workflow
Manufacturing Execution | delivery_simulation_interaction_workflow
Manufacturing Execution | edit_workflow
Manufacturing Execution | production_packing_list_workflow
Production Order Cell | delivery_movement_causality_interaction_workflow
Production Order Cell | delivery_movement_simulation_interaction_workflow
Production Order Cell | edit_workflow
......@@ -22,17 +33,6 @@ Production Packing List | delivery_causality_workflow
Production Packing List | delivery_simulation_interaction_workflow
Production Packing List | edit_workflow
Production Packing List | production_packing_list_workflow
Production Report Cell | delivery_movement_causality_interaction_workflow
Production Report Cell | delivery_movement_simulation_interaction_workflow
Production Report Line | delivery_movement_causality_interaction_workflow
Production Report Line | delivery_movement_simulation_interaction_workflow
Production Report Line | edit_workflow
Production Report Line | production_matrix_workflow
Production Report | delivery_causality_interaction_workflow
Production Report | delivery_causality_workflow
Production Report | delivery_simulation_interaction_workflow
Production Report | edit_workflow
Production Report | production_packing_list_workflow
Transformation Simulation Rule | edit_workflow
Transformation Simulation Rule | rule_validation_workflow
Transformation Sourcing Simulation Rule | edit_workflow
......
bt5/erp5_mrp_item/bt/template_action_path_list
View file @ 6d240d01
......@@ -4,6 +4,6 @@ Production Order | aggregate_item
Production Packing List Line | item_creation
Production Packing List Line | select_item_fast_input
Production Packing List | aggregate_item
Production Report Line | item_creation
Production Report Line | select_item_fast_input
Production Report | aggregate_item
\ No newline at end of file
Manufacturing Execution Line | item_creation
Manufacturing Execution Line | select_item_fast_input
Manufacturing Execution | aggregate_item
\ No newline at end of file
product/ERP5/Document/ProductionReport.py → product/ERP5/Document/ManufacturingExecution.py
View file @ 6d240d01
......@@ -31,15 +31,15 @@ from Products.ERP5Type import Permissions, PropertySheet
from Products.ERP5.Document.Delivery import Delivery
class ProductionReport(Delivery):
class ManufacturingExecution(Delivery):
"""
A Transaction object allows to add
elementary accounting transactions in the general ledger
"""
# CMF Type Definition
meta_type = 'ERP5 Production Report'
portal_type = 'Production Report'
meta_type = 'ERP5 Manufacturing Execution'
portal_type = 'Manufacturing Execution'
# Declarative security
security = ClassSecurityInfo()
......
product/ERP5/Document/ProductionReportCell.py → product/ERP5/Document/ManufacturingExecutionCell.py
View file @ 6d240d01
......@@ -32,14 +32,14 @@ from Products.ERP5Type import Permissions, PropertySheet
from Products.ERP5.Document.DeliveryCell import DeliveryCell
class ProductionReportCell(DeliveryCell):
class ManufacturingExecutionCell(DeliveryCell):
"""
A DeliveryCell allows to define specific quantities
for each variation of a resource in a delivery line.
"""
meta_type = 'ERP5 Production Report Cell'
portal_type = 'Production Report Cell'
meta_type = 'ERP5 Manufacturing Execution Cell'
portal_type = 'Manufacturing Execution Cell'
# Declarative security
security = ClassSecurityInfo()
......
product/ERP5/Document/ProductionReportLine.py → product/ERP5/Document/ManufacturingExecutionLine.py
View file @ 6d240d01
......@@ -31,13 +31,13 @@ from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet
from Products.ERP5.Document.DeliveryLine import DeliveryLine
class ProductionReportLine(DeliveryLine):
class ManufacturingExecutionLine(DeliveryLine):
"""
Production Report Lines allow to ...
Manufacturing Execution Lines allow to ...
"""
meta_type = 'ERP5 Production Report Line'
portal_type = 'Production Report Line'
meta_type = 'ERP5 Manufacturing Execution Line'
portal_type = 'Manufacturing Execution Line'
# Declarative security
security = ClassSecurityInfo()
......@@ -57,7 +57,7 @@ class ProductionReportLine(DeliveryLine):
)
security.declareProtected( Permissions.ModifyPortalContent, 'newCellContent')
def newCellContent(self, id, portal_type='Production Report Cell', **kw):
def newCellContent(self, id, portal_type='Manufacturing Execution Cell', **kw):
"""Overriden to specify default portal type
"""
return self.newContent(id=id, portal_type=portal_type, **kw)
product/ERP5/ERP5Defaults.py
View file @ 6d240d01
......@@ -75,7 +75,7 @@ portal_delivery_type_list = ('Delivery',
'Purchase Invoice Transaction',
'Sale Invoice Transaction',
'Production Packing List',
'Production Report',
'Manufacturing Execution',
'Balance Transaction',
'Payment Transaction',
'Amortisation Transaction',
......@@ -113,8 +113,8 @@ portal_order_movement_type_list = (
'Production Order Line',
'Production Order Cell',
'Production Packing List Line',
'Production Report Line',
'Production Report Cell',
'Manufacturing Execution Line',
'Manufacturing Execution Cell',
'Packing Order Line',
'Delivery Cell',
) # Delivery Cell is both used for orders and deliveries XXX
......@@ -154,10 +154,10 @@ portal_delivery_movement_type_list = (
'Purchase Packing List Line',
'Sale Packing List Line',
'Sale Packing List Cell',
'Production Report Component',
'Production Report Operation',
'Production Report Line',
'Production Report Cell',
'Manufacturing Execution Component',
'Manufacturing Execution Operation',
'Manufacturing Execution Line',
'Manufacturing Execution Cell',
'Production Packing List Line',
'Production Packing List Cell',
'Container Line',
......
product/ERP5/tests/testMRP.py
View file @ 6d240d01
......@@ -164,7 +164,7 @@ class TestMRPMixin(TestBPMMixin):
def createBusinessProcess1(self, node_p0=None):
"""
PPL : Production Packing List
PR : Production Report
PR : Manufacturing Execution
PO : Production Order
order p0 s0 p1 deliver
------- S0 ---- S1 ---- S2 ---- S3 ------- S4
......@@ -176,7 +176,7 @@ class TestMRPMixin(TestBPMMixin):
phase_list = [('default/order', None, ('confirmed',)),
('default/delivery', builder, completed)]
phase_list[1:1] = [('mrp/p' + str(i),
'portal_deliveries/production_report_builder',
'portal_deliveries/manufacturing_execution_builder',
completed)
for i in xrange(2)]
if node_p0 is not None:
......@@ -274,7 +274,7 @@ class TestMRPImplementation(TestMRPMixin):
def getRelatedDeliveryList(portal_type):
return order.getCausalityRelatedValueList(portal_type=portal_type)
pr1, = getRelatedDeliveryList("Production Report")
pr1, = getRelatedDeliveryList("Manufacturing Execution")
pr1.start()
pr1.deliver()
order.localBuild()
......@@ -289,7 +289,7 @@ class TestMRPImplementation(TestMRPMixin):
self.tic()
self.checkStock(resource, (self.workshop, variation, 10))
pr2, = (x for x in getRelatedDeliveryList("Production Report")
pr2, = (x for x in getRelatedDeliveryList("Manufacturing Execution")
if x.aq_base is not pr1.aq_base)
pr2.start()
pr2.deliver()
......@@ -316,7 +316,7 @@ class TestMRPImplementation(TestMRPMixin):
def testOrderWithItem(self):
"""
Check item propagation from Production Order to Production Report
Check item propagation from Production Order to Manufacturing Execution
and Production Packing List
"""
self.createMRPOrder(use_item=True)
......@@ -327,13 +327,13 @@ class TestMRPImplementation(TestMRPMixin):
resource = order_line.getResourceValue()
self.tic()
production_report, = order.getCausalityRelatedValueList(
portal_type="Production Report")
manufacturing_execution, = order.getCausalityRelatedValueList(
portal_type="Manufacturing Execution")
# resource, quantity, item
expected_line_list = [(self.produced_resource, 10.0, self.item),
(self.consumed_resource_1, -30.0, None),
(self.consumed_resource_2, -10.0, None)]
self.checkExpectedLineList(production_report, expected_line_list)
self.checkExpectedLineList(manufacturing_execution, expected_line_list)
def _test_add_and_clone_tranformed_resource(self, portal_type):
test_product = self.portal.product_module.newContent()
......
product/ERP5/tests/testProductionPackingList.py
View file @ 6d240d01
......@@ -37,7 +37,7 @@ from Products.ERP5.tests.utils import newSimulationExpectedFailure
class TestProductionPackingReportListMixin(TestProductionOrderMixin, TestPackingListMixin, \
ERP5TypeTestCase):
"""Mixin for testing Production Packing Lists and Production Reports"""
"""Mixin for testing Production Packing Lists and Manufacturing Executions"""
def modifyPackingListState(self, transition_name,
sequence,packing_list=None):
......@@ -406,7 +406,7 @@ class TestProductionDelivery(TestProductionPackingReportListMixin):
def test_01_sourcingDelivery(self, quiet=0,
run=run_all_test):
"""
Test for sourcing type of delivery (Production Report and Production Packing Lists).
Test for sourcing type of delivery (Manufacturing Execution and Production Packing Lists).
"""
# XXX: Need to split to separate test (Luke)
if not run: return
......
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