Therp Backports (Deprecated)

Merge lp:~therp-nl/therp-backports/addons-6.1-lp1058390_wrong_tax_base into lp:therp-backports

Proposed by Ronald Portier (Therp) on 2013-02-08

Status:

Merged

Merged at revision:

6707

Proposed branch:

Merge into:

Diff against target:

1 file modified

account/account_invoice.py (+1/-2)

To merge this branch:

bzr merge lp:~therp-nl/therp-backports/addons-6.1-lp1058390_wrong_tax_base

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Stefan Rijnhart (Opener) (community)		2013-02-08	Approve on 2013-02-08
Review via email: mp+147354@code.launchpad.net

This proposal supersedes a proposal from 2013-02-08.

Make sure computation of tax base for invoice is corrected the same way in in trunk.

Revision history for this message

Stefan Rijnhart (Opener) (stefan-opener) wrote on 2013-02-08:

This is a proper backport, merged verbatim in lp:openobject-server r7646, so approve.

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'account/account_invoice.py'
2	--- account/account_invoice.py 2013-01-23 09:13:47 +0000
3	+++ account/account_invoice.py 2013-02-08 11:59:26 +0000
4	@@ -1645,14 +1645,13 @@
5	(line.price_unit * (1 - (line.discount or 0.0) / 100.0)),
6	line.quantity, inv.address_invoice_id.id, line.product_id,
7	inv.partner_id, context=local_context)['taxes']:
8	- tax['price_unit'] = cur_obj.round(cr, uid, cur, tax['price_unit'])
9	val={}
10	val['invoice_id'] = inv.id
11	val['name'] = tax['name']
12	val['amount'] = tax['amount']
13	val['manual'] = False
14	val['sequence'] = tax['sequence']
15	- val['base'] = tax['price_unit'] * line['quantity']
16	+ val['base'] = cur_obj.round(cr, uid, cur, tax['price_unit'] * line['quantity'])
17
18	if inv.type in ('out_invoice','in_invoice'):
19	val['base_code_id'] = tax['base_code_id']