Merge lp:~openerp-dev/openobject-addons/6.1-opw-583207-ksa into lp:openobject-addons/6.1

[Kirti Savalia(OpenERP)]

Hello,

Fix the issue for Accounting enteries for the stock remains with decimal not rounded with company currency.

Steps to reproduce:
- Decimal precision in account, stock, sales and purchase = 2
- Currencies : rounding factor for company currency = 1 and Mathematic precision = 4
- Product : computer in real time and average price
- Purchase of stock with two decimal for the quantity and the unit price. The global amount is rounded to zero.
- Reception of the stock : pick-in
- check account enteries for the stock journal(not rounded)

Thanks
KSA

Unmerged revisions

7120. By Kirti Savalia(OpenERP) on 2013-01-02

[FIX]:Accounting enteries for the stock remains with decimal not rounded with company currency

=== modified file 'stock/stock.py'
--- stock/stock.py	2012-10-05 07:47:57 +0000
+++ stock/stock.py	2013-01-02 11:14:33 +0000
@@ -2267,6 +2267,7 @@
         processing of the given stock move.
         """
         # prepare default values considering that the destination accounts have the reference_currency_id as their main currency
+        amount = self.pool.get('res.currency').round(cr, uid, move.company_id.currency_id, reference_amount) or reference_amount
         partner_id = (move.picking_id.address_id and move.picking_id.address_id.partner_id and move.picking_id.address_id.partner_id.id) or False
         debit_line_vals = {
                     'name': move.name,
@@ -2275,7 +2276,7 @@
                     'ref': move.picking_id and move.picking_id.name or False,
                     'date': time.strftime('%Y-%m-%d'),
                     'partner_id': partner_id,
-                    'debit': reference_amount,
+                    'debit': amount,
                     'account_id': dest_account_id,
         }
         credit_line_vals = {
@@ -2285,7 +2286,7 @@
                     'ref': move.picking_id and move.picking_id.name or False,
                     'date': time.strftime('%Y-%m-%d'),
                     'partner_id': partner_id,
-                    'credit': reference_amount,
+                    'credit': amount,
                     'account_id': src_account_id,
         }
 
@@ -2300,14 +2301,14 @@
         cur_obj = self.pool.get('res.currency')
         if reference_currency_id != src_main_currency_id:
             # fix credit line:
-            credit_line_vals['credit'] = cur_obj.compute(cr, uid, reference_currency_id, src_main_currency_id, reference_amount, context=context)
+            credit_line_vals['credit'] = cur_obj.compute(cr, uid, reference_currency_id, src_main_currency_id, amount, context=context)
             if (not src_acct.currency_id) or src_acct.currency_id.id == reference_currency_id:
-                credit_line_vals.update(currency_id=reference_currency_id, amount_currency=reference_amount)
+                credit_line_vals.update(currency_id=reference_currency_id, amount_currency=amount)
         if reference_currency_id != dest_main_currency_id:
             # fix debit line:
-            debit_line_vals['debit'] = cur_obj.compute(cr, uid, reference_currency_id, dest_main_currency_id, reference_amount, context=context)
+            debit_line_vals['debit'] = cur_obj.compute(cr, uid, reference_currency_id, dest_main_currency_id, amount, context=context)
             if (not dest_acct.currency_id) or dest_acct.currency_id.id == reference_currency_id:
-                debit_line_vals.update(currency_id=reference_currency_id, amount_currency=reference_amount)
+                debit_line_vals.update(currency_id=reference_currency_id, amount_currency=amount)
 
         return [(0, 0, debit_line_vals), (0, 0, credit_line_vals)]