Merge lp://staging/~sebastiken/openerp-argentina/ou_account_payment-5.0 into lp://staging/~openerp-argentina-team/openerp-argentina/l10n_ar_account_payment-5.0
| Status: | Merged |
|---|---|
| Approved by: | Bruno M. Villasanti (Thymbra) |
| Approved revision: | 13 |
| Merged at revision: | 14 |
| Proposed branch: | lp://staging/~sebastiken/openerp-argentina/ou_account_payment-5.0 |
| Merge into: | lp://staging/~openerp-argentina-team/openerp-argentina/l10n_ar_account_payment-5.0 |
| Diff against target: |
26 lines (+4/-5) 1 file modified
ou_account_payment/recibos.py (+4/-5) |
| To merge this branch: | bzr merge lp://staging/~sebastiken/openerp-argentina/ou_account_payment-5.0 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Bruno M. Villasanti (Thymbra) | Approve | ||
|
Review via email:
|
|||
Commit message
[MERGE] Fixed bug #853917
Description of the change
Se fixea el bug #853917 que no permitía la instalación del módulo ou_account_payment.
Se debía a que el código estaba incompleto en la función button_advance.
Diff:
=== modified file 'ou_account_
--- ou_account_
+++ ou_account_
@@ -641,10 +641,10 @@
for id in ids:
rec = self.browse(cr, uid, id)
if rec.line_ids:
- #print 'Rec3: ', rec.line_ids
- # TODO: TENEMOS QUE BORRAR LAS LINEAS DEL RECIBO
- #self.write(cr, uid, id, {'line_ids': [(2, )]})
- #print 'Rec4: ', rec.line_ids
+ for l in rec.line_ids:
+ # Borramos las lineas del recibo, ya que es solo adelanto
+ self.write(cr, uid, id, {'line_ids': [(2, l.id)]})
+
rec = self.browse(cr, uid, id)
| Bruno M. Villasanti (Thymbra) (brunovillasanti) wrote | # |
Merge aceptado.