[Erp5-report] r32818 kazuhiko - in /erp5/trunk/bt5/erp5_invoicing: PathTemplateItem/portal_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Feb 19 04:06:04 CET 2010
Author: kazuhiko
Date: Fri Feb 19 04:06:02 2010
New Revision: 32818
URL: http://svn.erp5.org?rev=32818&view=rev
Log:
use DeliveryBuilder_selectPlannedDeliveryList as delivery select method for payment builder so that we can merge payment transactions.
Added:
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/DeliveryBuilder_selectPlannedDeliveryList.xml
Modified:
erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder.xml
erp5/trunk/bt5/erp5_invoicing/bt/revision
Modified: erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder.xml?rev=32818&r1=32817&r2=32818&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder.xml [utf8] Fri Feb 19 04:06:02 2010
@@ -93,6 +93,10 @@
<value> <string>Payment Transaction</string> </value>
</item>
<item>
+ <key> <string>delivery_select_method_id</string> </key>
+ <value> <string>DeliveryBuilder_selectPlannedDeliveryList</string> </value>
+ </item>
+ <item>
<key> <string>description</string> </key>
<value>
<none/>
Added: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/DeliveryBuilder_selectPlannedDeliveryList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/DeliveryBuilder_selectPlannedDeliveryList.xml?rev=32818&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/DeliveryBuilder_selectPlannedDeliveryList.xml (added)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/DeliveryBuilder_selectPlannedDeliveryList.xml [utf8] Fri Feb 19 04:06:02 2010
@@ -1,0 +1,131 @@
+<?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>portal_type = context.getDeliveryPortalType()\n
+# make sure that the result of the simulation state is update to date, so check getSimulationState manually\n
+return [x.getObject() for x in context.portal_catalog(portal_type=portal_type,simulation_state=\'planned\') \n
+ if x.getObject().getSimulationState()==\'planned\']\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>**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>0</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>kw</string>
+ <string>_getattr_</string>
+ <string>context</string>
+ <string>portal_type</string>
+ <string>append</string>
+ <string>$append0</string>
+ <string>_getiter_</string>
+ <string>x</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>DeliveryBuilder_selectPlannedDeliveryList</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/revision?rev=32818&r1=32817&r2=32818&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] Fri Feb 19 04:06:02 2010
@@ -1,1 +1,1 @@
-333
+334
More information about the Erp5-report
mailing list