[Erp5-report] r32842 kazuhiko - in /erp5/trunk: bt5/erp5_invoicing/SkinTemplateItem/portal_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Feb 19 10:17:15 CET 2010
Author: kazuhiko
Date: Fri Feb 19 10:17:11 2010
New Revision: 32842
URL: http://svn.erp5.org?rev=32842&view=rev
Log:
rename new simulation rules according to the naming convention.
Added:
erp5/trunk/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Model%20Root%20Simulation%20Rule/
- copied from r32810, erp5/trunk/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Model%20Simulation%20Rule/
erp5/trunk/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Root%20Simulation%20Rule/
- copied from r32810, erp5/trunk/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Simulation%20Rule/
erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Model%20Root%20Simulation%20Rule.xml
- copied, changed from r32810, erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Model%20Simulation%20Rule.xml
erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Root%20Simulation%20Rule.xml
- copied, changed from r32810, erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Simulation%20Rule.xml
erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Simulation%20Rule/
- copied from r32810, erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivering%20Simulation%20Rule/
erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Root%20Simulation%20Rule/
- copied from r32810, erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Simulation%20Rule/
erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivery%20Simulation%20Rule.xml
- copied, changed from r32810, erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivering%20Simulation%20Rule.xml
erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%20Root%20Simulation%20Rule.xml
- copied, changed from r32810, erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%20Simulation%20Rule.xml
erp5/trunk/products/ERP5/Document/DeliverySimulationRule.py
- copied, changed from r32839, erp5/trunk/products/ERP5/Document/DeliveringSimulationRule.py
erp5/trunk/products/ERP5/Document/OrderRootSimulationRule.py
- copied, changed from r32839, erp5/trunk/products/ERP5/Document/OrderSimulationRule.py
erp5/trunk/products/ERP5/Document/ProductionOrderModelRootSimulationRule.py
- copied, changed from r32839, erp5/trunk/products/ERP5/Document/ProductionOrderModelSimulationRule.py
erp5/trunk/products/ERP5/Document/ProductionOrderRootSimulationRule.py
- copied, changed from r32839, erp5/trunk/products/ERP5/Document/ProductionOrderSimulationRule.py
Removed:
erp5/trunk/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Model%20Simulation%20Rule/
erp5/trunk/bt5/erp5_mrp/ActionTemplateItem/portal_types/Production%20Order%20Simulation%20Rule/
erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Model%20Simulation%20Rule.xml
erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Simulation%20Rule.xml
erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivering%20Simulation%20Rule/
erp5/trunk/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Simulation%20Rule/
erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivering%20Simulation%20Rule.xml
erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%20Simulation%20Rule.xml
erp5/trunk/products/ERP5/Document/DeliveringSimulationRule.py
erp5/trunk/products/ERP5/Document/OrderSimulationRule.py
erp5/trunk/products/ERP5/Document/ProductionOrderModelSimulationRule.py
erp5/trunk/products/ERP5/Document/ProductionOrderSimulationRule.py
Modified:
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml
erp5/trunk/bt5/erp5_invoicing/bt/revision
erp5/trunk/bt5/erp5_legacy_tax_system/SkinTemplateItem/portal_skins/erp5_legacy_tax_system/SimulationMovement_testTaxRule.xml
erp5/trunk/bt5/erp5_legacy_tax_system/bt/revision
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_testTransformationModelRule.xml
erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationRule.xml
erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationSourcingModelRule.xml
erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationSourcingRule.xml
erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationRule_selectMovement.xml
erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationSourcingRule_selectMovement.xml
erp5/trunk/bt5/erp5_mrp/bt/revision
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
erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_selectMovement.xml
erp5/trunk/bt5/erp5_project/bt/revision
erp5/trunk/bt5/erp5_trade/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
erp5/trunk/bt5/erp5_trade/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_selectMovement.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_selectMovement.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SimulationMovement_testDeliveringSimulationRule.xml
erp5/trunk/bt5/erp5_trade/bt/revision
erp5/trunk/bt5/erp5_trade/bt/template_action_path_list
erp5/trunk/bt5/erp5_trade/bt/template_portal_type_allowed_content_type_list
erp5/trunk/bt5/erp5_trade/bt/template_portal_type_id_list
erp5/trunk/bt5/erp5_trade/bt/template_portal_type_workflow_chain_list
Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml?rev=32842&r1=32841&r2=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml [utf8] Fri Feb 19 10:17:11 2010
@@ -59,11 +59,11 @@
if parent.getPortalType() == \'Applied Rule\':\n
parent_rule = parent.getSpecialiseValue()\n
parent_rule_portal_type = parent_rule.getPortalType()\n
- if parent_rule_portal_type not in [\'Order Rule\', \'Delivery Rule\', \'Delivering Simulation Rule\']:\n
+ if parent_rule_portal_type not in [\'Order Rule\', \'Delivery Rule\', \'Delivery Simulation Rule\']:\n
return False\n
# XXX can we create invoicing rule for Production Order?\n
- if parent_rule_portal_type in [\'Delivering Simulation Rule\',] and \\\n
- parent.getParentValue().getParentValue().getSpecialiseValue().getPortalType() not in [\'Order Simulation Rule\']:\n
+ if parent_rule_portal_type in [\'Delivery Simulation Rule\',] and \\\n
+ parent.getParentValue().getParentValue().getSpecialiseValue().getPortalType() not in [\'Order Root Simulation Rule\']:\n
return False\n
\n
source_section = movement.getSourceSection()\n
Modified: erp5/trunk/bt5/erp5_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/revision?rev=32842&r1=32841&r2=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] Fri Feb 19 10:17:11 2010
@@ -1,1 +1,1 @@
-334
+335
Modified: erp5/trunk/bt5/erp5_legacy_tax_system/SkinTemplateItem/portal_skins/erp5_legacy_tax_system/SimulationMovement_testTaxRule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_legacy_tax_system/SkinTemplateItem/portal_skins/erp5_legacy_tax_system/SimulationMovement_testTaxRule.xml?rev=32842&r1=32841&r2=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_legacy_tax_system/SkinTemplateItem/portal_skins/erp5_legacy_tax_system/SimulationMovement_testTaxRule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_legacy_tax_system/SkinTemplateItem/portal_skins/erp5_legacy_tax_system/SimulationMovement_testTaxRule.xml [utf8] Fri Feb 19 10:17:11 2010
@@ -59,11 +59,11 @@
if parent.getPortalType() == \'Applied Rule\':\n
parent_rule = parent.getSpecialiseValue()\n
parent_rule_portal_type = parent_rule.getPortalType()\n
- if parent_rule_portal_type not in [\'Order Rule\', \'Delivery Rule\', \'Delivering Simulation Rule\']:\n
+ if parent_rule_portal_type not in [\'Order Rule\', \'Delivery Rule\', \'Delivery Simulation Rule\']:\n
return False\n
# XXX can we create tax rule for Production Order?\n
- if parent_rule_portal_type in [\'Delivering Simulation Rule\',] and \\\n
- parent.getParentValue().getParentValue().getSpecialiseValue().getPortalType() not in [\'Order Simulation Rule\']:\n
+ if parent_rule_portal_type in [\'Delivery Simulation Rule\',] and \\\n
+ parent.getParentValue().getParentValue().getSpecialiseValue().getPortalType() not in [\'Order Root Simulation Rule\']:\n
return False\n
\n
return True\n
Modified: erp5/trunk/bt5/erp5_legacy_tax_system/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_legacy_tax_system/bt/revision?rev=32842&r1=32841&r2=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_legacy_tax_system/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_legacy_tax_system/bt/revision [utf8] Fri Feb 19 10:17:11 2010
@@ -1,1 +1,1 @@
-10
+11
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=32842&r1=32841&r2=32842&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] Fri Feb 19 10:17:11 2010
@@ -11,7 +11,7 @@
<item>Property Divergence Tester</item>
<item>Quantity Divergence Tester</item>
</portal_type>
- <portal_type id="Production Order Model Simulation Rule">
+ <portal_type id="Production Order Model Root Simulation Rule">
<item>Category Divergence Tester</item>
<item>Property Divergence Tester</item>
<item>Quantity Divergence Tester</item>
@@ -24,7 +24,7 @@
<item>Property Divergence Tester</item>
<item>Quantity Divergence Tester</item>
</portal_type>
- <portal_type id="Production Order Simulation Rule">
+ <portal_type id="Production Order Root Simulation Rule">
<item>Category Divergence Tester</item>
<item>Property Divergence Tester</item>
<item>Quantity Divergence Tester</item>
@@ -48,10 +48,10 @@
<item>Production Report</item>
</portal_type>
<portal_type id="Rule Tool">
+ <item>Production Order Model Root Simulation Rule</item>
<item>Production Order Model Rule</item>
- <item>Production Order Model Simulation Rule</item>
+ <item>Production Order Root 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%20Root%20Simulation%20Rule.xml (from r32810, erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Model%20Simulation%20Rule.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%2520Order%2520Model%2520Root%2520Simulation%2520Rule.xml?p2=erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%2520Order%2520Model%2520Root%2520Simulation%2520Rule.xml&p1=erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%2520Order%2520Model%2520Simulation%2520Rule.xml&r1=32810&r2=32842&rev=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Model%20Simulation%20Rule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Model%20Root%20Simulation%20Rule.xml [utf8] Fri Feb 19 10:17:11 2010
@@ -38,16 +38,16 @@
</item>
<item>
<key> <string>content_meta_type</string> </key>
- <value> <string>ERP5 Production Order Model Simulation Rule</string> </value>
+ <value> <string>ERP5 Production Order Model Root Simulation Rule</string> </value>
</item>
<item>
<key> <string>description</string> </key>
- <value> <string>Prouction Order Model Simulation Rule object use a Business Process to expand a Production Order.\n
+ <value> <string>Prouction Order Model Root Simulation Rule object use a Business Process to expand a Production Order.\n
</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
- <value> <string>addProductionOrderModelSimulationRule</string> </value>
+ <value> <string>addProductionOrderModelRootSimulationRule</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 Simulation Rule</string> </value>
+ <value> <string>Production Order Model Root Simulation Rule</string> </value>
</item>
<item>
<key> <string>immediate_view</string> </key>
Removed: erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Model%20Simulation%20Rule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%2520Order%2520Model%2520Simulation%2520Rule.xml?rev=32841&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Model%20Simulation%20Rule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Model%20Simulation%20Rule.xml (removed)
@@ -1,131 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_property_domain_dict</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>short_title</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>acquire_local_roles</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>content_icon</string> </key>
- <value> <string>document.gif</string> </value>
- </item>
- <item>
- <key> <string>content_meta_type</string> </key>
- <value> <string>ERP5 Production Order Model Simulation Rule</string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <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>addProductionOrderModelSimulationRule</string> </value>
- </item>
- <item>
- <key> <string>filter_content_types</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>group_list</string> </key>
- <value>
- <tuple>
- <string>rule</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>Production Order Model Simulation Rule</string> </value>
- </item>
- <item>
- <key> <string>immediate_view</string> </key>
- <value> <string>ProductionOrderRule_view</string> </value>
- </item>
- <item>
- <key> <string>init_script</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>permission</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>product</string> </key>
- <value> <string>ERP5Type</string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>domain_name</string> </key>
- <value> <string>erp5_content</string> </value>
- </item>
- <item>
- <key> <string>property_name</string> </key>
- <value> <string>short_title</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="3" aka="AAAAAAAAAAM=">
- <pickle>
- <tuple>
- <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>domain_name</string> </key>
- <value> <string>erp5_content</string> </value>
- </item>
- <item>
- <key> <string>property_name</string> </key>
- <value> <string>title</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Copied: erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Root%20Simulation%20Rule.xml (from r32810, erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Simulation%20Rule.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%2520Order%2520Root%2520Simulation%2520Rule.xml?p2=erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%2520Order%2520Root%2520Simulation%2520Rule.xml&p1=erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%2520Order%2520Simulation%2520Rule.xml&r1=32810&r2=32842&rev=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Simulation%20Rule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Root%20Simulation%20Rule.xml [utf8] Fri Feb 19 10:17:11 2010
@@ -19,16 +19,16 @@
</item>
<item>
<key> <string>content_meta_type</string> </key>
- <value> <string>ERP5 Production Order Simulation Rule</string> </value>
+ <value> <string>ERP5 Production Order Root Simulation Rule</string> </value>
</item>
<item>
<key> <string>description</string> </key>
- <value> <string>Prouction Order Simulation Rule object use a Supply Chain to expand a Production Order.\n
+ <value> <string>Prouction Order Root Simulation Rule object use a Supply Chain to expand a Production Order.\n
</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
- <value> <string>addProductionOrderSimulationRule</string> </value>
+ <value> <string>addProductionOrderRootSimulationRule</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 Simulation Rule</string> </value>
+ <value> <string>Production Order Root Simulation Rule</string> </value>
</item>
<item>
<key> <string>immediate_view</string> </key>
Removed: erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Simulation%20Rule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%2520Order%2520Simulation%2520Rule.xml?rev=32841&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Simulation%20Rule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/PortalTypeTemplateItem/portal_types/Production%20Order%20Simulation%20Rule.xml (removed)
@@ -1,72 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>acquire_local_roles</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>content_icon</string> </key>
- <value> <string>document.gif</string> </value>
- </item>
- <item>
- <key> <string>content_meta_type</string> </key>
- <value> <string>ERP5 Production Order Simulation Rule</string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <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>addProductionOrderSimulationRule</string> </value>
- </item>
- <item>
- <key> <string>filter_content_types</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>group_list</string> </key>
- <value>
- <tuple>
- <string>rule</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>Production Order Simulation Rule</string> </value>
- </item>
- <item>
- <key> <string>immediate_view</string> </key>
- <value> <string>ProductionOrderRule_view</string> </value>
- </item>
- <item>
- <key> <string>init_script</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>permission</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>product</string> </key>
- <value> <string>ERP5Type</string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
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=32842&r1=32841&r2=32842&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] Fri Feb 19 10:17:11 2010
@@ -16,7 +16,7 @@
<workflow>rule_validation_workflow, edit_workflow</workflow>
</chain>
<chain>
- <type>Production Order Model Simulation Rule</type>
+ <type>Production Order Model Root Simulation Rule</type>
<workflow>rule_validation_workflow, edit_workflow</workflow>
</chain>
<chain>
@@ -24,7 +24,7 @@
<workflow>edit_workflow, rule_validation_workflow</workflow>
</chain>
<chain>
- <type>Production Order Simulation Rule</type>
+ <type>Production Order Root Simulation Rule</type>
<workflow>edit_workflow, rule_validation_workflow</workflow>
</chain>
<chain>
Modified: erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationModelRule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationModelRule.xml?rev=32842&r1=32841&r2=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationModelRule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationModelRule.xml [utf8] Fri Feb 19 10:17:11 2010
@@ -64,7 +64,7 @@
\n
# Test movement\n
if (root_rule is None or\n
- root_rule.getPortalType() not in ("Production Order Model Rule", "Production Order Model Simulation Rule") or\n
+ root_rule.getPortalType() not in ("Production Order Model Rule", "Production Order Model Root Simulation Rule") or\n
order is None or\n
movement.getSource() is None):\n
return False\n
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=32842&r1=32841&r2=32842&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] Fri Feb 19 10:17:11 2010
@@ -72,13 +72,13 @@
\n
# Test movement\n
if (root_rule is None or\n
- root_rule.getPortalType() not in ("Production Order Rule", "Production Order Simulation Rule") or\n
+ root_rule.getPortalType() not in ("Production Order Rule", "Production Order Root Simulation Rule") or\n
order is None or\n
movement.getResourceValue() is None or\n
movement.getSourceValue() is None or\n
movement.getResourceValue() != root_movement.getResourceValue()):\n
return False\n
-if root_rule.getPortalType() in ("Production Order Simulation Rule",) and\\\n
+if root_rule.getPortalType() in ("Production Order Root Simulation Rule",) and\\\n
movement.getPath() == root_movement.getPath():\n
return False\n
\n
Modified: erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationSourcingModelRule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationSourcingModelRule.xml?rev=32842&r1=32841&r2=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationSourcingModelRule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationSourcingModelRule.xml [utf8] Fri Feb 19 10:17:11 2010
@@ -65,7 +65,7 @@
\n
# Test movement\n
if (root_rule is None or\n
- root_rule.getPortalType() not in ("Production Order Model Rule", "Production Order Model Simulation Rule") or\n
+ root_rule.getPortalType() not in ("Production Order Model Rule", "Production Order Model Root Simulation Rule") or\n
order is None or\n
parent_rule.getPortalType() != "Transformation Model Rule"):\n
return False\n
Modified: erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationSourcingRule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationSourcingRule.xml?rev=32842&r1=32841&r2=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationSourcingRule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationSourcingRule.xml [utf8] Fri Feb 19 10:17:11 2010
@@ -68,7 +68,7 @@
\n
# Test movement\n
if (root_rule is None or\n
- root_rule.getPortalType() not in ("Production Order Rule", "Production Order Simulation Rule") or\n
+ root_rule.getPortalType() not in ("Production Order Rule", "Production Order Root Simulation Rule") or\n
order is None or\n
movement.getResourceValue() is None or\n
movement.getSourceValue() is None):\n
Modified: erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationRule_selectMovement.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationRule_selectMovement.xml?rev=32842&r1=32841&r2=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationRule_selectMovement.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationRule_selectMovement.xml [utf8] Fri Feb 19 10:17:11 2010
@@ -61,7 +61,7 @@
parent_rule = parent_applied_rule.getSpecialiseValue()\n
return (\n
root_rule.getPortalType() in ("Production Order Rule",\n
- "Production Order Simulation Rule") and\\\n
+ "Production Order Root Simulation Rule") and\\\n
parent_rule.getPortalType() == "Transformation Rule" and\\\n
root_movement.getSimulationState() == "confirmed"\n
)\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=32842&r1=32841&r2=32842&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] Fri Feb 19 10:17:11 2010
@@ -63,9 +63,9 @@
((root_rule.getPortalType() in ("Production Order Rule",) and\\\n
parent_rule.getPortalType() in ("Transformation Sourcing Rule",\n
"Production Order Rule")) or\\\n
- (root_rule.getPortalType() in ("Production Order Simulation Rule",) and\\\n
+ (root_rule.getPortalType() in ("Production Order Root Simulation Rule",) and\\\n
parent_rule.getPortalType() in ("Transformation Sourcing Rule",\n
- "Delivering Simulation Rule"))) and\\\n
+ "Delivery Simulation Rule"))) and\\\n
root_movement.getSimulationState() == "confirmed"\n
)\n
\n
Modified: erp5/trunk/bt5/erp5_mrp/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/bt/revision?rev=32842&r1=32841&r2=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/bt/revision [utf8] Fri Feb 19 10:17:11 2010
@@ -1,1 +1,1 @@
-420
+421
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=32842&r1=32841&r2=32842&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] Fri Feb 19 10:17:11 2010
@@ -3,11 +3,11 @@
Production Order Line | quantity_view
Production Order Line | view
Production Order Model Rule | view
-Production Order Model Simulation Rule | view
+Production Order Model Root 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 Root 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=32842&r1=32841&r2=32842&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] Fri Feb 19 10:17:11 2010
@@ -2,16 +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 Model Root Simulation Rule | Category Divergence Tester
+Production Order Model Root Simulation Rule | Property Divergence Tester
+Production Order Model Root 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 Root Simulation Rule | Category Divergence Tester
+Production Order Root Simulation Rule | Property Divergence Tester
+Production Order Root Simulation Rule | Quantity Divergence Tester
Production Order | Payment Condition
Production Order | Production Order Line
Production Packing List Line | Production Packing List Cell
@@ -20,7 +20,9 @@
Production Report Line | Production Report Cell
Production Report Module | Production Report
Production Report | Production Report Line
+Rule Tool | Production Order Model Root Simulation Rule
Rule Tool | Production Order Model Rule
+Rule Tool | Production Order Root Simulation Rule
Rule Tool | Production Order Rule
Rule Tool | Transformation Model Rule
Rule Tool | Transformation Rule
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=32842&r1=32841&r2=32842&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] Fri Feb 19 10:17:11 2010
@@ -2,10 +2,10 @@
Production Order Cell
Production Order Line
Production Order Model Rule
-Production Order Model Simulation Rule
+Production Order Model Root Simulation Rule
Production Order Module
Production Order Rule
-Production Order Simulation Rule
+Production Order Root 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=32842&r1=32841&r2=32842&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] Fri Feb 19 10:17:11 2010
@@ -6,12 +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 Model Root Simulation Rule | edit_workflow
+Production Order Model Root 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 Root Simulation Rule | edit_workflow
+Production Order Root Simulation Rule | rule_validation_workflow
Production Order | edit_workflow
Production Order | order_simulation_interaction_workflow
Production Order | production_order_workflow
Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_selectMovement.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_selectMovement.xml?rev=32842&r1=32841&r2=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_selectMovement.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_selectMovement.xml [utf8] Fri Feb 19 10:17:11 2010
@@ -60,7 +60,7 @@
ComplexQuery(\n
Query(parent_specialise_portal_type=[\'Order Rule\', \'Delivery Rule\'],\n
simulation_state=\'confirmed\'),\n
- Query(parent_specialise_portal_type=\'Delivering Simulation Rule\',\n
+ Query(parent_specialise_portal_type=\'Delivery Simulation Rule\',\n
grand_parent_simulation_state=\'confirmed\'),\n
operator=\'or\'),\n
operator=\'and\')\n
Modified: erp5/trunk/bt5/erp5_project/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/bt/revision?rev=32842&r1=32841&r2=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/bt/revision [utf8] Fri Feb 19 10:17:11 2010
@@ -1,1 +1,1 @@
-733
+734
Modified: erp5/trunk/bt5/erp5_trade/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml?rev=32842&r1=32841&r2=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml [utf8] Fri Feb 19 10:17:11 2010
@@ -13,7 +13,7 @@
<portal_type id="Container Line">
<item>Container Cell</item>
</portal_type>
- <portal_type id="Delivering Simulation Rule">
+ <portal_type id="Delivery Simulation Rule">
<item>Category Divergence Tester</item>
<item>Property Divergence Tester</item>
<item>Quantity Divergence Tester</item>
@@ -49,7 +49,7 @@
<item>Property Divergence Tester</item>
<item>Quantity Divergence Tester</item>
</portal_type>
- <portal_type id="Order Simulation Rule">
+ <portal_type id="Order Root Simulation Rule">
<item>Category Divergence Tester</item>
<item>Property Divergence Tester</item>
<item>Quantity Divergence Tester</item>
@@ -98,8 +98,9 @@
</portal_type>
<portal_type id="Rule Tool">
<item>Delivery Rule</item>
+ <item>Delivery Simulation Rule</item>
<item>Order Rule</item>
- <item>Order Simulation Rule</item>
+ <item>Order Root Simulation Rule</item>
</portal_type>
<portal_type id="Sale Order">
<item>Payment Condition</item>
Removed: erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivering%20Simulation%20Rule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivering%2520Simulation%2520Rule.xml?rev=32841&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivering%20Simulation%20Rule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivering%20Simulation%20Rule.xml (removed)
@@ -1,63 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>acquire_local_roles</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>content_icon</string> </key>
- <value> <string>rule_icon.gif</string> </value>
- </item>
- <item>
- <key> <string>content_meta_type</string> </key>
- <value> <string>ERP5 Delivering Simulation Rule</string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string>An ERP5 Rule...</string> </value>
- </item>
- <item>
- <key> <string>factory</string> </key>
- <value> <string>addDeliveringSimulationRule</string> </value>
- </item>
- <item>
- <key> <string>filter_content_types</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>group_list</string> </key>
- <value>
- <tuple>
- <string>rule</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>Delivering Simulation Rule</string> </value>
- </item>
- <item>
- <key> <string>init_script</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>permission</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Copied: erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivery%20Simulation%20Rule.xml (from r32810, erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivering%20Simulation%20Rule.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivery%2520Simulation%2520Rule.xml?p2=erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivery%2520Simulation%2520Rule.xml&p1=erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivering%2520Simulation%2520Rule.xml&r1=32810&r2=32842&rev=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivering%20Simulation%20Rule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivery%20Simulation%20Rule.xml [utf8] Fri Feb 19 10:17:11 2010
@@ -19,7 +19,7 @@
</item>
<item>
<key> <string>content_meta_type</string> </key>
- <value> <string>ERP5 Delivering Simulation Rule</string> </value>
+ <value> <string>ERP5 Delivery Simulation Rule</string> </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -27,7 +27,7 @@
</item>
<item>
<key> <string>factory</string> </key>
- <value> <string>addDeliveringSimulationRule</string> </value>
+ <value> <string>addDeliverySimulationRule</string> </value>
</item>
<item>
<key> <string>filter_content_types</string> </key>
@@ -43,7 +43,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>Delivering Simulation Rule</string> </value>
+ <value> <string>Delivery Simulation Rule</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
Copied: erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%20Root%20Simulation%20Rule.xml (from r32810, erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%20Simulation%20Rule.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%2520Root%2520Simulation%2520Rule.xml?p2=erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%2520Root%2520Simulation%2520Rule.xml&p1=erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%2520Simulation%2520Rule.xml&r1=32810&r2=32842&rev=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%20Simulation%20Rule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%20Root%20Simulation%20Rule.xml [utf8] Fri Feb 19 10:17:11 2010
@@ -19,7 +19,7 @@
</item>
<item>
<key> <string>content_meta_type</string> </key>
- <value> <string>ERP5 Order Simulation Rule</string> </value>
+ <value> <string>ERP5 Order Root Simulation Rule</string> </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -27,7 +27,7 @@
</item>
<item>
<key> <string>factory</string> </key>
- <value> <string>addOrderSimulationRule</string> </value>
+ <value> <string>addOrderRootSimulationRule</string> </value>
</item>
<item>
<key> <string>filter_content_types</string> </key>
@@ -43,7 +43,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>Order Simulation Rule</string> </value>
+ <value> <string>Order Root Simulation Rule</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
Removed: erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%20Simulation%20Rule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%2520Simulation%2520Rule.xml?rev=32841&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%20Simulation%20Rule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%20Simulation%20Rule.xml (removed)
@@ -1,63 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>acquire_local_roles</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>content_icon</string> </key>
- <value> <string>rule_icon.gif</string> </value>
- </item>
- <item>
- <key> <string>content_meta_type</string> </key>
- <value> <string>ERP5 Order Simulation Rule</string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string>An ERP5 Rule...</string> </value>
- </item>
- <item>
- <key> <string>factory</string> </key>
- <value> <string>addOrderSimulationRule</string> </value>
- </item>
- <item>
- <key> <string>filter_content_types</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>group_list</string> </key>
- <value>
- <tuple>
- <string>rule</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>Order Simulation Rule</string> </value>
- </item>
- <item>
- <key> <string>init_script</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>permission</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Modified: erp5/trunk/bt5/erp5_trade/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml?rev=32842&r1=32841&r2=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml [utf8] Fri Feb 19 10:17:11 2010
@@ -24,7 +24,7 @@
<workflow>container_interaction_workflow, edit_workflow, pricing_interaction_workflow, trade_matrix_workflow</workflow>
</chain>
<chain>
- <type>Delivering Simulation Rule</type>
+ <type>Delivery Simulation Rule</type>
<workflow>edit_workflow, rule_validation_workflow</workflow>
</chain>
<chain>
@@ -64,7 +64,7 @@
<workflow>edit_workflow, rule_validation_workflow</workflow>
</chain>
<chain>
- <type>Order Simulation Rule</type>
+ <type>Order Root Simulation Rule</type>
<workflow>edit_workflow, rule_validation_workflow</workflow>
</chain>
<chain>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_selectMovement.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_selectMovement.xml?rev=32842&r1=32841&r2=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_selectMovement.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_selectMovement.xml [utf8] Fri Feb 19 10:17:11 2010
@@ -60,7 +60,7 @@
ComplexQuery(\n
Query(parent_specialise_portal_type=[\'Order Rule\', \'Delivery Rule\'],\n
simulation_state=\'confirmed\'),\n
- Query(parent_specialise_portal_type=\'Delivering Simulation Rule\',\n
+ Query(parent_specialise_portal_type=\'Delivery Simulation Rule\',\n
grand_parent_simulation_state=\'confirmed\'),\n
operator=\'or\'),\n
operator=\'and\')\n
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_selectMovement.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_selectMovement.xml?rev=32842&r1=32841&r2=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_selectMovement.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_selectMovement.xml [utf8] Fri Feb 19 10:17:11 2010
@@ -60,7 +60,7 @@
ComplexQuery(\n
Query(parent_specialise_portal_type=[\'Order Rule\', \'Delivery Rule\'],\n
simulation_state=\'confirmed\'),\n
- Query(parent_specialise_portal_type=\'Delivering Simulation Rule\',\n
+ Query(parent_specialise_portal_type=\'Delivery Simulation Rule\',\n
grand_parent_simulation_state=\'confirmed\'),\n
operator=\'or\'),\n
operator=\'and\')\n
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SimulationMovement_testDeliveringSimulationRule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SimulationMovement_testDeliveringSimulationRule.xml?rev=32842&r1=32841&r2=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SimulationMovement_testDeliveringSimulationRule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SimulationMovement_testDeliveringSimulationRule.xml [utf8] Fri Feb 19 10:17:11 2010
@@ -58,7 +58,7 @@
parent = movement.getParentValue()\n
if parent.getPortalType() == \'Applied Rule\':\n
parent_rule = parent.getSpecialiseValue()\n
- if parent_rule.getPortalType() not in [\'Order Simulation Rule\', \'Production Order Simulation Rule\']:\n
+ if parent_rule.getPortalType() not in [\'Order Root Simulation Rule\', \'Production Order Root Simulation Rule\']:\n
return False\n
\n
source_section = movement.getSourceSection()\n
Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=32842&r1=32841&r2=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Fri Feb 19 10:17:11 2010
@@ -1,1 +1,1 @@
-839
+840
Modified: erp5/trunk/bt5/erp5_trade/bt/template_action_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/template_action_path_list?rev=32842&r1=32841&r2=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/template_action_path_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/template_action_path_list [utf8] Fri Feb 19 10:17:11 2010
@@ -8,7 +8,7 @@
Container Line | view
Container Line | view_quantity
Container | view
-Delivering Simulation Rule | view
+Delivery Simulation Rule | view
Delivery Cell | view
Delivery Rule | view
First Causality Movement Group | view
@@ -34,7 +34,7 @@
Inventory | inventory_fast_input
Inventory | view
Order Rule | view
-Order Simulation Rule | view
+Order Root Simulation Rule | view
Organisation | jump_to_purchase_order
Organisation | jump_to_purchase_packing_list
Organisation | jump_to_sale_order
Modified: erp5/trunk/bt5/erp5_trade/bt/template_portal_type_allowed_content_type_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/template_portal_type_allowed_content_type_list?rev=32842&r1=32841&r2=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/template_portal_type_allowed_content_type_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/template_portal_type_allowed_content_type_list [utf8] Fri Feb 19 10:17:11 2010
@@ -4,9 +4,9 @@
Container Line | Container Cell
Container | Container
Container | Container Line
-Delivering Simulation Rule | Category Divergence Tester
-Delivering Simulation Rule | Property Divergence Tester
-Delivering Simulation Rule | Quantity Divergence Tester
+Delivery Simulation Rule | Category Divergence Tester
+Delivery Simulation Rule | Property Divergence Tester
+Delivery Simulation Rule | Quantity Divergence Tester
Delivery Builder | First Causality Movement Group
Delivery Rule | Category Divergence Tester
Delivery Rule | Property Divergence Tester
@@ -20,9 +20,9 @@
Order Rule | Category Divergence Tester
Order Rule | Property Divergence Tester
Order Rule | Quantity Divergence Tester
-Order Simulation Rule | Category Divergence Tester
-Order Simulation Rule | Property Divergence Tester
-Order Simulation Rule | Quantity Divergence Tester
+Order Root Simulation Rule | Category Divergence Tester
+Order Root Simulation Rule | Property Divergence Tester
+Order Root Simulation Rule | Quantity Divergence Tester
Preference | Sale Order
Purchase Order Line | Purchase Order Cell
Purchase Order Line | Purchase Order Line
@@ -42,8 +42,9 @@
Returned Sale Packing List | Container
Returned Sale Packing List | Returned Sale Packing List Line
Rule Tool | Delivery Rule
+Rule Tool | Delivery Simulation Rule
Rule Tool | Order Rule
-Rule Tool | Order Simulation Rule
+Rule Tool | Order Root Simulation Rule
Sale Order Line | Sale Order Cell
Sale Order Line | Sale Order Line
Sale Order Module | Sale Order
Modified: erp5/trunk/bt5/erp5_trade/bt/template_portal_type_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/template_portal_type_id_list?rev=32842&r1=32841&r2=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/template_portal_type_id_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/template_portal_type_id_list [utf8] Fri Feb 19 10:17:11 2010
@@ -5,7 +5,7 @@
Container
Container Cell
Container Line
-Delivering Simulation Rule
+Delivery Simulation Rule
Delivery Cell
Delivery Rule
First Causality Movement Group
@@ -18,7 +18,7 @@
Inventory Line
Inventory Module
Order Rule
-Order Simulation Rule
+Order Root Simulation Rule
Payment Condition
Purchase Order
Purchase Order Cell
Modified: erp5/trunk/bt5/erp5_trade/bt/template_portal_type_workflow_chain_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/template_portal_type_workflow_chain_list?rev=32842&r1=32841&r2=32842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/template_portal_type_workflow_chain_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/template_portal_type_workflow_chain_list [utf8] Fri Feb 19 10:17:11 2010
@@ -11,8 +11,8 @@
Container Line | trade_matrix_workflow
Container | edit_workflow
Container | pricing_interaction_workflow
-Delivering Simulation Rule | edit_workflow
-Delivering Simulation Rule | rule_validation_workflow
+Delivery Simulation Rule | edit_workflow
+Delivery Simulation Rule | rule_validation_workflow
Delivery Cell | delivery_movement_causality_interaction_workflow
Delivery Cell | delivery_movement_simulation_interaction_workflow
Delivery Rule | edit_workflow
@@ -39,8 +39,8 @@
Inventory | inventory_workflow
Order Rule | edit_workflow
Order Rule | rule_validation_workflow
-Order Simulation Rule | edit_workflow
-Order Simulation Rule | rule_validation_workflow
+Order Root Simulation Rule | edit_workflow
+Order Root Simulation Rule | rule_validation_workflow
Payment Condition | edit_workflow
Purchase Order Cell | edit_workflow
Purchase Order Cell | order_movement_simulation_interaction_workflow
Removed: erp5/trunk/products/ERP5/Document/DeliveringSimulationRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/DeliveringSimulationRule.py?rev=32841&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/Document/DeliveringSimulationRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/DeliveringSimulationRule.py (removed)
@@ -1,71 +1,0 @@
-##############################################################################
-#
-# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-##############################################################################
-
-from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions
-from Products.ERP5.Document.Rule import Rule
-
-class DeliveringSimulationRule(Rule):
- """
- Delivering Simulation Rule expand simulation created by a order or delivery rule.
- """
-
- # CMF Type Definition
- meta_type = 'ERP5 Delivering Simulation Rule'
- portal_type = 'Delivering Simulation Rule'
- add_permission = Permissions.AddPortalContent
-
- # Declarative security
- security = ClassSecurityInfo()
- security.declareObjectProtected(Permissions.AccessContentsInformation)
-
- security.declareProtected(Permissions.AccessContentsInformation,
- 'isAccountable')
- def isAccountable(self, movement):
- """
- Tells whether generated movement needs to be accounted or not.
-
- Invoice movement are never accountable, so simulation movement for
- invoice movements should not be accountable either.
- """
- return 0
-
- security.declareProtected(Permissions.ModifyPortalContent, 'expand')
- def expand(self, applied_rule, force=0, **kw):
- """
- Expands the rule:
- - generate a list of previsions
- - compare the prevision with existing children
- - get the list of existing movements (immutable, mutable, deletable)
- - compute the difference between prevision and existing (add,
- modify, remove)
- - add/modify/remove child movements to match prevision
- """
- return Rule._expand(self, applied_rule, force=force, **kw)
-
- def isDeliverable(self, movement):
- return movement.getResource() is not None
Copied: erp5/trunk/products/ERP5/Document/DeliverySimulationRule.py (from r32839, erp5/trunk/products/ERP5/Document/DeliveringSimulationRule.py)
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/DeliverySimulationRule.py?p2=erp5/trunk/products/ERP5/Document/DeliverySimulationRule.py&p1=erp5/trunk/products/ERP5/Document/DeliveringSimulationRule.py&r1=32839&r2=32842&rev=32842&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/DeliveringSimulationRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/DeliverySimulationRule.py [utf8] Fri Feb 19 10:17:11 2010
@@ -29,14 +29,15 @@
from Products.ERP5Type import Permissions
from Products.ERP5.Document.Rule import Rule
-class DeliveringSimulationRule(Rule):
+class DeliverySimulationRule(Rule):
"""
- Delivering Simulation Rule expand simulation created by a order or delivery rule.
+ Delivery Simulation Rule expand simulation created by a order root
+ simulation rule or delivery root simulation rule.
"""
# CMF Type Definition
- meta_type = 'ERP5 Delivering Simulation Rule'
- portal_type = 'Delivering Simulation Rule'
+ meta_type = 'ERP5 Delivery Simulation Rule'
+ portal_type = 'Delivery Simulation Rule'
add_permission = Permissions.AddPortalContent
# Declarative security
Copied: erp5/trunk/products/ERP5/Document/OrderRootSimulationRule.py (from r32839, erp5/trunk/products/ERP5/Document/OrderSimulationRule.py)
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/OrderRootSimulationRule.py?p2=erp5/trunk/products/ERP5/Document/OrderRootSimulationRule.py&p1=erp5/trunk/products/ERP5/Document/OrderSimulationRule.py&r1=32839&r2=32842&rev=32842&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/OrderSimulationRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/OrderRootSimulationRule.py [utf8] Fri Feb 19 10:17:11 2010
@@ -32,7 +32,7 @@
from Products.ERP5.Document.OrderRule import OrderRule
from zLOG import LOG, WARNING
-class OrderSimulationRule(OrderRule):
+class OrderRootSimulationRule(OrderRule):
"""
Order Rule object make sure an Order in the simulation
is consistent with the real order
@@ -40,8 +40,8 @@
WARNING: what to do with movement split ?
"""
# CMF Type Definition
- meta_type = 'ERP5 Order Simulation Rule'
- portal_type = 'Order Simulation Rule'
+ meta_type = 'ERP5 Order Root Simulation Rule'
+ portal_type = 'Order Root Simulation Rule'
# Declarative security
security = ClassSecurityInfo()
Removed: erp5/trunk/products/ERP5/Document/OrderSimulationRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/OrderSimulationRule.py?rev=32841&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/Document/OrderSimulationRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/OrderSimulationRule.py (removed)
@@ -1,55 +1,0 @@
-##############################################################################
-#
-# Copyright (c) 2002, 2005 Nexedi SARL and Contributors. All Rights Reserved.
-# Jean-Paul Smets-Solanes <jp at nexedi.com>
-# Romain Courteaud <romain at nexedi.com>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-##############################################################################
-
-from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, interfaces
-from Products.ERP5.Document.OrderRule import OrderRule
-from zLOG import LOG, WARNING
-
-class OrderSimulationRule(OrderRule):
- """
- Order Rule object make sure an Order in the simulation
- is consistent with the real order
-
- WARNING: what to do with movement split ?
- """
- # CMF Type Definition
- meta_type = 'ERP5 Order Simulation Rule'
- portal_type = 'Order Simulation Rule'
-
- # Declarative security
- security = ClassSecurityInfo()
- security.declareObjectProtected(Permissions.AccessContentsInformation)
-
- def _getExpandablePropertyUpdateDict(self, applied_rule, movement,
- business_path, current_property_dict):
- """Order rule specific update dictionary"""
- return {
- 'delivery': movement.getRelativeUrl(),
- }
Copied: erp5/trunk/products/ERP5/Document/ProductionOrderModelRootSimulationRule.py (from r32839, erp5/trunk/products/ERP5/Document/ProductionOrderModelSimulationRule.py)
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/ProductionOrderModelRootSimulationRule.py?p2=erp5/trunk/products/ERP5/Document/ProductionOrderModelRootSimulationRule.py&p1=erp5/trunk/products/ERP5/Document/ProductionOrderModelSimulationRule.py&r1=32839&r2=32842&rev=32842&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/ProductionOrderModelSimulationRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/ProductionOrderModelRootSimulationRule.py [utf8] Fri Feb 19 10:17:11 2010
@@ -30,15 +30,15 @@
from Products.ERP5Type import Permissions, interfaces
from Products.ERP5.Document.ProductionOrderModelRule import ProductionOrderModelRule
-class ProductionOrderModelSimulationRule(ProductionOrderModelRule):
+class ProductionOrderModelRootSimulationRule(ProductionOrderModelRule):
"""
Prouction Order Model Simulation Rule object use a Supply Chain to expand a
Production Order.
"""
# CMF Type Definition
- meta_type = 'ERP5 Production Order Model SimulationRule'
- portal_type = 'Production Order Model SimulationRule'
+ meta_type = 'ERP5 Production Order Model Root Simulation Rule'
+ portal_type = 'Production Order Model Root Simulation Rule'
# Declarative security
security = ClassSecurityInfo()
Removed: erp5/trunk/products/ERP5/Document/ProductionOrderModelSimulationRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/ProductionOrderModelSimulationRule.py?rev=32841&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/Document/ProductionOrderModelSimulationRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/ProductionOrderModelSimulationRule.py (removed)
@@ -1,55 +1,0 @@
-##############################################################################
-#
-# Copyright (c) 2005 Nexedi SARL and Contributors. All Rights Reserved.
-# Romain Courteaud <romain at nexedi.com>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-##############################################################################
-
-from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, interfaces
-from Products.ERP5.Document.ProductionOrderModelRule import ProductionOrderModelRule
-
-class ProductionOrderModelSimulationRule(ProductionOrderModelRule):
- """
- Prouction Order Model Simulation Rule object use a Supply Chain to expand a
- Production Order.
- """
-
- # CMF Type Definition
- meta_type = 'ERP5 Production Order Model SimulationRule'
- portal_type = 'Production Order Model SimulationRule'
-
- # Declarative security
- security = ClassSecurityInfo()
- security.declareObjectProtected(Permissions.AccessContentsInformation)
-
- __implements = ( interfaces.IPredicate,
- interfaces.IRule )
-
- def _getExpandablePropertyUpdateDict(self, applied_rule, movement,
- business_path, current_property_dict):
- """Order rule specific update dictionary"""
- return {
- 'delivery': movement.getRelativeUrl(),
- }
Copied: erp5/trunk/products/ERP5/Document/ProductionOrderRootSimulationRule.py (from r32839, erp5/trunk/products/ERP5/Document/ProductionOrderSimulationRule.py)
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/ProductionOrderRootSimulationRule.py?p2=erp5/trunk/products/ERP5/Document/ProductionOrderRootSimulationRule.py&p1=erp5/trunk/products/ERP5/Document/ProductionOrderSimulationRule.py&r1=32839&r2=32842&rev=32842&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/ProductionOrderSimulationRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/ProductionOrderRootSimulationRule.py [utf8] Fri Feb 19 10:17:11 2010
@@ -30,15 +30,15 @@
from Products.ERP5Type import Permissions, interfaces
from Products.ERP5.Document.ProductionOrderRule import ProductionOrderRule
-class ProductionOrderSimulationRule(ProductionOrderRule):
+class ProductionOrderRootSimulationRule(ProductionOrderRule):
"""
Prouction Order Simulation Rule object use a Supply Chain to expand a
Production Order.
"""
# CMF Type Definition
- meta_type = 'ERP5 Production Order Simulation Rule'
- portal_type = 'Production Order Simulation Rule'
+ meta_type = 'ERP5 Production Order Root Simulation Rule'
+ portal_type = 'Production Order Root Simulation Rule'
# Declarative security
security = ClassSecurityInfo()
Removed: erp5/trunk/products/ERP5/Document/ProductionOrderSimulationRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/ProductionOrderSimulationRule.py?rev=32841&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/Document/ProductionOrderSimulationRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/ProductionOrderSimulationRule.py (removed)
@@ -1,55 +1,0 @@
-##############################################################################
-#
-# Copyright (c) 2005 Nexedi SARL and Contributors. All Rights Reserved.
-# Romain Courteaud <romain at nexedi.com>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-##############################################################################
-
-from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, interfaces
-from Products.ERP5.Document.ProductionOrderRule import ProductionOrderRule
-
-class ProductionOrderSimulationRule(ProductionOrderRule):
- """
- Prouction Order Simulation Rule object use a Supply Chain to expand a
- Production Order.
- """
-
- # CMF Type Definition
- meta_type = 'ERP5 Production Order Simulation Rule'
- portal_type = 'Production Order Simulation Rule'
-
- # Declarative security
- security = ClassSecurityInfo()
- security.declareObjectProtected(Permissions.AccessContentsInformation)
-
- __implements = ( interfaces.IPredicate,
- interfaces.IRule )
-
- def _getExpandablePropertyUpdateDict(self, applied_rule, movement,
- business_path, current_property_dict):
- """Order rule specific update dictionary"""
- return {
- 'delivery': movement.getRelativeUrl(),
- }
More information about the Erp5-report
mailing list