diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_selectMovement.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_selectMovement.xml index 8293ea1d20517f19f39b3c914231022d77339102..15d301ff46af85bf530a3ccf885bc339f7b00bf6 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_selectMovement.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_selectMovement.xml @@ -58,7 +58,7 @@ kw[\'query\'] = ComplexQuery(\n Query(portal_type=\'Simulation Movement\', explanation_portal_type=\'Task\'),\n ComplexQuery(\n - Query(parent_specialise_portal_type=[\'Order Rule\', \'Delivery Rule\'],\n + Query(parent_specialise_portal_type=[\'Order Rule\', \'Delivery Rule\', \'Delivery Root Simulation Rule\'],\n simulation_state=\'confirmed\'),\n Query(parent_specialise_portal_type=\'Delivery Simulation Rule\',\n grand_parent_simulation_state=\'confirmed\'),\n diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision index e8cbd7d8fc9e4b266b1f50d3c5d2d9d76b62c1a0..191829efad4f7b6293301a32fb61608624f07377 100644 --- a/bt5/erp5_project/bt/revision +++ b/bt5/erp5_project/bt/revision @@ -1 +1 @@ -734 \ No newline at end of file +735 \ No newline at end of file diff --git a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule.xml b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule.xml new file mode 100644 index 0000000000000000000000000000000000000000..cc6da8b74a0f97c8fc9282c885bbddc64c2ad1e0 --- /dev/null +++ b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule.xml @@ -0,0 +1,138 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="DeliveryRootSimulationRule" module="Products.ERP5Type.Document.DeliveryRootSimulationRule"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_count</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>_identity_criterion</string> </key> + <value> + <dictionary/> + </value> + </item> + <item> + <key> <string>_mt_index</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + <item> + <key> <string>_range_criterion</string> </key> + <value> + <dictionary/> + </value> + </item> + <item> + <key> <string>_tree</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>default_reference</string> </key> + <value> <string>default_delivery_rule</string> </value> + </item> + <item> + <key> <string>expandable_property</string> </key> + <value> + <tuple> + <string>aggregate_list</string> + <string>base_application_list</string> + <string>base_contribution_list</string> + <string>description</string> + <string>destination</string> + <string>destination_account</string> + <string>destination_administration</string> + <string>destination_decision</string> + <string>destination_function</string> + <string>destination_payment</string> + <string>destination_project</string> + <string>destination_section</string> + <string>incoterm</string> + <string>price</string> + <string>price_currency</string> + <string>quantity</string> + <string>quantity_unit</string> + <string>resource</string> + <string>source</string> + <string>source_account</string> + <string>source_administration</string> + <string>source_decision</string> + <string>source_function</string> + <string>source_payment</string> + <string>source_project</string> + <string>source_section</string> + <string>start_date</string> + <string>stop_date</string> + <string>variation_category_list</string> + <string>variation_property_dict</string> + </tuple> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>default_delivery_root_simulation_rule</string> </value> + </item> + <item> + <key> <string>matching_property</string> </key> + <value> + <tuple> + <string>delivery</string> + </tuple> + </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Delivery Root Simulation Rule</string> </value> + </item> + <item> + <key> <string>test_method_id</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Default Delivery Root Simulation Rule</string> </value> + </item> + <item> + <key> <string>version</string> </key> + <value> <string>1</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <global name="Length" module="BTrees.Length"/> + </pickle> + <pickle> <int>0</int> </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <global name="OOBTree" module="BTrees._OOBTree"/> + </pickle> + <pickle> + <none/> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> + <pickle> + <global name="OOBTree" module="BTrees._OOBTree"/> + </pickle> + <pickle> + <none/> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_simulation_rule/default_category_tester.xml b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_category_tester.xml similarity index 100% rename from bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_simulation_rule/default_category_tester.xml rename to bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_category_tester.xml diff --git a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_simulation_rule/default_property_tester.xml b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_property_tester.xml similarity index 100% rename from bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_simulation_rule/default_property_tester.xml rename to bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_property_tester.xml diff --git a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_quantity_tester.xml b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_quantity_tester.xml new file mode 100644 index 0000000000000000000000000000000000000000..fc509725a81014657120916e0e9737d5579479a2 --- /dev/null +++ b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/default_quantity_tester.xml @@ -0,0 +1,94 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_count</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>_mt_index</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + <item> + <key> <string>_tree</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>default_quantity_tester</string> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Quantity Divergence Tester</string> </value> + </item> + <item> + <key> <string>property_tester</string> </key> + <value> <string>quantity</string> </value> + </item> + <item> + <key> <string>solver</string> </key> + <value> + <tuple> + <string>SplitAndDefer</string> + <string>CopyToTarget</string> + </tuple> + </value> + </item> + <item> + <key> <string>solver_list</string> </key> + <value> + <tuple> + <string>Solver</string> + </tuple> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <global name="Length" module="BTrees.Length"/> + </pickle> + <pickle> <int>0</int> </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <global name="OOBTree" module="BTrees._OOBTree"/> + </pickle> + <pickle> + <none/> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> + <pickle> + <global name="OOBTree" module="BTrees._OOBTree"/> + </pickle> + <pickle> + <none/> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_simulation_rule.xml b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_root_simulation_rule.xml similarity index 98% rename from bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_simulation_rule.xml rename to bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_root_simulation_rule.xml index 169b54d663fb686f2ae1dbb33ea379173292008d..aaaec40fcb6cc8af21e5b33fbe510de6157360ea 100644 --- a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_simulation_rule.xml +++ b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_root_simulation_rule.xml @@ -103,7 +103,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>default_order_simulation_rule</string> </value> + <value> <string>default_order_root_simulation_rule</string> </value> </item> <item> <key> <string>matching_property</string> </key> diff --git a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_category_tester.xml b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_category_tester.xml new file mode 100644 index 0000000000000000000000000000000000000000..b28b001799d0e603180173c20d03583807ed9ca7 --- /dev/null +++ b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_category_tester.xml @@ -0,0 +1,106 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_count</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>_mt_index</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + <item> + <key> <string>_tree</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>default_category_tester</string> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Category Divergence Tester</string> </value> + </item> + <item> + <key> <string>solver</string> </key> + <value> + <tuple> + <string>CopyToTarget</string> + </tuple> + </value> + </item> + <item> + <key> <string>tested_property</string> </key> + <value> + <tuple> + <string>aggregate | Aggregate</string> + <string>destination | Destination</string> + <string>destination_account | Destination Account</string> + <string>destination_administration | Destination Administration</string> + <string>destination_decision | Destination Decision</string> + <string>destination_function | Destination Function</string> + <string>destination_payment | Destination Payment</string> + <string>destination_project | Destination Project</string> + <string>destination_section | Destination Section</string> + <string>resource | Resource</string> + <string>source | Source</string> + <string>source_account | Source Account</string> + <string>source_administration | Source Administration</string> + <string>source_decision | Source Decision</string> + <string>source_function | Source Function</string> + <string>source_payment | Source Payment</string> + <string>source_project | Source Project</string> + <string>source_section | Source Section</string> + </tuple> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <global name="Length" module="BTrees.Length"/> + </pickle> + <pickle> <int>0</int> </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <global name="OOBTree" module="BTrees._OOBTree"/> + </pickle> + <pickle> + <none/> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> + <pickle> + <global name="OOBTree" module="BTrees._OOBTree"/> + </pickle> + <pickle> + <none/> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_property_tester.xml b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_property_tester.xml new file mode 100644 index 0000000000000000000000000000000000000000..4b132baeb2693e2ea0690d1863275d50131467e6 --- /dev/null +++ b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_property_tester.xml @@ -0,0 +1,115 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="PropertyDivergenceTester" module="Products.ERP5Type.Document.PropertyDivergenceTester"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_count</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>_local_properties</string> </key> + <value> + <tuple> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>tested_property_list</string> </value> + </item> + <item> + <key> <string>type</string> </key> + <value> <string>string</string> </value> + </item> + </dictionary> + </tuple> + </value> + </item> + <item> + <key> <string>_mt_index</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + <item> + <key> <string>_tree</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>default_property_tester</string> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Property Divergence Tester</string> </value> + </item> + <item> + <key> <string>solver</string> </key> + <value> + <tuple> + <string>CopyToTarget</string> + </tuple> + </value> + </item> + <item> + <key> <string>tested_property</string> </key> + <value> + <tuple> + <string>start_date | Start Date</string> + <string>stop_date | Stop Date</string> + </tuple> + </value> + </item> + <item> + <key> <string>tested_property_list</string> </key> + <value> + <tuple> + <string>aaa</string> + </tuple> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <global name="Length" module="BTrees.Length"/> + </pickle> + <pickle> <int>0</int> </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <global name="OOBTree" module="BTrees._OOBTree"/> + </pickle> + <pickle> + <none/> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> + <pickle> + <global name="OOBTree" module="BTrees._OOBTree"/> + </pickle> + <pickle> + <none/> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_simulation_rule/default_quantity_tester.xml b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_quantity_tester.xml similarity index 100% rename from bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_simulation_rule/default_quantity_tester.xml rename to bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_root_simulation_rule/default_quantity_tester.xml diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_selectMovement.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_selectMovement.xml index 9cb6336cd112790af0e29147099e3aacb961ae70..bbfda5684bddd7e610a583d515603b336cea831f 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_selectMovement.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_selectMovement.xml @@ -58,7 +58,7 @@ kw[\'query\'] = ComplexQuery(\n Query(portal_type=\'Simulation Movement\', explanation_portal_type=\'Purchase Order\'),\n ComplexQuery(\n - Query(parent_specialise_portal_type=[\'Order Rule\', \'Delivery Rule\'],\n + Query(parent_specialise_portal_type=[\'Order Rule\', \'Delivery Rule\', \'Delivery Root Simulation Rule\'],\n simulation_state=\'confirmed\'),\n Query(parent_specialise_portal_type=\'Delivery Simulation Rule\',\n grand_parent_simulation_state=\'confirmed\'),\n diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_selectMovement.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_selectMovement.xml index 36eb6029337cf795df9a5ef08ed4d8d1f48d79b3..1009c50e5ecc3c248097a72768915040f1a61fa1 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_selectMovement.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_selectMovement.xml @@ -58,7 +58,7 @@ kw[\'query\'] = ComplexQuery(\n Query(portal_type=\'Simulation Movement\', explanation_portal_type=\'Sale Order\'),\n ComplexQuery(\n - Query(parent_specialise_portal_type=[\'Order Rule\', \'Delivery Rule\'],\n + Query(parent_specialise_portal_type=[\'Order Rule\', \'Delivery Rule\', \'Delivery Root Simulation Rule\'],\n simulation_state=\'confirmed\'),\n Query(parent_specialise_portal_type=\'Delivery Simulation Rule\',\n grand_parent_simulation_state=\'confirmed\'),\n diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index 3f986b9191e0e52d248f98dfac53523d66f88067..6a34de5d27e1b7b3eae0e1bb1b38cad05ddadde9 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -842 \ No newline at end of file +843 \ No newline at end of file diff --git a/bt5/erp5_trade/bt/template_path_list b/bt5/erp5_trade/bt/template_path_list index 08e75cbd96b85b8ef6a6188ba8019e25d859117f..9bbcc8a1162920f928a52f3a19b2cad594291c1b 100644 --- a/bt5/erp5_trade/bt/template_path_list +++ b/bt5/erp5_trade/bt/template_path_list @@ -5,9 +5,11 @@ portal_deliveries/sale_packing_list_builder portal_deliveries/sale_packing_list_builder/** portal_rules/default_delivery_rule portal_rules/default_delivery_rule/** +portal_rules/default_delivery_root_simulation_rule +portal_rules/default_delivery_root_simulation_rule/** portal_rules/default_delivery_simulation_rule portal_rules/default_delivery_simulation_rule/** portal_rules/default_order_rule portal_rules/default_order_rule/** -portal_rules/default_order_simulation_rule -portal_rules/default_order_simulation_rule/** \ No newline at end of file +portal_rules/default_order_root_simulation_rule +portal_rules/default_order_root_simulation_rule/** \ No newline at end of file