openerp-dev-web team mailing list archive

["psi \(OpenERP\)" <psi@xxxxxxxxxxxxx>]

psi (OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-psi2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #568537 The __compute method of account_account needs optmization to improve Accounting Performance!
  https://bugs.launchpad.net/bugs/568537
  #686508 Not able to validate sales receipt
  https://bugs.launchpad.net/bugs/686508
  #686513 Not able to validate supplier vouchers
  https://bugs.launchpad.net/bugs/686513


Hello sir,

these are the following bugs which i fix into my branch please merge it to your branch.
 https://bugs.launchpad.net/openobject-addons/+bug/686508	
	Not able to validate sales receipt 
 https://bugs.launchpad.net/openobject-addons/+bug/686513
	Not able to validate supplier vouchers

Thanks and regards,
PSI
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-psi2/+merge/44008
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-psi2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py	2010-12-17 04:37:32 +0000
+++ account_voucher/account_voucher.py	2010-12-17 05:37:56 +0000
@@ -709,7 +709,7 @@
             for line in inv.line_ids:
                 if not line.amount:
                     continue
-                amount = currency_pool.compute(cr, uid, current_currency, company_currency, line.amount)
+                amount = currency_pool.compute(cr, uid, current_currency, company_currency, line.untax_amount or line.amount)
                 move_line = {
                     'journal_id': inv.journal_id.id,
                     'period_id': inv.period_id.id,