Merge lp:~vauxoo/addons-vauxoo/7.0-amount_residual_payslip-dev_luis into lp:addons-vauxoo/7.0

[Luis Torres - http://www.vauxoo.com]

Se quitó la funcionalidad de multicurrency en el calculo del monto restante

=== modified file 'payroll_amount_residual/hr_payslip.py'
--- payroll_amount_residual/hr_payslip.py	2014-06-04 00:04:34 +0000
+++ payroll_amount_residual/hr_payslip.py	2014-07-15 14:35:13 +0000
@@ -35,19 +35,14 @@
             context = {}
         ctx = context.copy()
         result = {}
-        currency_obj = self.pool.get('res.currency')
         for payslip in self.browse(cr, uid, ids, context=context):
             nb_inv_in_partial_rec = max_invoice_id = 0
             result[payslip.id] = 0.0
             if payslip.move_id:
                 for aml in payslip.move_id.line_id:
                     if aml.account_id.type in ('receivable','payable'):
-                        if aml.currency_id and aml.currency_id.id == payslip.currency_id.id:
-                            result[payslip.id] += aml.amount_residual_currency
-                        else:
-                            ctx['date'] = aml.date
-                            result[payslip.id] += currency_obj.compute(cr, uid, aml.company_id.currency_id.id, payslip.currency_id.id, aml.amount_residual, context=ctx)
-            #prevent the residual amount on the invoice to be less than 0
+                        result[payslip.id] += aml.amount_residual_currency
+            #prevent the residual amount on the payslip to be less than 0
             result[payslip.id] = max(result[payslip.id], 0.0)            
         return result