diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py index c43bd524090..43cfe2de069 100644 --- a/addons/purchase_requisition/purchase_requisition.py +++ b/addons/purchase_requisition/purchase_requisition.py @@ -128,7 +128,6 @@ class purchase_requisition(osv.osv): res_partner = self.pool.get('res.partner') fiscal_position = self.pool.get('account.fiscal.position') supplier = res_partner.browse(cr, uid, partner_id, context=context) - delivery_address_id = res_partner.address_get(cr, uid, [supplier.id], ['delivery'])['delivery'] supplier_pricelist = supplier.property_product_pricelist_purchase or False res = {} for requisition in self.browse(cr, uid, ids, context=context): @@ -138,7 +137,6 @@ class purchase_requisition(osv.osv): purchase_id = purchase_order.create(cr, uid, { 'origin': requisition.name, 'partner_id': supplier.id, - 'partner_address_id': delivery_address_id, 'pricelist_id': supplier_pricelist.id, 'location_id': location_id, 'company_id': requisition.company_id.id, diff --git a/addons/purchase_requisition/purchase_requisition_demo.xml b/addons/purchase_requisition/purchase_requisition_demo.xml index 9ef7bc40d97..41491cc64ca 100644 --- a/addons/purchase_requisition/purchase_requisition_demo.xml +++ b/addons/purchase_requisition/purchase_requisition_demo.xml @@ -32,7 +32,6 @@ - @@ -50,7 +49,6 @@ - diff --git a/addons/purchase_requisition/report/purchase_requisition.rml b/addons/purchase_requisition/report/purchase_requisition.rml index 56e4c1ae0af..67eb7b364a5 100644 --- a/addons/purchase_requisition/report/purchase_requisition.rml +++ b/addons/purchase_requisition/report/purchase_requisition.rml @@ -223,7 +223,7 @@ - [[ (purchase_ids.partner_address_id and purchase_ids.partner_address_id.partner_id and purchase_ids.partner_address_id.partner_id.name) or '' ]] + [[ (purchase_ids.partner_id and purchase_ids.partner_id.id and purchase_ids.partner_id.name) or '' ]] [[ formatLang(purchase_ids.date_order,date='True') ]] diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py index 043ed749f4b..a6b806471ef 100644 --- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py +++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py @@ -29,7 +29,6 @@ class purchase_requisition_partner(osv.osv_memory): _description = "Purchase Requisition Partner" _columns = { 'partner_id': fields.many2one('res.partner', 'Partner', required=True,domain=[('supplier', '=', True)]), - 'partner_address_id':fields.many2one('res.partner.address', 'Address'), } def view_init(self, cr, uid, fields_list, context=None): @@ -42,13 +41,6 @@ class purchase_requisition_partner(osv.osv_memory): raise osv.except_osv(_('Error!'), _('No Product in Tender')) return res - def onchange_partner_id(self, cr, uid, ids, partner_id): - if not partner_id: - return {} - addr = self.pool.get('res.partner').address_get(cr, uid, [partner_id], ['default']) - part = self.pool.get('res.partner').browse(cr, uid, partner_id) - return {'value':{'partner_address_id': addr['default']}} - def create_order(self, cr, uid, ids, context=None): active_ids = context and context.get('active_ids', []) data = self.browse(cr, uid, ids, context=context)[0] diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml index d994ba71405..4656d3c37c6 100644 --- a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml +++ b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml @@ -8,8 +8,7 @@
- - +