From dc9a96d9419ac1ed3937d2e6572b65f7698c3dfd Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sat, 24 Jan 2009 02:55:45 +0100 Subject: [PATCH] modifs bzr revid: fp@tinyerp.com-20090124015545-1fkj73ia52856t71 --- .../account_analytic_default/account_analytic_default.py | 4 ++-- addons/account_analytic_plans/account_analytic_plans.py | 4 ++-- addons/account_tax_include/invoice_tax_incl.py | 4 ++-- addons/account_tax_include/invoice_tax_incl.xml | 2 +- addons/warning/warning.py | 9 +++++---- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py index d6160f2fa88..4dc2788c52b 100644 --- a/addons/account_analytic_default/account_analytic_default.py +++ b/addons/account_analytic_default/account_analytic_default.py @@ -98,8 +98,8 @@ account_analytic_default() class account_invoice_line(osv.osv): _inherit = 'account.invoice.line' _description = 'account invoice line' - def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, price_unit=False, address_invoice_id=False, context={}): - res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, price_unit, address_invoice_id, context) + def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition=False, price_unit=False, address_invoice_id=False, context={}): + res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition, price_unit, address_invoice_id, context) rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context) if rec: res_prod['value'].update({'account_analytic_id':rec.analytic_id.id}) diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py index e1a9e6a28d9..69bd3790013 100644 --- a/addons/account_analytic_plans/account_analytic_plans.py +++ b/addons/account_analytic_plans/account_analytic_plans.py @@ -258,8 +258,8 @@ class account_invoice_line(osv.osv): res ['analytics_id']=line.analytics_id and line.analytics_id.id or False return res - def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, price_unit=False, address_invoice_id=False, context={}): - res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, price_unit, address_invoice_id, context) + def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, context={}): + res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition, price_unit, address_invoice_id, context) rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context) if rec and rec.analytics_id: res_prod['value'].update({'analytics_id':rec.analytics_id.id}) diff --git a/addons/account_tax_include/invoice_tax_incl.py b/addons/account_tax_include/invoice_tax_incl.py index cb5345dcb39..62f88205bf1 100644 --- a/addons/account_tax_include/invoice_tax_incl.py +++ b/addons/account_tax_include/invoice_tax_incl.py @@ -140,12 +140,12 @@ class account_invoice_line(osv.osv): else: return super(account_invoice_line, self).product_id_change_unit_price_inv(cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=context) - def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, price_unit=False, address_invoice_id=False, price_type='tax_excluded', context=None): + def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition=False, price_unit=False, address_invoice_id=False, price_type='tax_excluded', context=None): # note: will call product_id_change_unit_price_inv with context... if context is None: context = {} context.update({'price_type': price_type}) - return super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, price_unit, address_invoice_id, context=context) + return super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition, price_unit, address_invoice_id, context=context) account_invoice_line() class account_invoice_tax(osv.osv): diff --git a/addons/account_tax_include/invoice_tax_incl.xml b/addons/account_tax_include/invoice_tax_incl.xml index 3e25d37a818..470a1ca0697 100644 --- a/addons/account_tax_include/invoice_tax_incl.xml +++ b/addons/account_tax_include/invoice_tax_incl.xml @@ -58,7 +58,7 @@ - + diff --git a/addons/warning/warning.py b/addons/warning/warning.py index 6a340193b96..9c315f4046f 100644 --- a/addons/warning/warning.py +++ b/addons/warning/warning.py @@ -136,7 +136,8 @@ class sale_order_line(osv.osv): _inherit = 'sale.order.line' 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, date_order=False, packaging=False): + lang=False, update_tax=True, date_order=False, packaging=False, + fiscal_position=False): warning = {} if not product: return {'value': {'th_weight' : 0, 'product_packaging': False, @@ -151,7 +152,7 @@ class sale_order_line(osv.osv): message= product_info.sale_line_warn_msg result = super(sale_order_line, self).product_id_change( cr, uid, ids, pricelist, product, qty, uom, qty_uos, uos, name, partner_id, - lang, update_tax, date_order, packaging) + lang, update_tax, date_order, packaging, fiscal_position) if title and message: warning['title']=title[0] warning['message']=message @@ -165,7 +166,7 @@ sale_order_line() class purchase_order_line(osv.osv): _inherit = 'purchase.order.line' def product_id_change(self,cr, uid, ids, pricelist, product, qty, uom, - partner_id, date_order=False): + partner_id, date_order=False, fiscal_position=False): warning = {} if not product: return {'value': {'price_unit': 0.0, 'name':'','notes':'', 'product_uom' : False}, 'domain':{'product_uom':[]}} @@ -178,7 +179,7 @@ class purchase_order_line(osv.osv): message = product_info.purchase_line_warn_msg result = super(purchase_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty, uom, - partner_id, date_order) + partner_id, date_order, fiscal_position) if title and message: warning['title']=title[0] warning['message']=message