[Erp5-report] r27851 - in /erp5/trunk/bt5/erp5_invoicing: SkinTemplateItem/portal_skins/erp...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Jul 1 15:50:07 CEST 2009
Author: luke
Date: Wed Jul 1 15:50:03 2009
New Revision: 27851
URL: http://svn.erp5.org?rev=27851&view=rev
Log:
- to avoid code duplication use common script
Added:
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectInvoiceMovement.xml
Modified:
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/PurchaseInvoiceTransaction_selectInvoiceMovement.xml
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SaleInvoiceTransaction_selectInvoiceMovement.xml
erp5/trunk/bt5/erp5_invoicing/bt/revision
Added: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectInvoiceMovement.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectInvoiceMovement.xml?rev=27851&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectInvoiceMovement.xml (added)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectInvoiceMovement.xml [utf8] Wed Jul 1 15:50:03 2009
@@ -1,0 +1,156 @@
+<?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>kw[\'parent_specialise_portal_type\'] = \'Invoice Transaction Rule\'\n
+if context.Invoice_isAdvanced():\n
+ kw[\'explanation_portal_type\'] = [\'%s Order\' % trade_type,\n
+ \'%s Invoice\' % trade_type,\n
+ \'%s Packing List\' % trade_type]\n
+else:\n
+ kw[\'explanation_portal_type\'] = [\'%s Order\' % trade_type,\n
+ \'%s Invoice Transaction\' % trade_type,\n
+ \'%s Packing List\' % trade_type]\n
+kw[\'portal_type\'] = \'Simulation Movement\'\n
+kw[\'grand_parent_simulation_state\'] = [\'started\']\n
+\n
+kw.update(context.portal_catalog.buildSQLQuery(**kw))\n
+\n
+movement_list = [] \n
+for movement in context.InvoiceTransaction_zSelectMovement(**kw) :\n
+ movement = movement.getObject()\n
+ if movement.getDeliveryValue() is None :\n
+ movement_list.append(movement)\n
+ else :\n
+ from Products.ERP5Type.Log import log\n
+ log(script.getId(), "simulation movement %s should not have been selected !" % movement.getPath())\n
+\n
+return movement_list\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>trade_type, **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>trade_type</string>
+ <string>kw</string>
+ <string>_write_</string>
+ <string>_getattr_</string>
+ <string>context</string>
+ <string>_apply_</string>
+ <string>movement_list</string>
+ <string>_getiter_</string>
+ <string>movement</string>
+ <string>None</string>
+ <string>Products.ERP5Type.Log</string>
+ <string>log</string>
+ <string>script</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_selectInvoiceMovement</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/PurchaseInvoiceTransaction_selectInvoiceMovement.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/PurchaseInvoiceTransaction_selectInvoiceMovement.xml?rev=27851&r1=27850&r2=27851&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/PurchaseInvoiceTransaction_selectInvoiceMovement.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/PurchaseInvoiceTransaction_selectInvoiceMovement.xml [utf8] Wed Jul 1 15:50:03 2009
@@ -53,26 +53,7 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>kw[\'parent_specialise_portal_type\'] = \'Invoice Transaction Rule\'\n
-if context.Invoice_isAdvanced():\n
- kw[\'explanation_portal_type\'] = [\'Purchase Order\', \'Purchase Invoice\', \'Purchase Packing List\']\n
-else:\n
- kw[\'explanation_portal_type\'] = [\'Purchase Order\', \'Purchase Invoice Transaction\', \'Purchase Packing List\']\n
-kw[\'portal_type\'] = \'Simulation Movement\'\n
-kw[\'grand_parent_simulation_state\'] = [\'started\']\n
-\n
-kw.update(context.portal_catalog.buildSQLQuery(**kw))\n
-\n
-movement_list = [] \n
-for movement in context.InvoiceTransaction_zSelectMovement(**kw) :\n
- movement = movement.getObject()\n
- if movement.getDeliveryValue() is None :\n
- movement_list.append(movement)\n
- else :\n
- from Products.ERP5Type.Log import log\n
- log(script.getId(), "simulation movement %s should not have been selected !" % movement.getPath())\n
-\n
-return movement_list\n
+ <value> <string>return context.InvoiceTransaction_selectInvoiceMovement(trade_type=\'Purchase\', **kw)\n
</string> </value>
</item>
<item>
@@ -110,17 +91,9 @@
<value>
<tuple>
<string>kw</string>
- <string>_write_</string>
+ <string>_apply_</string>
<string>_getattr_</string>
<string>context</string>
- <string>_apply_</string>
- <string>movement_list</string>
- <string>_getiter_</string>
- <string>movement</string>
- <string>None</string>
- <string>Products.ERP5Type.Log</string>
- <string>log</string>
- <string>script</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SaleInvoiceTransaction_selectInvoiceMovement.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SaleInvoiceTransaction_selectInvoiceMovement.xml?rev=27851&r1=27850&r2=27851&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SaleInvoiceTransaction_selectInvoiceMovement.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SaleInvoiceTransaction_selectInvoiceMovement.xml [utf8] Wed Jul 1 15:50:03 2009
@@ -53,26 +53,7 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>kw[\'parent_specialise_portal_type\'] = \'Invoice Transaction Rule\'\n
-if context.Invoice_isAdvanced():\n
- kw[\'explanation_portal_type\'] = [\'Sale Order\', \'Sale Invoice\', \'Sale Packing List\']\n
-else:\n
- kw[\'explanation_portal_type\'] = [\'Sale Order\', \'Sale Invoice Transaction\', \'Sale Packing List\']\n
-kw[\'portal_type\'] = \'Simulation Movement\'\n
-kw[\'grand_parent_simulation_state\'] = [\'started\']\n
-\n
-kw.update(context.portal_catalog.buildSQLQuery(**kw))\n
-\n
-movement_list = [] \n
-for movement in context.InvoiceTransaction_zSelectMovement(**kw) :\n
- movement = movement.getObject()\n
- if movement.getDeliveryValue() is None :\n
- movement_list.append(movement)\n
- else :\n
- from Products.ERP5Type.Log import log\n
- log(script.getId(), "simulation movement %s should not have been selected !" % movement.getPath())\n
-\n
-return movement_list\n
+ <value> <string>return context.InvoiceTransaction_selectInvoiceMovement(trade_type=\'Sale\', **kw)\n
</string> </value>
</item>
<item>
@@ -110,17 +91,9 @@
<value>
<tuple>
<string>kw</string>
- <string>_write_</string>
+ <string>_apply_</string>
<string>_getattr_</string>
<string>context</string>
- <string>_apply_</string>
- <string>movement_list</string>
- <string>_getiter_</string>
- <string>movement</string>
- <string>None</string>
- <string>Products.ERP5Type.Log</string>
- <string>log</string>
- <string>script</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/revision?rev=27851&r1=27850&r2=27851&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] Wed Jul 1 15:50:03 2009
@@ -1,1 +1,1 @@
-249
+250
More information about the Erp5-report
mailing list