diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectInvoiceMovement.xml b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectInvoiceMovement.xml index 5c9c1ea453cc1eff20a4a353551a0918f67a627a..fc1cc47a072f9e7eb4f453884c72339cb4668818 100644 --- a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectInvoiceMovement.xml +++ b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectInvoiceMovement.xml @@ -58,7 +58,7 @@ and same rule which is children of Trade Model Rule """\n # search for normal movements\n kw[\'parent_specialise_reference\'] = [\'default_invoice_transaction_rule\']\n kw[\'grand_grand_parent_specialise_reference\'] = [\n - \'default_invoicing_rule\', \'default_invoice_rule\']\n + \'default_invoicing_rule\', \'default_invoice_rule\', \'default_tax_rule\']\n if context.Invoice_isAdvanced():\n kw[\'explanation_portal_type\'] = [\'%s Order\' % trade_type,\n \'%s Invoice\' % trade_type,\n diff --git a/bt5/erp5_invoicing/bt/change_log b/bt5/erp5_invoicing/bt/change_log index 66c8113bf2c285e4938ff6d1010554f5cf989ad0..af71214e67c9939f9ff9f96a8ba591fdf06e2bb7 100644 --- a/bt5/erp5_invoicing/bt/change_log +++ b/bt5/erp5_invoicing/bt/change_log @@ -1,3 +1,6 @@ +2011-11-04 tatuya +* Add default_tax_rule reference into InvoiceTransaction_selectInvoiceMovement because it was wrongly removed at c7f1a35c1abdb9f93c6353c5024aaa47bf6505e0 when replacing to specify the portal type with the rule reference. + 2011-10-12 Kazuhiko * Fix the issue that a Invoice document can wrongly have a needless Root Applied Rule when it is created by Delivery Builder with a site which has many activity nodes. diff --git a/bt5/erp5_invoicing/bt/revision b/bt5/erp5_invoicing/bt/revision index 1c34b96390b67bd8f62c2758c2563682ba06d5b8..cadbe928f85634ae380371c3266c8dad6eefd5e7 100644 --- a/bt5/erp5_invoicing/bt/revision +++ b/bt5/erp5_invoicing/bt/revision @@ -1 +1 @@ -377 \ No newline at end of file +378 \ No newline at end of file