Merge lp:~openerp-dev/openobject-addons/7.0-invoices-analysis-api into lp:openobject-addons/7.0

[qdp (OpenERP)]

This branch replace the old 7.0-bug-account-api because the previous one had too many unnecessary commit.

API

Unmerged revisions

8525. By Arnaud Pineux (OpenERP) on 2013-01-03

[FIX] account_invoice_report: remove unused field and compute values in user currency

=== modified file 'account/report/account_invoice_report.py'
--- account/report/account_invoice_report.py	2012-12-19 10:57:58 +0000
+++ account/report/account_invoice_report.py	2013-01-07 15:27:25 +0000
@@ -29,30 +29,6 @@
     _auto = False
     _rec_name = 'date'
 
-    def _compute_amounts_in_user_currency(self, cr, uid, ids, field_names, args, context=None):
-        """Compute the amounts in the currency of the user
-        """
-        if context is None:
-            context={}
-        currency_obj = self.pool.get('res.currency')
-        currency_rate_obj = self.pool.get('res.currency.rate')
-        user_currency_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
-        currency_rate_id = currency_rate_obj.search(cr, uid, [('rate', '=', 1)], limit=1, context=context)[0]
-        base_currency_id = currency_rate_obj.browse(cr, uid, currency_rate_id, context=context).currency_id.id
-        res = {}
-        ctx = context.copy()
-        for item in self.browse(cr, uid, ids, context=context):
-            ctx['date'] = item.date
-            price_total = currency_obj.compute(cr, uid, base_currency_id, user_currency_id, item.price_total, context=ctx)
-            price_average = currency_obj.compute(cr, uid, base_currency_id, user_currency_id, item.price_average, context=ctx)
-            residual = currency_obj.compute(cr, uid, base_currency_id, user_currency_id, item.residual, context=ctx)
-            res[item.id] = {
-                'user_currency_price_total': price_total,
-                'user_currency_price_average': price_average,
-                'user_currency_residual': residual,
-            }
-        return res
-
     _columns = {
         'date': fields.date('Date', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
@@ -73,9 +49,7 @@
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'user_id': fields.many2one('res.users', 'Salesperson', readonly=True),
         'price_total': fields.float('Total Without Tax', readonly=True),
-        'user_currency_price_total': fields.function(_compute_amounts_in_user_currency, string="Total Without Tax", type='float', digits_compute=dp.get_precision('Account'), multi="_compute_amounts"),
         'price_average': fields.float('Average Price', readonly=True, group_operator="avg"),
-        'user_currency_price_average': fields.function(_compute_amounts_in_user_currency, string="Average Price", type='float', digits_compute=dp.get_precision('Account'), multi="_compute_amounts"),
         'currency_rate': fields.float('Currency Rate', readonly=True),
         'nbr':fields.integer('# of Lines', readonly=True),
         'type': fields.selection([
@@ -97,10 +71,30 @@
         'account_line_id': fields.many2one('account.account', 'Account Line',readonly=True),
         'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',readonly=True),
         'residual': fields.float('Total Residual', readonly=True),
-        'user_currency_residual': fields.function(_compute_amounts_in_user_currency, string="Total Residual", type='float', digits_compute=dp.get_precision('Account'), multi="_compute_amounts"),
     }
     _order = 'date desc'
 
+    def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False):
+        ''' The field "price_total" is the total price in EUR but the read_group method will recompute on the fly this price.
+            The price is recomputed in the user currency in order to be displayed in the view.
+        '''
+        if context is None:
+            context = {}
+        res = super(account_invoice_report, self).read_group(cr, uid, domain, fields, groupby, offset, limit, context, orderby)
+        currency_obj = self.pool.get('res.currency')
+        currency_rate_obj = self.pool.get('res.currency.rate')
+        user_currency_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
+        currency_rate_id = currency_rate_obj.search(cr, uid, [('rate', '=', 1)], limit=1, context=context)[0]
+        base_currency_id = currency_rate_obj.browse(cr, uid, currency_rate_id, context=context).currency_id.id
+        for elmt in res:
+            if "price_total" in elmt and elmt['price_total']: 
+                elmt['price_total'] = currency_obj.compute(cr, uid, base_currency_id, user_currency_id, elmt['price_total'], context=context)
+            if "price_average" in elmt and elmt['price_average']: 
+                elmt['price_average'] = currency_obj.compute(cr, uid, base_currency_id, user_currency_id, elmt['price_average'], context=context)
+            if "residual" in elmt and elmt['residual']: 
+                elmt['residual'] = currency_obj.compute(cr, uid, base_currency_id, user_currency_id, elmt['residual'], context=context)
+        return res
+
     def _select(self):
         select_str = """
             SELECT sub.id, sub.date, sub.year, sub.month, sub.day, sub.product_id, sub.partner_id,

=== modified file 'account/report/account_invoice_report_view.xml'
--- account/report/account_invoice_report_view.xml	2012-12-24 14:20:46 +0000
+++ account/report/account_invoice_report_view.xml	2013-01-07 15:27:25 +0000
@@ -28,7 +28,9 @@
                 <field name="nbr" sum="# of Lines"/>
                 <field name="product_qty" sum="Qty"/>
                 <!-- <field name="reconciled"  sum="# Reconciled"/> -->
+                <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Without Tax"/>
+                <field name="residual" sum="Total Residual"/>
             </tree>
         </field>
     </record>