Merge lp:~openerp-dev/openobject-addons/6.0-opw-6344-rch into lp:openobject-addons/6.0

Proposed by Riken Bhorania (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/6.0-opw-6344-rch
Merge into: lp:openobject-addons/6.0
Diff against target: 13 lines (+0/-3)
1 file modified
account/invoice.py (+0/-3)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.0-opw-6344-rch
Reviewer Review Type Date Requested Status
qdp (OpenERP) Disapprove
Jay Vora (Serpent Consulting Services) Pending
Review via email: mp+66606@code.launchpad.net

Description of the change

Restrict to create unwanted journal entries in the case of partial deductible tax scenario.

To post a comment you must log in.
Revision history for this message
qdp (OpenERP) (qdp) wrote :

you need to make sure that the configuration of the taxes is correct.

Here the line with debit = credit = 0 is created because there is a value in tax_amount and tax_code_id fields. So this line is important. Either that vat information shouldn't be there (because it's already on another line, for example, and thus it means that the configuration is wrong) or it has to be there (and thus we can't just modify the code to remove those lines)

so i guess that the MP proposal is wrong

review: Disapprove
Revision history for this message
Jay Vora (Serpent Consulting Services) (jayvora) wrote :

Riken,

Can you please double check and finish this?

Thanks.

Revision history for this message
Riken Bhorania (OpenERP) (rch-openerp) wrote :

This merge proposal was designed for restricting the extra Journal Entry (debit=credit=0) created from the Invoice for the Tax configuration which is responsible to support partially deductible Tax scenario.

By verifying the tax configuration it seems that it must be as required which is correct also. However that extra Journal Entry (debit=credit=0) contains some value for 'Tax/Base Amount' column. This value is important and will be reflected on the 'Tax Report'. Also that Journal Entry (debit=credit=0) indicates parent-child relationship between taxes that are configured for this case.

According to me no further workout will be needed regarding this issue.

Unmerged revisions

4686. By Riken Bhorania (OpenERP)

[FIX]: account: Restrict to create unwanted journal entries in the case of partial tax deductible senario.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/invoice.py'
2--- account/invoice.py 2011-06-21 14:56:58 +0000
3+++ account/invoice.py 2011-07-01 13:35:52 +0000
4@@ -1469,9 +1469,6 @@
5 if tax_code_found:
6 if not tax_code_id:
7 continue
8- res.append(self.move_line_get_item(cr, uid, line, context))
9- res[-1]['price'] = 0.0
10- res[-1]['account_analytic_id'] = False
11 elif not tax_code_id:
12 continue
13 tax_code_found = True