[Erp5-report] r27849 - in /erp5/trunk/bt5: erp5_bpm/SkinTemplateItem/portal_skins/erp5_bpm/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Jul 1 14:40:00 CEST 2009
Author: luke
Date: Wed Jul 1 14:39:55 2009
New Revision: 27849
URL: http://svn.erp5.org?rev=27849&view=rev
Log:
- move functionality of selecting invoice transactions by Trade Model Rule's Simulation Movements
Removed:
erp5/trunk/bt5/erp5_bpm/SkinTemplateItem/portal_skins/erp5_bpm/InvoiceTransaction_selectDelivery.xml
Modified:
erp5/trunk/bt5/erp5_bpm/bt/revision
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectDelivery.xml
erp5/trunk/bt5/erp5_invoicing/bt/revision
Removed: erp5/trunk/bt5/erp5_bpm/SkinTemplateItem/portal_skins/erp5_bpm/InvoiceTransaction_selectDelivery.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_bpm/SkinTemplateItem/portal_skins/erp5_bpm/InvoiceTransaction_selectDelivery.xml?rev=27848&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_bpm/SkinTemplateItem/portal_skins/erp5_bpm/InvoiceTransaction_selectDelivery.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_bpm/SkinTemplateItem/portal_skins/erp5_bpm/InvoiceTransaction_selectDelivery.xml (removed)
@@ -1,172 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>Script_magic</string> </key>
- <value> <int>3</int> </value>
- </item>
- <item>
- <key> <string>_bind_names</string> </key>
- <value>
- <object>
- <klass>
- <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_asgns</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>name_container</string> </key>
- <value> <string>container</string> </value>
- </item>
- <item>
- <key> <string>name_context</string> </key>
- <value> <string>context</string> </value>
- </item>
- <item>
- <key> <string>name_m_self</string> </key>
- <value> <string>script</string> </value>
- </item>
- <item>
- <key> <string>name_subpath</string> </key>
- <value> <string>traverse_subpath</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>_body</string> </key>
- <value> <string>#\n
-# This method is used by the invoice_transaction_builder\n
-# delivery builder to select the Invoice Transaction \n
-# in which creating new Invoice Transaction Lines.\n
-#\n
-\n
-deliveries_keys = {}\n
-for movement in movement_list:\n
- ar = movement.getParentValue()\n
- line = None\n
-\n
- # case of tax movement \n
- if ar.getSpecialiseValue().getPortalType() == \'Tax Rule\':\n
- for other_rule in ar.getParentValue().contentValues():\n
- if other_rule == ar:\n
- continue\n
- for sm in other_rule.contentValues():\n
- line = sm.getDeliveryValue()\n
-\n
- # case of trade model movement\n
- if ar.getParentValue().getParentValue().getSpecialiseValue().getPortalType() == \'Trade Model Rule\':\n
- tm_related_movement = ar.getParentValue().getParentValue().getParentValue()\n
- line = tm_related_movement.getDeliveryValue()\n
-\n
- # in case of invoice rule (ie. starting from Invoice)\n
- if line is None:\n
- line = ar.getParentValue().getOrderValue()\n
-\n
- # in case of invoicing rule (ie. starting from Order)\n
- if line is None:\n
- line = movement.getParentValue().getParentValue().getDeliveryValue()\n
-\n
- deliveries_keys[line.getExplanationValue()] = 1\n
-\n
-return filter(lambda x : x is not None, deliveries_keys.keys())\n
-</string> </value>
- </item>
- <item>
- <key> <string>_code</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>_params</string> </key>
- <value> <string>movement_list, **kw</string> </value>
- </item>
- <item>
- <key> <string>errors</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>func_code</string> </key>
- <value>
- <object>
- <klass>
- <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>co_argcount</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>co_varnames</string> </key>
- <value>
- <tuple>
- <string>movement_list</string>
- <string>kw</string>
- <string>deliveries_keys</string>
- <string>_getiter_</string>
- <string>movement</string>
- <string>_getattr_</string>
- <string>ar</string>
- <string>None</string>
- <string>line</string>
- <string>other_rule</string>
- <string>sm</string>
- <string>tm_related_movement</string>
- <string>_write_</string>
- <string>filter</string>
- </tuple>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>func_defaults</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>InvoiceTransaction_selectDelivery</string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>warnings</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Modified: erp5/trunk/bt5/erp5_bpm/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_bpm/bt/revision?rev=27849&r1=27848&r2=27849&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_bpm/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_bpm/bt/revision [utf8] Wed Jul 1 14:39:55 2009
@@ -1,1 +1,1 @@
-196
+197
Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectDelivery.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectDelivery.xml?rev=27849&r1=27848&r2=27849&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectDelivery.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectDelivery.xml [utf8] Wed Jul 1 14:39:55 2009
@@ -71,6 +71,10 @@
continue\n
for sm in other_rule.contentValues():\n
line = sm.getDeliveryValue()\n
+\n
+ # case of trade model movement\n
+ if ar.getParentValue().getParentValue().getSpecialiseValue().getPortalType() == \'Trade Model Rule\':\n
+ line = ar.getParentValue().getParentValue().getParentValue().getDeliveryValue()\n
\n
# in case of invoice rule (ie. starting from Invoice)\n
if line is None:\n
Modified: erp5/trunk/bt5/erp5_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/revision?rev=27849&r1=27848&r2=27849&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] Wed Jul 1 14:39:55 2009
@@ -1,1 +1,1 @@
-248
+249
More information about the Erp5-report
mailing list