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

fix bug number : 328134 

-  can't associate a tax to a product if tax has 'Tax Application' set to 'All'
- modify Financial Management->invoices also for same problem

bzr revid: mra@tinyerp.com-20090212064903-9js22bwgih61prxu
This commit is contained in:
mra (Open ERP) 2009-02-12 12:19:03 +05:30
parent d9fe73f4ac
commit 71f82e2ae4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/account/account.py
View File

@ -1241,9 +1241,9 @@ class account_tax(osv.osv):
context=None, count=False):
if context and context.has_key('type'):
if context['type'] in ('out_invoice','out_refund'):
args.append(('type_tax_use','=','sale'))
args.append(('type_tax_use','in',['sale','all']))
elif context['type'] in ('in_invoice','in_refund'):
args.append(('type_tax_use','=','purchase'))
args.append(('type_tax_use','in',['purchase','all']))
return super(account_tax, self).search(cr, uid, args, offset, limit, order, context, count)
def name_get(self, cr, uid, ids, context={}):
@ -2142,7 +2142,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
vals_journal={}
view_id = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Journal View')])[0]
seq_id = obj_sequence.search(cr,uid,[('name','=','Account Journal')])[0]
if obj_multi.seq_journal:
seq_id_sale = obj_sequence.search(cr,uid,[('name','=','Sale Journal')])[0]
seq_id_purchase = obj_sequence.search(cr,uid,[('name','=','Purchase Journal')])[0]

4
addons/account/product.py
View File

@ -54,10 +54,10 @@ class product_template(osv.osv):
_columns = {
'taxes_id': fields.many2many('account.tax', 'product_taxes_rel',
'prod_id', 'tax_id', 'Customer Taxes',
domain=[('parent_id','=',False),('type_tax_use','=','sale')]),
domain=[('parent_id','=',False),('type_tax_use','in',['sale','all'])]),
'supplier_taxes_id': fields.many2many('account.tax',
'product_supplier_taxes_rel', 'prod_id', 'tax_id',
'Supplier Taxes', domain=[('parent_id', '=', False),('type_tax_use','=','purchase')]),
'Supplier Taxes', domain=[('parent_id', '=', False),('type_tax_use','in',['purchase','all'])]),
'property_account_income': fields.property(
'account.account',
type='many2one',