Merge lp:~inddiana/bank-management/aristobulo-amount-and-lineless-fix into lp:bank-management/trunk

Proposed by Aristóbulo Meneses
Status: Superseded
Proposed branch: lp:~inddiana/bank-management/aristobulo-amount-and-lineless-fix
Merge into: lp:bank-management/trunk
Diff against target: 31 lines (+8/-8)
1 file modified
bank_management/check/account_voucher_payment.py (+8/-8)
To merge this branch: bzr merge lp:~inddiana/bank-management/aristobulo-amount-and-lineless-fix
Reviewer Review Type Date Requested Status
Javier Duran (community) Approve
Nhomar - Vauxoo Pending
Review via email: mp+90584@code.launchpad.net

This proposal has been superseded by a proposal from 2012-03-01.

Description of the change

Contiene fixes para bug #923118 y bug #921891

To post a comment you must log in.
Revision history for this message
Javier Duran (javieredm) wrote :

Hola buen día,

Aristobulo por favor coloca la traducción del mensaje de excepción que se presenta al tratar de validar la orden de pago sin líneas.

review: Needs Fixing
Revision history for this message
Aristóbulo Meneses (aristobulo) wrote :

Ese es el mensaje original que esta en el módulo. Sólo le eliminé las palabras repetidas.

Revision history for this message
Javier Duran (javieredm) wrote :

Me refería a este:
raise osv.except_osv(_('Error'), _('Cannot validate a voucher without lines!'))

Revision history for this message
Javier Duran (javieredm) wrote :

Unido al trunk en:

revno: 59 [merge]
revision-id: javier@squezee-vir-20120301210057-15gm94wzfcu1k80z

review: Approve

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bank_management/check/account_voucher_payment.py'
2--- bank_management/check/account_voucher_payment.py 2012-01-25 17:21:20 +0000
3+++ bank_management/check/account_voucher_payment.py 2012-01-28 20:14:23 +0000
4@@ -157,20 +157,20 @@
5 def validate_pay(self,cr,uid,ids,context=None):
6 if context is None:
7 context={}
8- val = 0
9+ val = 0.0
10+
11 voucher_brw = self.browse(cr,uid,ids[0],context=context)
12- if voucher_brw.line_dr_ids:
13+
14+ if voucher_brw.line_dr_ids or voucher_brw.line_cr_ids:
15 for i in voucher_brw.line_dr_ids:
16 val = val + i.amount
17- if val != voucher_brw.amount:
18- raise osv.except_osv(_('Error'), _('El monto total no coincide con el monto a pagar al monto a pagar!'))
19-
20
21- if voucher_brw.line_cr_ids:
22 for i in voucher_brw.line_cr_ids:
23 val = val + i.amount
24- if val != voucher_brw.amount :
25- raise osv.except_osv(_('Error'), _('El monto total no coincide con el monto a pagar al monto a pagar!'))
26+ if abs(val - voucher_brw.amount) > 0.001 :
27+ raise osv.except_osv(_('Error'), _('El monto total no coincide con el monto a pagar!'))
28+ else:
29+ raise osv.except_osv(_('Error'), _('Cannot validate a voucher without lines!'))
30
31 self.write(cr,uid,ids,{'state':'proforma'},context=context)
32

Subscribers

People subscribed via source and target branches

to all changes: