From f626f391cd5675e0a9c8757a96accc251a40cafd Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Tue, 21 Oct 2008 10:42:14 +0200 Subject: [PATCH 1/2] warning is warning :o bzr revid: christophe@tinyerp.com-20081021084214-jncb5rjj4454hmoe --- bin/tools/convert.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/tools/convert.py b/bin/tools/convert.py index 15add7ae5c5..932107636be 100644 --- a/bin/tools/convert.py +++ b/bin/tools/convert.py @@ -488,7 +488,7 @@ form: module.record_id""" % (xml_id,) print 'Menu Error', self.module, xml_id, idx==len(m_l)-1 else: # the menuitem does't exist but we are in branch (not a leaf) - self.logger.notifyChannel("init", netsvc.LOG_INFO, 'Warning no ID for submenu %s of menu %s !' % (menu_elem, str(m_l))) + self.logger.notifyChannel("init", netsvc.LOG_WARNING, 'Warning no ID for submenu %s of menu %s !' % (menu_elem, str(m_l))) pid = self.pool.get('ir.ui.menu').create(cr, self.uid, {'parent_id' : pid, 'name' : menu_elem}) else: menu_parent_id = self.id_get(cr, 'ir.ui.menu', rec.getAttribute('parent')) From b05f060b8a0544d02165e8060e4e2110b1a7ec1f Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 21 Oct 2008 17:00:56 +0200 Subject: [PATCH 2/2] bugfix bzr revid: fp@tinyerp.com-20081021150056-t7lg8vzfaz5dnc6u --- addons/account/partner_view.xml | 2 -- addons/mrp/mrp.py | 18 ++---------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml index d99175f1c30..e8044aec16b 100644 --- a/addons/account/partner_view.xml +++ b/addons/account/partner_view.xml @@ -42,8 +42,6 @@ - - diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index ca8d0a6bcd0..199e60885a4 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -1000,25 +1000,11 @@ class mrp_procurement(osv.osv): 'notes':product.description_purchase, } - taxes = self.pool.get('account.tax').browse(cr, uid, - [x.id for x in procurement.product_id.product_tmpl_id.supplier_taxes_id]) - taxep = None - if partner_id: - taxep = partner.property_account_position and partner.property_account_position.account_supplier_tax - if not taxep or not taxep.id: - taxes_ids = [x.id for x in procurement.product_id.product_tmpl_id.supplier_taxes_id] - else: - res5 = [taxep.id] - for t in taxes: - if not t.tax_group==taxep.tax_group: - res5.append(t.id) - taxes_ids = res5 - + taxes_ids = procurement.product_id.product_tmpl_id.supplier_taxes_id + self.pool.get('account.fiscal.position').map_tax(cr, uid, partner, taxes) line.update({ 'taxes_id':[(6,0,taxes_ids)] }) - - purchase_id = self.pool.get('purchase.order').create(cr, uid, { 'origin': procurement.origin, 'partner_id': partner_id,