[Erp5-report] r32529 kazuhiko - in /erp5/trunk/bt5/erp5_mrp: ActionTemplateItem/portal_type...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Feb 15 07:02:55 CET 2010
Author: kazuhiko
Date: Mon Feb 15 07:02:54 2010
New Revision: 32529
URL: http://svn.erp5.org?rev=32529&view=rev
Log:
* new rules that no longer use 'order' category.
Added:
erp5/trunk/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Model%20Simulation%20Rule/
- copied from r32523, erp5/trunk/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Model%20Rule/
erp5/trunk/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Simulation%20Rule/
- copied from r32523, erp5/trunk/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Rule/
erp5/trunk/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_model_simulation_rule/
- copied from r32523, erp5/trunk/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_model_rule/
erp5/trunk/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_model_simulation_rule.xml
- copied, changed from r32523, erp5/trunk/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_model_rule.xml
erp5/trunk/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_simulation_rule/
- copied from r32523, erp5/trunk/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_rule/
erp5/trunk/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_simulation_rule.xml
- copied, changed from r32523, erp5/trunk/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_rule.xml
erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Model%20Simulation%20Rule.xml
- copied, changed from r32523, erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Model%20Rule.xml
erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Simulation%20Rule.xml
- copied, changed from r32523, erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Rule.xml
Modified:
erp5/trunk/bt5/erp5_mrp/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
erp5/trunk/bt5/erp5_mrp/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationRule.xml
erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationSourcingRule_selectMovement.xml
erp5/trunk/bt5/erp5_mrp/bt/template_action_path_list
erp5/trunk/bt5/erp5_mrp/bt/template_portal_type_allowed_content_type_list
erp5/trunk/bt5/erp5_mrp/bt/template_portal_type_id_list
erp5/trunk/bt5/erp5_mrp/bt/template_portal_type_workflow_chain_list
Copied: erp5/trunk/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_model_simulation_rule.xml (from r32523, erp5/trunk/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_model_rule.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_model_simulation_rule.xml?p2=erp5/trunk/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_model_simulation_rule.xml&p1=erp5/trunk/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_model_rule.xml&r1=32523&r2=32529&rev=32529&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_model_rule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_model_simulation_rule.xml [utf8] Mon Feb 15 07:02:54 2010
@@ -3,7 +3,7 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="ProductionOrderModelRule" module="Products.ERP5Type.Document.ProductionOrderModelRule"/>
+ <global name="ProductionOrderModelSimulationRule" module="Products.ERP5Type.Document.ProductionOrderModelSimulationRule"/>
<tuple/>
</tuple>
</pickle>
@@ -88,7 +88,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>default_production_order_model_rule</string> </value>
+ <value> <string>default_production_order_model_simulation_rule</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
Copied: erp5/trunk/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_simulation_rule.xml (from r32523, erp5/trunk/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_rule.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_simulation_rule.xml?p2=erp5/trunk/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_simulation_rule.xml&p1=erp5/trunk/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_rule.xml&r1=32523&r2=32529&rev=32529&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_rule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/PathTemplateItem/portal_rules/default_production_order_simulation_rule.xml [utf8] Mon Feb 15 07:02:54 2010
@@ -3,7 +3,7 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="ProductionOrderRule" module="Products.ERP5Type.Document.ProductionOrderRule"/>
+ <global name="ProductionOrderSimulationRule" module="Products.ERP5Type.Document.ProductionOrderSimulationRule"/>
<tuple/>
</tuple>
</pickle>
@@ -74,7 +74,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>default_production_order_rule</string> </value>
+ <value> <string>default_production_order_simulation_rule</string> </value>
</item>
<item>
<key> <string>matching_property</string> </key>
@@ -86,7 +86,7 @@
</item>
<item>
<key> <string>portal_type</string> </key>
- <value> <string>Production Order Rule</string> </value>
+ <value> <string>Production Order Simulation Rule</string> </value>
</item>
<item>
<key> <string>test_method_id</string> </key>
@@ -96,7 +96,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Default Production Order Rule</string> </value>
+ <value> <string>Default Production Order Simulation Rule</string> </value>
</item>
<item>
<key> <string>version</string> </key>
Modified: erp5/trunk/bt5/erp5_mrp/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml?rev=32529&r1=32528&r2=32529&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml [utf8] Mon Feb 15 07:02:54 2010
@@ -11,10 +11,20 @@
<item>Property Divergence Tester</item>
<item>Quantity Divergence Tester</item>
</portal_type>
+ <portal_type id="Production Order Model Simulation Rule">
+ <item>Category Divergence Tester</item>
+ <item>Property Divergence Tester</item>
+ <item>Quantity Divergence Tester</item>
+ </portal_type>
<portal_type id="Production Order Module">
<item>Production Order</item>
</portal_type>
<portal_type id="Production Order Rule">
+ <item>Category Divergence Tester</item>
+ <item>Property Divergence Tester</item>
+ <item>Quantity Divergence Tester</item>
+ </portal_type>
+ <portal_type id="Production Order Simulation Rule">
<item>Category Divergence Tester</item>
<item>Property Divergence Tester</item>
<item>Quantity Divergence Tester</item>
@@ -39,7 +49,9 @@
</portal_type>
<portal_type id="Rule Tool">
<item>Production Order Model Rule</item>
+ <item>Production Order Model Simulation Rule</item>
<item>Production Order Rule</item>
+ <item>Production Order Simulation Rule</item>
<item>Transformation Model Rule</item>
<item>Transformation Rule</item>
<item>Transformation Sourcing Model Rule</item>
Copied: erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Model%20Simulation%20Rule.xml (from r32523, erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Model%20Rule.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%2520Order%2520Model%2520Simulation%2520Rule.xml?p2=erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%2520Order%2520Model%2520Simulation%2520Rule.xml&p1=erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%2520Order%2520Model%2520Rule.xml&r1=32523&r2=32529&rev=32529&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Model%20Rule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Model%20Simulation%20Rule.xml [utf8] Mon Feb 15 07:02:54 2010
@@ -38,16 +38,16 @@
</item>
<item>
<key> <string>content_meta_type</string> </key>
- <value> <string>ERP5 Production Order Model Rule</string> </value>
+ <value> <string>ERP5 Production Order Model Simulation Rule</string> </value>
</item>
<item>
<key> <string>description</string> </key>
- <value> <string>Prouction Order Rule object use a Business Process to expand a Production Order.\n
+ <value> <string>Prouction Order Model Simulation Rule object use a Business Process to expand a Production Order.\n
</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
- <value> <string>addProductionOrderModelRule</string> </value>
+ <value> <string>addProductionOrderModelSimulationRule</string> </value>
</item>
<item>
<key> <string>filter_content_types</string> </key>
@@ -63,7 +63,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>Production Order Model Rule</string> </value>
+ <value> <string>Production Order Model Simulation Rule</string> </value>
</item>
<item>
<key> <string>immediate_view</string> </key>
Copied: erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Simulation%20Rule.xml (from r32523, erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Rule.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%2520Order%2520Simulation%2520Rule.xml?p2=erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%2520Order%2520Simulation%2520Rule.xml&p1=erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%2520Order%2520Rule.xml&r1=32523&r2=32529&rev=32529&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Rule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Simulation%20Rule.xml [utf8] Mon Feb 15 07:02:54 2010
@@ -19,16 +19,16 @@
</item>
<item>
<key> <string>content_meta_type</string> </key>
- <value> <string>ERP5 Production Order Rule</string> </value>
+ <value> <string>ERP5 Production Order Simulation Rule</string> </value>
</item>
<item>
<key> <string>description</string> </key>
- <value> <string>Prouction Order Rule object use a Supply Chain to expand a Production Order.\n
+ <value> <string>Prouction Order Simulation Rule object use a Supply Chain to expand a Production Order.\n
</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
- <value> <string>addProductionOrderRule</string> </value>
+ <value> <string>addProductionOrderSimulationRule</string> </value>
</item>
<item>
<key> <string>filter_content_types</string> </key>
@@ -44,7 +44,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>Production Order Rule</string> </value>
+ <value> <string>Production Order Simulation Rule</string> </value>
</item>
<item>
<key> <string>immediate_view</string> </key>
Modified: erp5/trunk/bt5/erp5_mrp/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml?rev=32529&r1=32528&r2=32529&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml [utf8] Mon Feb 15 07:02:54 2010
@@ -16,7 +16,15 @@
<workflow>rule_validation_workflow, edit_workflow</workflow>
</chain>
<chain>
+ <type>Production Order Model Simulation Rule</type>
+ <workflow>rule_validation_workflow, edit_workflow</workflow>
+ </chain>
+ <chain>
<type>Production Order Rule</type>
+ <workflow>edit_workflow, rule_validation_workflow</workflow>
+ </chain>
+ <chain>
+ <type>Production Order Simulation Rule</type>
<workflow>edit_workflow, rule_validation_workflow</workflow>
</chain>
<chain>
Modified: erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationRule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationRule.xml?rev=32529&r1=32528&r2=32529&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationRule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationRule.xml [utf8] Mon Feb 15 07:02:54 2010
@@ -76,7 +76,8 @@
order is None or\n
movement.getResourceValue() is None or\n
movement.getSourceValue() is None or\n
- movement.getResourceValue() != root_movement.getResourceValue()):\n
+ movement.getResourceValue() != root_movement.getResourceValue() or\n
+ movement.getPath() == root_movement.getPath()):\n
return False\n
\n
supply_chain = rule.getSupplyChain(movement.getParentValue())\n
Modified: erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationSourcingRule_selectMovement.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationSourcingRule_selectMovement.xml?rev=32529&r1=32528&r2=32529&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationSourcingRule_selectMovement.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationSourcingRule_selectMovement.xml [utf8] Mon Feb 15 07:02:54 2010
@@ -62,7 +62,7 @@
return (\n
root_rule.getPortalType() == "Production Order Rule" and\\\n
(parent_rule.getPortalType() in ("Transformation Sourcing Rule",\n
- "Production Order Rule")) and\\\n
+ "Delivering Rule")) and\\\n
root_movement.getSimulationState() == "confirmed"\n
)\n
\n
Modified: erp5/trunk/bt5/erp5_mrp/bt/template_action_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/bt/template_action_path_list?rev=32529&r1=32528&r2=32529&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/bt/template_action_path_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/bt/template_action_path_list [utf8] Mon Feb 15 07:02:54 2010
@@ -3,9 +3,11 @@
Production Order Line | quantity_view
Production Order Line | view
Production Order Model Rule | view
+Production Order Model Simulation Rule | view
Production Order Module | production_order_module_planning
Production Order Module | view
Production Order Rule | view
+Production Order Simulation Rule | view
Production Order | jump_to_related_production_packing_list
Production Order | jump_to_related_production_report
Production Order | order_print
Modified: erp5/trunk/bt5/erp5_mrp/bt/template_portal_type_allowed_content_type_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/bt/template_portal_type_allowed_content_type_list?rev=32529&r1=32528&r2=32529&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/bt/template_portal_type_allowed_content_type_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/bt/template_portal_type_allowed_content_type_list [utf8] Mon Feb 15 07:02:54 2010
@@ -2,10 +2,16 @@
Production Order Model Rule | Category Divergence Tester
Production Order Model Rule | Property Divergence Tester
Production Order Model Rule | Quantity Divergence Tester
+Production Order Model Simulation Rule | Category Divergence Tester
+Production Order Model Simulation Rule | Property Divergence Tester
+Production Order Model Simulation Rule | Quantity Divergence Tester
Production Order Module | Production Order
Production Order Rule | Category Divergence Tester
Production Order Rule | Property Divergence Tester
Production Order Rule | Quantity Divergence Tester
+Production Order Simulation Rule | Category Divergence Tester
+Production Order Simulation Rule | Property Divergence Tester
+Production Order Simulation Rule | Quantity Divergence Tester
Production Order | Payment Condition
Production Order | Production Order Line
Production Packing List Line | Production Packing List Cell
Modified: erp5/trunk/bt5/erp5_mrp/bt/template_portal_type_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/bt/template_portal_type_id_list?rev=32529&r1=32528&r2=32529&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/bt/template_portal_type_id_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/bt/template_portal_type_id_list [utf8] Mon Feb 15 07:02:54 2010
@@ -2,8 +2,10 @@
Production Order Cell
Production Order Line
Production Order Model Rule
+Production Order Model Simulation Rule
Production Order Module
Production Order Rule
+Production Order Simulation Rule
Production Packing List
Production Packing List Cell
Production Packing List Line
Modified: erp5/trunk/bt5/erp5_mrp/bt/template_portal_type_workflow_chain_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/bt/template_portal_type_workflow_chain_list?rev=32529&r1=32528&r2=32529&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/bt/template_portal_type_workflow_chain_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/bt/template_portal_type_workflow_chain_list [utf8] Mon Feb 15 07:02:54 2010
@@ -6,8 +6,12 @@
Production Order Line | transformation_interaction_workflow
Production Order Model Rule | edit_workflow
Production Order Model Rule | rule_validation_workflow
+Production Order Model Simulation Rule | edit_workflow
+Production Order Model Simulation Rule | rule_validation_workflow
Production Order Rule | edit_workflow
Production Order Rule | rule_validation_workflow
+Production Order Simulation Rule | edit_workflow
+Production Order Simulation Rule | rule_validation_workflow
Production Order | edit_workflow
Production Order | order_simulation_interaction_workflow
Production Order | production_order_workflow
More information about the Erp5-report
mailing list