[Erp5-report] r27670 - in /erp5/trunk/bt5/erp5_trade: WorkflowTemplateItem/portal_workflow/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Jun 19 04:24:38 CEST 2009
Author: tatuya
Date: Fri Jun 19 04:24:35 2009
New Revision: 27670
URL: http://svn.erp5.org?rev=27670&view=rev
Log:
2009-06-19 tatuya
* Fix workflow scripts to enable to create Sale Invoices and Purchase Invoices when using erp5_advanced_invoicing
Modified:
erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PurchasePackingList_buildInvoice.xml
erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/SalePackingList_buildInvoice.xml
erp5/trunk/bt5/erp5_trade/bt/change_log
erp5/trunk/bt5/erp5_trade/bt/revision
Modified: erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PurchasePackingList_buildInvoice.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PurchasePackingList_buildInvoice.xml?rev=27670&r1=27669&r2=27670&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PurchasePackingList_buildInvoice.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PurchasePackingList_buildInvoice.xml [utf8] Fri Jun 19 04:24:35 2009
@@ -67,7 +67,13 @@
# WARNING: this tag is also used in InvoiceTransaction_postGeneration script\n
tax_tag = \'build_invoice_tax_%s\' % packing_list.getRelativeUrl()\n
\n
- invoice_line_builder = getattr(delivery_tool, \'purchase_invoice_builder\', None)\n
+ invoice_builder_name = \'purchase_invoice_builder\'\n
+ invoice_tax_builder_name = \'purchase_invoice_tax_builder\'\n
+ if \'Purchase Invoice Module\' in context.getPortalModuleTypeList():\n
+ invoice_builder_name = \'advanced_purchase_invoice_builder\'\n
+ invoice_tax_builder_name = \'advanced_purchase_invoice_tax_builder\'\n
+\n
+ invoice_line_builder = getattr(delivery_tool, invoice_builder_name , None)\n
if invoice_line_builder is not None:\n
invoice_line_builder.activate(\n
activity=\'SQLQueue\',\n
@@ -80,7 +86,7 @@
else:\n
log(\'no purchase_invoice_builder found\')\n
\n
- invoice_tax_builder = getattr(delivery_tool, \'purchase_invoice_tax_builder\', None)\n
+ invoice_tax_builder = getattr(delivery_tool, invoice_tax_builder_name, None)\n
if invoice_tax_builder is not None:\n
invoice_tax_builder.activate(\n
activity=\'SQLQueue\',\n
@@ -140,6 +146,9 @@
<string>None</string>
<string>tag</string>
<string>tax_tag</string>
+ <string>invoice_builder_name</string>
+ <string>invoice_tax_builder_name</string>
+ <string>context</string>
<string>getattr</string>
<string>invoice_line_builder</string>
<string>dict</string>
Modified: erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/SalePackingList_buildInvoice.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/SalePackingList_buildInvoice.xml?rev=27670&r1=27669&r2=27670&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/SalePackingList_buildInvoice.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/SalePackingList_buildInvoice.xml [utf8] Fri Jun 19 04:24:35 2009
@@ -67,7 +67,13 @@
# WARNING: this tag is also used in InvoiceTransaction_postGeneration script\n
tax_tag = \'build_invoice_tax_%s\' % packing_list.getRelativeUrl()\n
\n
- invoice_line_builder = getattr(delivery_tool, \'sale_invoice_builder\', None)\n
+ invoice_builder_name = \'sale_invoice_builder\'\n
+ invoice_tax_builder_name = \'sale_invoice_tax_builder\'\n
+ if \'Sale Invoice Module\' in context.getPortalModuleTypeList():\n
+ invoice_builder_name = \'advanced_sale_invoice_builder\'\n
+ invoice_tax_builder_name = \'advanced_sale_invoice_tax_builder\'\n
+ \n
+ invoice_line_builder = getattr(delivery_tool, invoice_builder_name, None)\n
if invoice_line_builder is not None:\n
invoice_line_builder.activate(\n
activity=\'SQLQueue\',\n
@@ -80,7 +86,7 @@
else:\n
log(\'no sale_invoice_builder found\')\n
\n
- invoice_tax_builder = getattr(delivery_tool, \'sale_invoice_tax_builder\', None)\n
+ invoice_tax_builder = getattr(delivery_tool, invoice_tax_builder_name, None)\n
if invoice_tax_builder is not None:\n
invoice_tax_builder.activate(\n
activity=\'SQLQueue\',\n
@@ -140,6 +146,9 @@
<string>None</string>
<string>tag</string>
<string>tax_tag</string>
+ <string>invoice_builder_name</string>
+ <string>invoice_tax_builder_name</string>
+ <string>context</string>
<string>getattr</string>
<string>invoice_line_builder</string>
<string>dict</string>
Modified: erp5/trunk/bt5/erp5_trade/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/change_log?rev=27670&r1=27669&r2=27670&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/change_log [utf8] Fri Jun 19 04:24:35 2009
@@ -1,3 +1,6 @@
+2009-06-19 tatuya
+* Fix workflow scripts to enable to create Sale Invoices and Purchase Invoices when using erp5_advanced_invoicing
+
2009-05-19 yusei
* Fix some proxy fields. count_method should not be inherited from template field and proxy_listbox_ids had to be copied to new proxified fields but it was not copied.
Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=27670&r1=27669&r2=27670&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Fri Jun 19 04:24:35 2009
@@ -1,1 +1,1 @@
-669
+681
More information about the Erp5-report
mailing list