[Erp5-report] r25341 - in /erp5/trunk/bt5/erp5_invoicing: SkinTemplateItem/portal_skins/erp...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Jan 28 17:19:34 2009
New Revision: 25341

URL: http://svn.erp5.org?rev=25341&view=rev
Log:
test for getTitle has to be changed in hasTitle, because getTitle acquires id

Modified:
    erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.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=25341&r1=25340&r2=25341&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml [utf8] Wed Jan 28 17:19:34 2009
@@ -80,7 +80,6 @@
 \n
 # XXX this use of currency is completly bogus, it should be set on simulation movements.\n
 # get a price_currency from the packing list, or the order\n
-context.log(related_packing_list)\n
 price_currency = related_packing_list.getPriceCurrency()\n
 if price_currency:\n
   invoice.edit(\n
@@ -102,7 +101,7 @@
     context.edit(specialise=related_order.getSpecialise())\n
 \n
 # copy title, if not updating a new delivery\n
-if not invoice.getTitle():\n
+if not invoice.hasTitle() and related_packing_list.hasTitle():\n
   invoice.setTitle(related_packing_list.getTitle())\n
 \n
 # initialize accounting_workflow to planned state\n

Modified: erp5/trunk/bt5/erp5_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/revision?rev=25341&r1=25340&r2=25341&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] Wed Jan 28 17:19:34 2009
@@ -1,1 +1,1 @@
-186
+188