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

SALE: don't change tax when uom_qty change 

bzr revid: ced-53e1ff492fe5d5191a9a31d5bbf0a4e98e4b9d9e
This commit is contained in:
ced 2007-05-10 19:32:37 +00:00
parent f959cef7f9
commit 082ba11b84
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
addons/sale/sale.py
View File

@ -628,7 +628,7 @@ class sale_order_line(osv.osv):
default.update({'state':'draft', 'move_ids':[], 'invoiced':False, 'invoice_lines':[]})
return super(sale_order_line, self).copy(cr, uid, id, default, context)
def product_id_change(self, cr, uid, ids, pricelist, product, qty=0, uom=False, qty_uos=0, uos=False, name='', partner_id=False, lang=False):
def product_id_change(self, cr, uid, ids, pricelist, product, qty=0, uom=False, qty_uos=0, uos=False, name='', partner_id=False, lang=False, update_tax=True):
if partner_id:
lang=self.pool.get('res.partner').read(cr, uid, [partner_id])[0]['lang']
context = {'lang':lang}
@ -644,17 +644,18 @@ class sale_order_line(osv.osv):
result = {'price_unit': price, 'type':res['procure_method'], 'delay':(res['sale_delay'] or 0.0), 'notes':res['description_sale']}
taxes = self.pool.get('account.tax').browse(cr, uid, res['taxes_id'])
taxep = self.pool.get('res.partner').browse(cr, uid, partner_id).property_account_tax
if not taxep:
result['tax_id'] = res['taxes_id']
else:
res5 = [taxep[0]]
tp = self.pool.get('account.tax').browse(cr, uid, taxep[0])
for t in taxes:
if not t.tax_group==tp.tax_group:
res5.append(t.id)
result['tax_id'] = res5
if update_tax:
taxes = self.pool.get('account.tax').browse(cr, uid, res['taxes_id'])
taxep = self.pool.get('res.partner').browse(cr, uid, partner_id).property_account_tax
if not taxep:
result['tax_id'] = res['taxes_id']
else:
res5 = [taxep[0]]
tp = self.pool.get('account.tax').browse(cr, uid, taxep[0])
for t in taxes:
if not t.tax_group==tp.tax_group:
res5.append(t.id)
result['tax_id'] = res5
result['name'] = res['partner_ref']
domain = {}
@ -677,5 +678,6 @@ class sale_order_line(osv.osv):
result['product_uom'] = res['uom_id'] and res['uom_id'][0]
result['product_uom_qty'] = qty_uos / res['uos_coeff']
result['weight'] = result['product_uom_qty'] * res['weight']
print result
return {'value':result, 'domain':domain}
sale_order_line()

4
addons/sale/sale_view.xml
View File

@ -77,9 +77,9 @@
<notebook>
<page string="Order Line">
<separator string="Automatic Declaration" colspan="4"/>
<field name="product_uom_qty" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id)" context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom" select="1"/>
<field name="product_uom_qty" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False)" context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom" select="1"/>
<field name="product_uom"/>
<field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'])" context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom" colspan="4" select="1"/>
<field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True)" context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom" colspan="4" select="1"/>
<separator string="Manual Description" colspan="4"/>
<field name="name" colspan="4" select="1"/>