Skip to content

Commit

Permalink
Merge pull request #45 from acsone/8.0-imp-tuple-to-list-cols-ape
Browse files Browse the repository at this point in the history
[IMP] Replace tuples with column names to list to be more flexible to add some fields
  • Loading branch information
pedrobaeza committed Feb 6, 2015
2 parents d508ec2 + 0951e23 commit 370e089
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions account_invoice_merge/invoice.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
from openerp import workflow
from openerp.osv.orm import browse_record, browse_null

INVOICE_KEY_COLS = ('partner_id', 'user_id', 'type',
INVOICE_KEY_COLS = ['partner_id', 'user_id', 'type',
'account_id', 'currency_id',
'journal_id', 'company_id')
'journal_id', 'company_id']

INVOICE_LINE_KEY_COLS = ('name', 'origin', 'discount',
INVOICE_LINE_KEY_COLS = ['name', 'origin', 'discount',
'invoice_line_tax_id', 'price_unit',
'product_id', 'account_id',
'account_analytic_id')
'account_analytic_id']


class account_invoice(models.Model):
Expand Down

0 comments on commit 370e089

Please sign in to comment.