[Erp5-report] r23651 - in /erp5/trunk/bt5/erp5_immobilisation: PathTemplateItem/portal_deli...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Sep 16 21:42:46 CEST 2008
Author: kazuhiko
Date: Tue Sep 16 21:42:46 2008
New Revision: 23651
URL: http://svn.erp5.org?rev=23651&view=rev
Log:
2008-09-16 Kazuhiko
* revise amortisation_transaction_builder using new API.
Added:
erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder/
erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder/category_movement_group_on_delivery.xml
erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder/category_movement_group_on_line.xml
erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder/property_movement_group_on_delivery.xml
erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder/quantity_sign_movement_group_on_line.xml
Modified:
erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder.xml
erp5/trunk/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_adoptPrevision.xml
erp5/trunk/bt5/erp5_immobilisation/bt/change_log
erp5/trunk/bt5/erp5_immobilisation/bt/revision
erp5/trunk/bt5/erp5_immobilisation/bt/template_path_list
Modified: erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder.xml?rev=23651&r1=23650&r2=23651&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder.xml (original)
+++ erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder.xml Tue Sep 16 21:42:46 2008
@@ -3,21 +3,12 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Type.Document.DeliveryBuilder</string>
- <string>DeliveryBuilder</string>
- </tuple>
- <none/>
+ <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
<item>
<key> <string>_count</string> </key>
<value>
@@ -28,12 +19,6 @@
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>_owner</string> </key>
- <value>
- <none/>
</value>
</item>
<item>
@@ -144,7 +129,7 @@
</item>
<item>
<key> <string>last_id</string> </key>
- <value> <string>1</string> </value>
+ <value> <string>0</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
@@ -164,36 +149,18 @@
<key> <string>title</string> </key>
<value> <string>Amortisation Transaction Builder</string> </value>
</item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <none/>
- </value>
- </item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
- <tuple>
- <tuple>
- <string>BTrees.Length</string>
- <string>Length</string>
- </tuple>
- <none/>
- </tuple>
+ <global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
- <tuple>
- <tuple>
- <string>BTrees.OOBTree</string>
- <string>OOBTree</string>
- </tuple>
- <none/>
- </tuple>
+ <global name="OOBTree" module="BTrees._OOBTree"/>
</pickle>
<pickle>
<none/>
@@ -201,13 +168,7 @@
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
- <tuple>
- <tuple>
- <string>BTrees.OOBTree</string>
- <string>OOBTree</string>
- </tuple>
- <none/>
- </tuple>
+ <global name="OOBTree" module="BTrees._OOBTree"/>
</pickle>
<pickle>
<none/>
Added: erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder/category_movement_group_on_delivery.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder/category_movement_group_on_delivery.xml?rev=23651&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder/category_movement_group_on_delivery.xml (added)
+++ erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder/category_movement_group_on_delivery.xml Tue Sep 16 21:42:46 2008
@@ -1,0 +1,50 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <string>divergence_scope/category</string>
+ <string>collect_order_group/delivery</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>category_movement_group_on_delivery</string> </value>
+ </item>
+ <item>
+ <key> <string>int_index</string> </key>
+ <value> <int>2</int> </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Category Movement Group</string> </value>
+ </item>
+ <item>
+ <key> <string>tested_property</string> </key>
+ <value>
+ <tuple>
+ <string>source_section</string>
+ <string>destination_section</string>
+ <string>resource</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>category_movement_group_on_delivery</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder/category_movement_group_on_line.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder/category_movement_group_on_line.xml?rev=23651&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder/category_movement_group_on_line.xml (added)
+++ erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder/category_movement_group_on_line.xml Tue Sep 16 21:42:46 2008
@@ -1,0 +1,49 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <string>divergence_scope/category</string>
+ <string>collect_order_group/line</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>category_movement_group_on_line</string> </value>
+ </item>
+ <item>
+ <key> <string>int_index</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Category Movement Group</string> </value>
+ </item>
+ <item>
+ <key> <string>tested_property</string> </key>
+ <value>
+ <tuple>
+ <string>source</string>
+ <string>destination</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>category_movement_group_on_line</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder/property_movement_group_on_delivery.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder/property_movement_group_on_delivery.xml?rev=23651&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder/property_movement_group_on_delivery.xml (added)
+++ erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder/property_movement_group_on_delivery.xml Tue Sep 16 21:42:46 2008
@@ -1,0 +1,49 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <string>divergence_scope/property</string>
+ <string>collect_order_group/delivery</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>property_movement_group_on_delivery</string> </value>
+ </item>
+ <item>
+ <key> <string>int_index</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Property Movement Group</string> </value>
+ </item>
+ <item>
+ <key> <string>tested_property</string> </key>
+ <value>
+ <tuple>
+ <string>start_date</string>
+ <string>stop_date</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>property_movement_group_on_delivery</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder/quantity_sign_movement_group_on_line.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder/quantity_sign_movement_group_on_line.xml?rev=23651&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder/quantity_sign_movement_group_on_line.xml (added)
+++ erp5/trunk/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder/quantity_sign_movement_group_on_line.xml Tue Sep 16 21:42:46 2008
@@ -1,0 +1,39 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="QuantitySignMovementGroup" module="Products.ERP5Type.Document.QuantitySignMovementGroup"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <string>collect_order_group/line</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>quantity_sign_movement_group_on_line</string> </value>
+ </item>
+ <item>
+ <key> <string>int_index</string> </key>
+ <value> <int>2</int> </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Quantity Sign Movement Group</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>quantity_sign_movement_group_on_line</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_adoptPrevision.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_adoptPrevision.xml?rev=23651&r1=23650&r2=23651&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_adoptPrevision.xml (original)
+++ erp5/trunk/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_adoptPrevision.xml Tue Sep 16 21:42:46 2008
@@ -10,20 +10,8 @@
<pickle>
<dictionary>
<item>
- <key> <string>Python_magic</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
- </item>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
@@ -69,34 +57,28 @@
\n
# Set relative simulation movements profit_quantity to 0\n
movement_list = transaction.getMovementList()\n
+all_simulation_movement_path_list = []\n
for movement in movement_list:\n
simulation_movement_list = movement.getDeliveryRelatedValueList(portal_type=\'Simulation Movement\')\n
for simulation_movement in simulation_movement_list:\n
simulation_movement.edit(profit_quantity=0)\n
+ all_simulation_movement_path_list.extend([x.getPath() for x in simulation_movement_list])\n
\n
# Update from simulation, then adapt causality value\n
builder = transaction.portal_deliveries.amortisation_transaction_builder\n
builder.updateFromSimulation(transaction.getRelativeUrl())\n
-transaction.AmortisationTransaction_afterBuild()\n
+tag = \'%s_afterBuild\' % transaction.getRelativeUrl()\n
+transaction.activate(tag=tag,\n
+ after_path_and_method_id=(\n
+ all_simulation_movement_path_list,\n
+ (\'immediateReindexObject\', \'recursiveImmediateReindexObject\'))).AmortisationTransaction_afterBuild()\n
\n
# Automatic workflow\n
-transaction.activate().updateCausalityState()\n
+transaction.activate(after_tag=tag).updateCausalityState()\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>_filepath</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>_owner</string> </key>
<value>
<none/>
</value>
@@ -134,11 +116,16 @@
<string>transaction</string>
<string>_getattr_</string>
<string>movement_list</string>
+ <string>all_simulation_movement_path_list</string>
<string>_getiter_</string>
<string>movement</string>
<string>simulation_movement_list</string>
<string>simulation_movement</string>
+ <string>append</string>
+ <string>$append0</string>
+ <string>x</string>
<string>builder</string>
+ <string>tag</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_immobilisation/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_immobilisation/bt/change_log?rev=23651&r1=23650&r2=23651&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_immobilisation/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_immobilisation/bt/change_log Tue Sep 16 21:42:46 2008
@@ -1,3 +1,6 @@
+2008-09-16 Kazuhiko
+* revise amortisation_transaction_builder using new API.
+
2008-08-28 yusei
* Use Base_translateString or translateString instead of N_ for translation message.
Modified: erp5/trunk/bt5/erp5_immobilisation/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_immobilisation/bt/revision?rev=23651&r1=23650&r2=23651&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_immobilisation/bt/revision (original)
+++ erp5/trunk/bt5/erp5_immobilisation/bt/revision Tue Sep 16 21:42:46 2008
@@ -1,1 +1,1 @@
-149
+150
Modified: erp5/trunk/bt5/erp5_immobilisation/bt/template_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_immobilisation/bt/template_path_list?rev=23651&r1=23650&r2=23651&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_immobilisation/bt/template_path_list (original)
+++ erp5/trunk/bt5/erp5_immobilisation/bt/template_path_list Tue Sep 16 21:42:46 2008
@@ -1,3 +1,4 @@
portal_deliveries/amortisation_transaction_builder
+portal_deliveries/amortisation_transaction_builder/**
portal_rules/default_amortisation_rule
portal_rules/default_amortisation_rule/**
More information about the Erp5-report
mailing list