From 44ccdd6a59c0407b5d507f6f170872461a0e8a74 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Wed, 22 Aug 2012 15:19:22 +0530 Subject: [PATCH 1/3] [IMP] created field property_ids for procurement.order object. bzr revid: bth@tinyerp.com-20120822094922-u3jad3okwg15688h --- addons/sale/sale.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index c525ba04df1..ad066c3d374 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -1490,4 +1490,10 @@ class mail_message(osv.osv): mail_message() +class procurement_order(osv.osv): + _inherit = "procurement.order" + + _columns = { + 'property_ids': fields.many2many('sale.order', 'sale_order_property_rel', 'procurement_id','order_id', 'Properties'), + } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 9eac8aadaf0b2f309f00afa958319428dd6b6064 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Wed, 22 Aug 2012 17:00:34 +0530 Subject: [PATCH 2/3] [IMP] Remove property_ids:value from _prepare_order_line_procurement function which is unused and also created field. bzr revid: bth@tinyerp.com-20120822113034-p7rth1ps829bt0qd --- addons/sale/sale.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index ad066c3d374..d2bb4e145cc 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -845,8 +845,7 @@ class sale_order(osv.osv): 'procure_method': line.type, 'move_id': move_id, 'company_id': order.company_id.id, - 'note': '\n'.join(line.name.split('\n')[1:]), - 'property_ids': [(6, 0, [x.id for x in line.property_ids])] + 'note': '\n'.join(line.name.split('\n')[1:]) } def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, context=None): @@ -1490,10 +1489,4 @@ class mail_message(osv.osv): mail_message() -class procurement_order(osv.osv): - _inherit = "procurement.order" - - _columns = { - 'property_ids': fields.many2many('sale.order', 'sale_order_property_rel', 'procurement_id','order_id', 'Properties'), - } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 77905719d3b11e5e7b1a0bc11bbdd5c15b546e0f Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Thu, 23 Aug 2012 13:02:01 +0530 Subject: [PATCH 3/3] [IMP] remove type field from model=ir.ui.view. bzr revid: bth@tinyerp.com-20120823073201-vgtmu5ohmjhfhagu --- addons/sale/res_partner_view.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml index f076bfda67c..e524fe4415d 100644 --- a/addons/sale/res_partner_view.xml +++ b/addons/sale/res_partner_view.xml @@ -58,7 +58,6 @@ res.partner.view.address_type res.partner - form