[Erp5-report] r32887 kazuhiko - in /erp5/trunk/bt5: erp5_project/SkinTemplateItem/portal_sk...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Feb 22 03:29:42 CET 2010
Author: kazuhiko
Date: Mon Feb 22 03:29:42 2010
New Revision: 32887
URL: http://svn.erp5.org?rev=32887&view=rev
Log:
add default_delivery_root_simulation_rule, and modify select methods to support it.
Added:
erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule/
- copied from r32882, erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule/
erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule.xml
- copied, changed from r32882, erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule.xml
erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_root_simulation_rule/
- copied from r32882, erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_simulation_rule/
erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_root_simulation_rule.xml
- copied, changed from r32882, erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_simulation_rule.xml
Removed:
erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_simulation_rule/
erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_simulation_rule.xml
Modified:
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/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/bt/revision
erp5/trunk/bt5/erp5_trade/bt/template_path_list
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=32887&r1=32886&r2=32887&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] Mon Feb 22 03:29:42 2010
@@ -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
Modified: erp5/trunk/bt5/erp5_project/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/bt/revision?rev=32887&r1=32886&r2=32887&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/bt/revision [utf8] Mon Feb 22 03:29:42 2010
@@ -1,1 +1,1 @@
-734
+735
Copied: erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule.xml (from r32882, erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule.xml?p2=erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule.xml&p1=erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule.xml&r1=32882&r2=32887&rev=32887&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_root_simulation_rule.xml [utf8] Mon Feb 22 03:29:42 2010
@@ -3,7 +3,7 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="DeliveryRule" module="Products.ERP5Type.Document.DeliveryRule"/>
+ <global name="DeliveryRootSimulationRule" module="Products.ERP5Type.Document.DeliveryRootSimulationRule"/>
<tuple/>
</tuple>
</pickle>
@@ -82,7 +82,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>default_delivery_rule</string> </value>
+ <value> <string>default_delivery_root_simulation_rule</string> </value>
</item>
<item>
<key> <string>matching_property</string> </key>
@@ -94,7 +94,7 @@
</item>
<item>
<key> <string>portal_type</string> </key>
- <value> <string>Delivery Rule</string> </value>
+ <value> <string>Delivery Root Simulation Rule</string> </value>
</item>
<item>
<key> <string>test_method_id</string> </key>
@@ -104,7 +104,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Default Delivery Rule</string> </value>
+ <value> <string>Default Delivery Root Simulation Rule</string> </value>
</item>
<item>
<key> <string>version</string> </key>
Copied: erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_root_simulation_rule.xml (from r32882, erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_simulation_rule.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_root_simulation_rule.xml?p2=erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_root_simulation_rule.xml&p1=erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_simulation_rule.xml&r1=32882&r2=32887&rev=32887&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_simulation_rule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_root_simulation_rule.xml [utf8] Mon Feb 22 03:29:42 2010
@@ -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>
Removed: erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_simulation_rule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_simulation_rule.xml?rev=32886&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_simulation_rule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_simulation_rule.xml (removed)
@@ -1,159 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="OrderRootSimulationRule" module="Products.ERP5Type.Document.OrderRootSimulationRule"/>
- <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>
- <item>
- <key> <string>start_date</string> </key>
- <value>
- <tuple>
- <none/>
- <none/>
- </tuple>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_tree</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>categories</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>default_reference</string> </key>
- <value> <string>default_order_rule</string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>expandable_property</string> </key>
- <value>
- <tuple>
- <string>aggregate_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_order_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>Order 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 Order Root Simulation Rule</string> </value>
- </item>
- <item>
- <key> <string>version</string> </key>
- <value> <string>2</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>
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=32887&r1=32886&r2=32887&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] Mon Feb 22 03:29:42 2010
@@ -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
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=32887&r1=32886&r2=32887&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] Mon Feb 22 03:29:42 2010
@@ -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
Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=32887&r1=32886&r2=32887&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Mon Feb 22 03:29:42 2010
@@ -1,1 +1,1 @@
-842
+843
Modified: erp5/trunk/bt5/erp5_trade/bt/template_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/template_path_list?rev=32887&r1=32886&r2=32887&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/template_path_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/template_path_list [utf8] Mon Feb 22 03:29:42 2010
@@ -5,9 +5,11 @@
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/**
+portal_rules/default_order_root_simulation_rule
+portal_rules/default_order_root_simulation_rule/**
More information about the Erp5-report
mailing list