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

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Aug 17 10:55:25 2009
New Revision: 28406

URL: http://svn.erp5.org?rev=28406&view=rev
Log:
specify the grand parent rule when selecting invoice transaction rule movements for normal (not from trade model) movements, otherwise they will be selected twice if movements from trade model lines are built

Modified:
    erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectInvoiceMovement.xml
    erp5/trunk/bt5/erp5_invoicing/bt/revision

Modified: 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=28406&r1=28405&r2=28406&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectInvoiceMovement.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectInvoiceMovement.xml [utf8] Mon Aug 17 10:55:25 2009
@@ -60,6 +60,8 @@
 \n
 # search for normal movements\n
 kw[\'parent_specialise_portal_type\'] = \'Invoice Transaction Rule\'\n
+kw[\'grand_grand_parent_specialise_portal_type\'] = [\n
+                          \'Invoicing Rule\', \'Invoice Rule\']\n
 if context.Invoice_isAdvanced():\n
   kw[\'explanation_portal_type\']       = [\'%s Order\' % trade_type,\n
                                          \'%s Invoice\' % trade_type,\n

Modified: erp5/trunk/bt5/erp5_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/revision?rev=28406&r1=28405&r2=28406&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] Mon Aug 17 10:55:25 2009
@@ -1,1 +1,1 @@
-275
+278