Merge lp:~openerp-dev/openobject-addons/trunk-bug-856751-bde into lp:openobject-addons

[Bharat Devnani (Open ERP)]

Hello Sir,

I have fixed the bug by modifying the parameters of the function compute in def move_line_get of invoice.py in account_anglo_saxon module.

Thanks & Regards,
Devnani Bharat R.

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

[qdp (OpenERP) (qdp)]

how weird... i'm not able to reproduce the bug. I'm setting the merge prop as rejected in the meanwhile to clear the LP list.

thanks

Unmerged revisions

5220. By Bharat Devnani (Open ERP) on 2011-09-27

account_anglo_saxon: Wrong currency recorded from Sales Journal to Expense Acct

=== modified file 'account_anglo_saxon/invoice.py'
--- account_anglo_saxon/invoice.py	2011-09-24 10:33:29 +0000
+++ account_anglo_saxon/invoice.py	2011-09-27 11:01:42 +0000
@@ -1,8 +1,8 @@
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 
-#    2004-2010 Tiny SPRL (<http://tiny.be>). 
+#    Copyright (C)
+#    2004-2010 Tiny SPRL (<http://tiny.be>).
 #    2009-2010 Veritos (http://veritos.nl).
 #    All Rights Reserved
 #
@@ -17,7 +17,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -30,10 +30,11 @@
         res = super(account_invoice_line,self).move_line_get(cr, uid, invoice_id, context=context)
         inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
         company_currency = inv.company_id.currency_id.id
+        company_currency_rate = inv.company_id.currency_id.rate
         def get_price(cr, uid, inv, company_currency,i_line):
             cur_obj = self.pool.get('res.currency')
             if inv.currency_id.id != company_currency:
-                price = cur_obj.compute(cr, uid, company_currency, inv.currency_id.id, i_line.product_id.standard_price * i_line.quantity, context={'date': inv.date_invoice})
+                price = cur_obj.compute(cr, uid, company_currency, inv.currency_id.id, i_line.product_id.standard_price * i_line.quantity * company_currency_rate, context={'date': inv.date_invoice})
             else:
                 price = i_line.product_id.standard_price * i_line.quantity
             return price