[Erp5-report] r23830 - in /erp5/trunk/bt5/erp5_invoicing: SkinTemplateItem/portal_skins/erp...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Sep 25 23:20:50 CEST 2008
Author: rafael
Date: Thu Sep 25 23:20:50 2008
New Revision: 23830
URL: http://svn.erp5.org?rev=23830&view=rev
Log:
- Base.log is deprecated, replaced by ERP5Type.Log.log
- Remove DEBUG entries
Modified:
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postTransactionLineGeneration.xml
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/PurchaseInvoiceTransaction_selectInvoiceMovement.xml
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/PurchaseInvoiceTransaction_selectPackingListMovement.xml
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SaleInvoiceTransaction_selectInvoiceMovement.xml
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SaleInvoiceTransaction_selectPackingListMovement.xml
erp5/trunk/bt5/erp5_invoicing/bt/revision
Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml?rev=23830&r1=23829&r2=23830&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml Thu Sep 25 23:20:50 2008
@@ -71,8 +71,8 @@
# Return Message object, so that this message will be translated when it is rendered later.\n
\n
invoice = context\n
-\n
-LOG = lambda msg:context.log(\n
+from Products.ERP5Type.Log import log\n
+LOG = lambda msg:log(\n
"InvoiceTransaction_postGenerationActivity on %s" % (invoice.getPath()), msg)\n
\n
# set the causality relation \n
@@ -174,6 +174,8 @@
<string>Exception</string>
<string>context</string>
<string>invoice</string>
+ <string>Products.ERP5Type.Log</string>
+ <string>log</string>
<string>LOG</string>
<string>_getattr_</string>
<string>related_packing_list</string>
Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postTransactionLineGeneration.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postTransactionLineGeneration.xml?rev=23830&r1=23829&r2=23830&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postTransactionLineGeneration.xml (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postTransactionLineGeneration.xml Thu Sep 25 23:20:50 2008
@@ -58,8 +58,8 @@
# after the sale_invoice_transaction_builder delivery builder\n
# created Sale Invoice Transaction Line\n
# \n
-\n
-LOG = lambda msg:context.log(\n
+from Products.ERP5Type.Log import log\n
+LOG = lambda msg:log(\n
"SaleInvoiceTransaction_postTransactionLineGeneration", msg)\n
\n
sale_invoice = context\n
@@ -134,6 +134,8 @@
<value>
<tuple>
<string>kw</string>
+ <string>Products.ERP5Type.Log</string>
+ <string>log</string>
<string>LOG</string>
<string>context</string>
<string>sale_invoice</string>
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=23830&r1=23829&r2=23830&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/PurchaseInvoiceTransaction_selectInvoiceMovement.xml (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/PurchaseInvoiceTransaction_selectInvoiceMovement.xml Thu Sep 25 23:20:50 2008
@@ -53,29 +53,21 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>DEBUG = 1\n
-LOG = lambda msg:context.log(script.getId(), msg)\n
-\n
-kw[\'parent_specialise_portal_type\'] = \'Invoice Transaction Rule\'\n
+ <value> <string>kw[\'parent_specialise_portal_type\'] = \'Invoice Transaction Rule\'\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
-if DEBUG :\n
- LOG("SQL used = %s"%context.InvoiceTransaction_zSelectMovement(src__=1, **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
- LOG("simulation movement %s should not have been selected !" % movement.getPath())\n
-\n
-if DEBUG :\n
- LOG("selected movement_list : %s"%movement_list)\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>
@@ -115,8 +107,6 @@
<value>
<tuple>
<string>kw</string>
- <string>DEBUG</string>
- <string>LOG</string>
<string>_write_</string>
<string>_getattr_</string>
<string>_apply_</string>
@@ -125,6 +115,9 @@
<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/PurchaseInvoiceTransaction_selectPackingListMovement.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/PurchaseInvoiceTransaction_selectPackingListMovement.xml?rev=23830&r1=23829&r2=23830&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/PurchaseInvoiceTransaction_selectPackingListMovement.xml (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/PurchaseInvoiceTransaction_selectPackingListMovement.xml Thu Sep 25 23:20:50 2008
@@ -53,18 +53,12 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>DEBUG = 1\n
-LOG = lambda msg:context.log(script.getId(), msg)\n
-\n
-kw[\'parent_specialise_portal_type\'] = \'Invoicing Rule\'\n
+ <value> <string>kw[\'parent_specialise_portal_type\'] = \'Invoicing Rule\'\n
kw[\'explanation_portal_type\'] = [\'Purchase Order\', \'Purchase Packing List\']\n
kw[\'portal_type\'] = \'Simulation Movement\'\n
kw[\'grand_parent_simulation_state\'] = [\'started\', \'stopped\',\'delivered\']\n
\n
kw.update(context.portal_catalog.buildSQLQuery(**kw))\n
-\n
-if DEBUG : \n
- LOG("SQL used = %s"%context.InvoiceTransaction_zSelectMovement(src__=1, **kw))\n
\n
movement_list = [] \n
for movement in context.InvoiceTransaction_zSelectMovement(**kw) :\n
@@ -72,10 +66,8 @@
if movement.getDeliveryValue() is None :\n
movement_list.append(movement)\n
else : \n
- LOG("simulation movement %s should not have been selected !" % movement.getPath())\n
-\n
-if DEBUG :\n
- LOG("selected movement_list : %s"%movement_list)\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>
@@ -115,8 +107,6 @@
<value>
<tuple>
<string>kw</string>
- <string>DEBUG</string>
- <string>LOG</string>
<string>_write_</string>
<string>_getattr_</string>
<string>_apply_</string>
@@ -125,6 +115,9 @@
<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=23830&r1=23829&r2=23830&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SaleInvoiceTransaction_selectInvoiceMovement.xml (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SaleInvoiceTransaction_selectInvoiceMovement.xml Thu Sep 25 23:20:50 2008
@@ -53,29 +53,21 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>DEBUG = 1\n
-LOG = lambda msg:context.log("SaleInvoice_selectMovement", msg)\n
-\n
-kw[\'parent_specialise_portal_type\'] = \'Invoice Transaction Rule\'\n
+ <value> <string>kw[\'parent_specialise_portal_type\'] = \'Invoice Transaction Rule\'\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
-if DEBUG :\n
- LOG("SQL used = %s"%context.InvoiceTransaction_zSelectMovement(src__=1, **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
- LOG("simulation movement %s should not have been selected !" % movement.getPath())\n
-\n
-if DEBUG :\n
- LOG("selected movement_list : %s"%movement_list)\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>
@@ -115,8 +107,6 @@
<value>
<tuple>
<string>kw</string>
- <string>DEBUG</string>
- <string>LOG</string>
<string>_write_</string>
<string>_getattr_</string>
<string>_apply_</string>
@@ -125,6 +115,9 @@
<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_selectPackingListMovement.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SaleInvoiceTransaction_selectPackingListMovement.xml?rev=23830&r1=23829&r2=23830&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SaleInvoiceTransaction_selectPackingListMovement.xml (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SaleInvoiceTransaction_selectPackingListMovement.xml Thu Sep 25 23:20:50 2008
@@ -53,29 +53,22 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>DEBUG = 1\n
-LOG = lambda msg:context.log("SaleInvoice_selectPackingListMovement", msg)\n
-\n
-kw[\'parent_specialise_portal_type\'] = \'Invoicing Rule\'\n
+ <value> <string>kw[\'parent_specialise_portal_type\'] = \'Invoicing Rule\'\n
kw[\'explanation_portal_type\'] = [\'Sale Order\', \'Sale Packing List\']\n
kw[\'portal_type\'] = \'Simulation Movement\'\n
kw[\'grand_parent_simulation_state\'] = [\'started\', \'stopped\',\'delivered\']\n
\n
kw.update(context.portal_catalog.buildSQLQuery(**kw))\n
\n
-if DEBUG : \n
- LOG("SQL used = %s"%context.InvoiceTransaction_zSelectMovement(src__=1, **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
- LOG("simulation movement %s should not have been selected !" % movement.getPath())\n
-\n
-if DEBUG :\n
- LOG("selected movement_list : %s"%movement_list)\n
+ else :\n
+ from Products.ERP5Type.Log import log\n
+ log("SaleInvoice_selectPackingListMovement", \\\n
+ "simulation movement %s should not have been selected !" % movement.getPath())\n
\n
return movement_list\n
</string> </value>
@@ -115,8 +108,6 @@
<value>
<tuple>
<string>kw</string>
- <string>DEBUG</string>
- <string>LOG</string>
<string>_write_</string>
<string>_getattr_</string>
<string>_apply_</string>
@@ -125,6 +116,8 @@
<string>_getiter_</string>
<string>movement</string>
<string>None</string>
+ <string>Products.ERP5Type.Log</string>
+ <string>log</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=23830&r1=23829&r2=23830&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision Thu Sep 25 23:20:50 2008
@@ -1,1 +1,1 @@
-136
+138
More information about the Erp5-report
mailing list