odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] point_of_sale: acconting entries generation failed if a tax was defined with no account for tax collected. 

this hack is pretty stupid, don't mention it. We need to refactor the whole function, the sooner the better. At least it's not worst than before as we were already using 'line' without being sure it was defined (and now, with the assert, we are)

bzr revid: qdp-launchpad@openerp.com-20130306174616-rb5sr2a6wv8nef3v
This commit is contained in:
Quentin (OpenERP) 2013-03-06 18:46:16 +01:00
parent 96267bdfce 7577488134
commit e2576590e3
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/point_of_sale/point_of_sale.py
View File

@ -977,8 +977,12 @@ class pos_order(osv.osv):
else:
grouped_data[key].append(values)
#because of the weird way the pos order is written, we need to make sure there is at least one line,
#because just after the 'for' loop there are references to 'line' and 'income_account' variables (that
#are set inside the for loop)
#TOFIX: a deep refactoring of this method (and class!) is needed in order to get rid of this stupid hack
assert order.lines, _('The POS order must have lines when calling this method')
# Create an move for each order line
for line in order.lines:
tax_amount = 0
taxes = [t for t in line.product_id.taxes_id]
@ -1053,7 +1057,7 @@ class pos_order(osv.osv):
'name': _('Tax') + ' ' + tax.name,
'quantity': line.qty,
'product_id': line.product_id.id,
'account_id': key[account_pos],
'account_id': key[account_pos] or income_account,
'credit': ((tax_amount>0) and tax_amount) or 0.0,
'debit': ((tax_amount<0) and -tax_amount) or 0.0,
'tax_code_id': key[tax_code_pos],