Merge lp:~vauxoo/addons-vauxoo/7.0-addons-vauxoo-hert-dev-julio into lp:addons-vauxoo/7.0

Proposed by Julio Serna-http://www.vauxoo.com
Status: Merged
Merged at revision: 979
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0-addons-vauxoo-hert-dev-julio
Merge into: lp:addons-vauxoo/7.0
Diff against target: 12 lines (+1/-1)
1 file modified
hr_expense_replenishment_tax/model/hr_expense.py (+1/-1)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0-addons-vauxoo-hert-dev-julio
Reviewer Review Type Date Requested Status
Julio Serna-http://www.vauxoo.com Pending
Moisés López - http://www.vauxoo.com Pending
Review via email: mp+210279@code.launchpad.net

Description of the change

modified function that calculate amount total vs amount_untaxed in tax

To post a comment you must log in.
960. By Julio Serna-http://www.vauxoo.com

[MERGE] merge with addons-vauxoo/7.0

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr_expense_replenishment_tax/model/hr_expense.py'
2--- hr_expense_replenishment_tax/model/hr_expense.py 2013-10-09 23:30:58 +0000
3+++ hr_expense_replenishment_tax/model/hr_expense.py 2014-03-10 20:06:48 +0000
4@@ -191,7 +191,7 @@
5 for move in aml_obj.browse(cr, uid, move_ids, context=context):
6 if move.amount_tax_unround:
7 move_round += move.credit
8- move_without_round += move.amount_tax_unround
9+ move_without_round += abs(move.amount_tax_unround)
10 move_diff = abs(move_without_round) - abs(move_round)
11 move_diff = round(move_diff, 2)
12 if move_diff <> 0.00: