Merge lp:~openerp-dev/openobject-addons/7.0-bug-1185795-mahendra into lp:openobject-addons/7.0

[Mahendra Barad(OpenERP)]

Hello,

I fix the wrong currency symbol in location content report Problem.

Problem is occur when we use the multi-currency and child company has different currency. Then the currency calculation on the report is right as per the user's company currency but it does not shows the user's company currency symbol even it converts the amount based on the user's company currency.

So have set the user's company currency symbol on total price and grand total.

Thanks,
Mahendra

Unmerged revisions

9185. By Mahendra Barad(OpenERP) on 2013-05-31

[FIX] wrong currency symbol in location content report.

=== modified file 'stock/report/lot_overview_all.py'
--- stock/report/lot_overview_all.py	2012-12-06 14:56:32 +0000
+++ stock/report/lot_overview_all.py	2013-05-31 11:20:45 +0000
@@ -32,8 +32,13 @@
             'process':self.process,
             'price_total': self._price_total,
             'grand_total_price':self._grand_total,
+            'get_user_currency': self._get_user_currency
         })
 
+    def _get_user_currency(self):
+        user_currency_id = self.pool.get('res.users').browse(self.cr, self.uid, self.uid, context=None).company_id.currency_id
+        return user_currency_id
+    
     def process(self, location_id):
         location_obj = pooler.get_pool(self.cr.dbname).get('stock.location')
         data = location_obj._product_get_all_report(self.cr,self.uid, [location_id])

=== modified file 'stock/report/lot_overview_all.rml'
--- stock/report/lot_overview_all.rml	2012-11-29 22:26:45 +0000
+++ stock/report/lot_overview_all.rml	2013-05-31 11:20:45 +0000
@@ -184,7 +184,7 @@
                 <para style="terp_default_Right_9">[[ formatLang(p['price'], dp='Account') ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Account', currency_obj = o.company_id.currency_id)]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Account', currency_obj = get_user_currency())]]</para>
               </td>
             </tr>
           </blockTable>
@@ -198,7 +198,7 @@
               <para style="terp_default_Bold_9">Total:</para>
             </td>
             <td>
-              <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Account', currency_obj = o.company_id.currency_id) ]]</para>
+              <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Account', currency_obj = get_user_currency()) ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -215,7 +215,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Account', currency_obj = o.company_id.currency_id) ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Account', currency_obj = get_user_currency()) ]]</para>
         </td>
       </tr>
     </blockTable>

=== modified file 'stock/report/lot_overview_all.sxw'
Binary files stock/report/lot_overview_all.sxw	2012-11-29 22:26:45 +0000 and stock/report/lot_overview_all.sxw	2013-05-31 11:20:45 +0000 differ