← Back to branch summary

~zhenit/ooaz/trunk

« back to all changes in this revision

Viewing changes to account_invoice_merge/invoice.py

  • Committer: mikel
  • Date: 2013-07-09 23:27:15 UTC
  • mfrom: (4.2.1 ooaz)
  • Revision ID: mikel@hide-20130709232715-j788e73qsqh4bgc3
pending merges:
  mikel 2013-03-19 [merge] Andrea Cometa 2013-03-19 [fix] error on unlink ...
    Andrea Cometa 2013-03-19 [fix] error on unlink row 67
    Andrea Cometa 2012-12-04 [add] Italian language

Show diffs side-by-side

added added

removed removed

Lines of Context:
account_invoice_merge/invoice.py
65
65
                mrg_pdt_ids = inv_line_obj.search(cr, uid, [('invoice_id','=',parent.id),('product_id','=',inv_lin.product_id.id)])
66
66
                if merge_lines and len(mrg_pdt_ids) == 1 and inv.type == parent.type: # product found --> add quantity
67
67
                    inv_line_obj.write(cr, uid, mrg_pdt_ids, {'quantity': inv_line_obj._can_merge_quantity(cr, uid, mrg_pdt_ids[0], inv_lin.id)})
68
 
                    inv_line_obj.unlink(cr, uid, inv_lin.id)
 
68
                    inv_line_obj.unlink(cr, uid, [inv_lin.id])
69
69
                elif inv.type == parent.type:
70
70
                    inv_line_obj.write(cr, uid, inv_lin.id, {'invoice_id': parent.id})
71
71
                else:
98
98
 
99
99
account_invoice_line()
100
100
 
101
 
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
b'\\ No newline at end of file'
 
101
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: