Merge lp:~openerp-dev/openobject-addons/6.0-opw-50878-pso into lp:openobject-addons/6.0

[Priyesh (OpenERP)]

Hello,

To reproduce the issue:

1. Configure a tax included in price with amount 0.2 also assign tax invoice tax accounts,account tax code
2. Go to accounting -> journal entries -> journal entries
3. Create a move line with credit = 100 and tax = the previously created tax
4. Save

You get 2 lines:
tax line with credit = 16.67 (correct)
base line with credit = 100 (wrong)

base line should be 83.33

Can you please share your views ?

Thanks,
Priyesh

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[nel (nel-tinyerp)]

This will give a strange behavior to the system. Suppose a user, that doesn't know about this feature, enters a value 100(like in your example). This user expects the system to keep this value and not to calculate it. So that's why, we suppose that accountant or users that create vouchers basing on tax included, should enter right amounts in all cases.
We prefer avoid making such calculation on fillable fields because it could cause many problems.

review: Disapprove

Unmerged revisions

4945. By Lorenzo Battistini - Agile BG - Domsense on 2011-12-05

[IMP] account: Improved create method of move line to create the correct entries(case:50878)

=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2011-11-22 10:49:26 +0000
+++ account/account_move_line.py	2011-12-05 11:39:35 +0000
@@ -1319,7 +1319,9 @@
                         tmp_cnt += 1
                         self.write(cr, uid,[result], {
                             'tax_code_id': tax[base_code],
-                            'tax_amount': tax[base_sign] * abs(total)
+                            'tax_amount': tax[base_sign] * abs(tax['price_unit']),
+                            'credit': tax['price_unit']<0 and -tax['price_unit'] or 0.0,
+                            'debit': tax['price_unit']>0 and tax['price_unit'] or 0.0,
                         })
                 else:
                     data = {
@@ -1332,10 +1334,10 @@
                         'ref': vals.get('ref',False),
                         'account_tax_id': False,
                         'tax_code_id': tax[base_code],
-                        'tax_amount': tax[base_sign] * abs(total),
+                        'tax_amount': tax[base_sign] * abs(tax['price_unit']),
                         'account_id': vals['account_id'],
-                        'credit': 0.0,
-                        'debit': 0.0,
+                        'credit': tax['price_unit']<0 and -tax['price_unit'] or 0.0,
+                        'debit': tax['price_unit']>0 and tax['price_unit'] or 0.0,
                     }
                     if data['tax_code_id']:
                         self.create(cr, uid, data, context)