From 50997f9fe8649d9cd0052e501f67c4b0df18f1be Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Mon, 5 Mar 2012 18:55:43 +0530 Subject: [PATCH] [Fix]sale: remove res.address.partner.address bzr revid: kjo@tinyerp.com-20120305132543-92ba124cpg4zbrix --- addons/sale/edi/sale_order.py | 14 ++++++-------- addons/sale/edi/sale_order_action_data.xml | 4 ++-- addons/sale/report/sale_order.rml | 6 +++--- addons/sale/sale.py | 13 ++++--------- addons/sale/sale_demo.xml | 7 ------- addons/sale/sale_unit_test.xml | 5 ++--- addons/sale/sale_view.xml | 3 +-- addons/sale/stock.py | 2 -- addons/sale/test/edi_sale_order.yml | 14 ++------------ addons/sale/test/picking_order_policy.yml | 1 - addons/sale/wizard/sale_line_invoice.py | 2 -- addons/sale/wizard/sale_make_invoice_advance.py | 2 -- 12 files changed, 20 insertions(+), 53 deletions(-) diff --git a/addons/sale/edi/sale_order.py b/addons/sale/edi/sale_order.py index d40d0b613ed..d36c31cea5f 100644 --- a/addons/sale/edi/sale_order.py +++ b/addons/sale/edi/sale_order.py @@ -68,7 +68,7 @@ class sale_order(osv.osv, EDIMixin): """Exports a Sale order""" edi_struct = dict(edi_struct or SALE_ORDER_EDI_STRUCT) res_company = self.pool.get('res.company') - res_partner_address = self.pool.get('res.partner.address') + res_partner_address = self.pool.get('res.partner') edi_doc_list = [] for order in records: # generate the main report @@ -82,7 +82,7 @@ class sale_order(osv.osv, EDIMixin): '__import_module': 'purchase', 'company_address': res_company.edi_export_address(cr, uid, order.company_id, context=context), - 'partner_address': res_partner_address.edi_export(cr, uid, [order.partner_order_id], context=context)[0], + 'partner_id': res_partner_address.edi_export(cr, uid, [order.partner_id], context=context)[0], 'currency': self.pool.get('res.currency').edi_export(cr, uid, [order.pricelist_id.currency_id], context=context)[0], @@ -99,7 +99,6 @@ class sale_order(osv.osv, EDIMixin): # the desired company among the user's allowed companies self._edi_requires_attributes(('company_id','company_address'), edi_document) - res_partner_address = self.pool.get('res.partner.address') res_partner = self.pool.get('res.partner') # imported company = as a new partner @@ -111,16 +110,15 @@ class sale_order(osv.osv, EDIMixin): # imported company_address = new partner address address_info = edi_document.pop('company_address') - address_info['partner_id'] = (src_company_id, src_company_name) +# address_info['partner_id'] = (src_company_id, src_company_name) address_info['type'] = 'default' - address_id = res_partner_address.edi_import(cr, uid, address_info, context=context) + address_id = res_partner.edi_import(cr, uid, address_info, context=context) # modify edi_document to refer to new partner/address - partner_address = res_partner_address.browse(cr, uid, address_id, context=context) - edi_document['partner_id'] = (src_company_id, src_company_name) + partner_address = res_partner.browse(cr, uid, address_id, context=context) +# edi_document['partner_id'] = (src_company_id, src_company_name) edi_document.pop('partner_address', False) # ignored address_edi_m2o = self.edi_m2o(cr, uid, partner_address, context=context) - edi_document['partner_order_id'] = address_edi_m2o edi_document['partner_invoice_id'] = address_edi_m2o edi_document['partner_shipping_id'] = address_edi_m2o diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml index 3d7a554ff4a..eecc06a84a1 100644 --- a/addons/sale/edi/sale_order_action_data.xml +++ b/addons/sale/edi/sale_order_action_data.xml @@ -46,7 +46,7 @@ -

Hello${object.partner_order_id.name and ' ' or ''}${object.partner_order_id.name or ''},

+

Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},

Here is your order confirmation for ${object.partner_id.name}:

@@ -128,7 +128,7 @@ ]]> [[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]] - [[ o.partner_order_id and display_address(o.partner_order_id) ]] + [[ o.partner_id and display_address(o.partner_id) ]] - Tel. : [[ (o.partner_order_id and o.partner_order_id.phone) or removeParentNode('para') ]] - Fax : [[ (o.partner_order_id and o.partner_order_id.fax) or removeParentNode('para') ]] + Tel. : [[ (o.partner_id and o.partner_id.phone) or removeParentNode('para') ]] + Fax : [[ (o.partner_id and o.partner_id.fax) or removeParentNode('para') ]] TVA : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]] diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 82bfda7b580..96995ca2428 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -215,9 +215,8 @@ class sale_order(osv.osv): 'date_confirm': fields.date('Confirmation Date', readonly=True, select=True, help="Date on which sales order is confirmed."), 'user_id': fields.many2one('res.users', 'Salesman', states={'draft': [('readonly', False)]}, select=True), 'partner_id': fields.many2one('res.partner', 'Customer', readonly=True, states={'draft': [('readonly', False)]}, required=True, change_default=True, select=True), - 'partner_invoice_id': fields.many2one('res.partner.address', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Invoice address for current sales order."), - 'partner_order_id': fields.many2one('res.partner.address', 'Ordering Contact', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="The name and address of the contact who requested the order or quotation."), - 'partner_shipping_id': fields.many2one('res.partner.address', 'Shipping Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Shipping address for current sales order."), + 'partner_invoice_id': fields.many2one('res.partner', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Invoice address for current sales order."), + 'partner_shipping_id': fields.many2one('res.partner', 'Shipping Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Shipping address for current sales order."), 'incoterm': fields.many2one('stock.incoterms', 'Incoterm', help="Incoterm which stands for 'International Commercial terms' implies its a series of sales terms which are used in the commercial transaction."), 'picking_policy': fields.selection([('direct', 'Deliver each product when available'), ('one', 'Deliver all products at once')], @@ -279,7 +278,6 @@ class sale_order(osv.osv): 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'sale.order'), 'invoice_quantity': 'order', 'partner_invoice_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['invoice'])['invoice'], - 'partner_order_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['contact'])['contact'], 'partner_shipping_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['delivery'])['delivery'], } _sql_constraints = [ @@ -347,7 +345,7 @@ class sale_order(osv.osv): def onchange_partner_id(self, cr, uid, ids, part): if not part: - return {'value': {'partner_invoice_id': False, 'partner_shipping_id': False, 'partner_order_id': False, 'payment_term': False, 'fiscal_position': False}} + return {'value': {'partner_invoice_id': False, 'partner_shipping_id': False, 'payment_term': False, 'fiscal_position': False}} addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['delivery', 'invoice', 'contact']) part = self.pool.get('res.partner').browse(cr, uid, part) @@ -357,7 +355,6 @@ class sale_order(osv.osv): dedicated_salesman = part.user_id and part.user_id.id or uid val = { 'partner_invoice_id': addr['invoice'], - 'partner_order_id': addr['contact'], 'partner_shipping_id': addr['delivery'], 'payment_term': payment_term, 'fiscal_position': fiscal_position, @@ -429,8 +426,6 @@ class sale_order(osv.osv): 'account_id': order.partner_id.property_account_receivable.id, 'partner_id': order.partner_id.id, 'journal_id': journal_ids[0], - 'address_invoice_id': order.partner_invoice_id.id, - 'address_contact_id': order.partner_order_id.id, 'invoice_line': [(6, 0, lines)], 'currency_id': order.pricelist_id.currency_id.id, 'comment': order.note, @@ -964,7 +959,7 @@ class sale_order_line(osv.osv): 'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="If 'on order', it triggers a procurement when the sale order is confirmed to create a task, purchase order or manufacturing order linked to this sale order line."), 'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft': [('readonly', False)]}), - 'address_allotment_id': fields.many2one('res.partner.address', 'Allotment Partner'), + 'address_allotment_id': fields.many2one('res.partner', 'Allotment Partner'), 'product_uom_qty': fields.float('Quantity (UoM)', digits_compute= dp.get_precision('Product UoS'), required=True, readonly=True, states={'draft': [('readonly', False)]}), 'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True, readonly=True, states={'draft': [('readonly', False)]}), 'product_uos_qty': fields.float('Quantity (UoS)' ,digits_compute= dp.get_precision('Product UoS'), readonly=True, states={'draft': [('readonly', False)]}), diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml index 5da496a1c4b..c04862d86c1 100644 --- a/addons/sale/sale_demo.xml +++ b/addons/sale/sale_demo.xml @@ -11,7 +11,6 @@ - picking procurement Invoice after delivery @@ -68,7 +67,6 @@ - order postpaid @@ -104,7 +102,6 @@ - prepaid @@ -137,7 +134,6 @@ - @@ -170,7 +166,6 @@ - @@ -203,7 +198,6 @@ - @@ -237,7 +231,6 @@ - diff --git a/addons/sale/sale_unit_test.xml b/addons/sale/sale_unit_test.xml index 421cb36c440..787373dae99 100644 --- a/addons/sale/sale_unit_test.xml +++ b/addons/sale/sale_unit_test.xml @@ -7,9 +7,8 @@ - - - + + diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 90d3838f5a0..5aab17f1a56 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -116,11 +116,10 @@ - - +
diff --git a/addons/sale/stock.py b/addons/sale/stock.py index f13e512c008..44b993ec0e1 100644 --- a/addons/sale/stock.py +++ b/addons/sale/stock.py @@ -67,8 +67,6 @@ class stock_picking(osv.osv): """ invoice_vals = super(stock_picking, self)._prepare_invoice(cr, uid, picking, partner, inv_type, journal_id, context=context) if picking.sale_id: - invoice_vals['address_contact_id'] = picking.sale_id.partner_order_id.id - invoice_vals['address_invoice_id'] = picking.sale_id.partner_invoice_id.id invoice_vals['fiscal_position'] = picking.sale_id.fiscal_position.id invoice_vals['payment_term'] = picking.sale_id.payment_term.id invoice_vals['user_id'] = picking.sale_id.user_id.id diff --git a/addons/sale/test/edi_sale_order.yml b/addons/sale/test/edi_sale_order.yml index 9a207d9f44e..2fdfe548eff 100644 --- a/addons/sale/test/edi_sale_order.yml +++ b/addons/sale/test/edi_sale_order.yml @@ -4,7 +4,6 @@ !record {model: sale.order, id: sale_order_edi_1}: partner_id: base.res_partner_agrolait partner_invoice_id: base.res_partner_address_8invoice - partner_order_id: base.res_partner_address_8invoice partner_shipping_id: base.res_partner_address_8invoice pricelist_id: 1 order_line: @@ -56,7 +55,7 @@ "company_address": { "__id": "base:5af1272e-dd26-11e0-b65e-701a04e25543.some_address", "__module": "base", - "__model": "res.partner.address", + "__model": "res.partner", "phone": "(+32).81.81.37.00", "street": "Chaussee de Namur 40", "city": "Gerompont", @@ -67,16 +66,7 @@ ], }, "partner_id": ["purchase:5af1272e-dd26-11e0-b65e-701a04e25543.res_partner_test20", "jones white"], - "partner_address": { - "__id": "base:5af1272e-dd26-11e0-b65e-701a04e25543.res_partner_address_7wdsjasdjh", - "__module": "base", - "__model": "res.partner.address", - "phone": "(+32).81.81.37.00", - "street": "Chaussee de Namur 40", - "city": "Gerompont", - "zip": "1367", - "country_id": ["base:5af1272e-dd26-11e0-b65e-701a04e25543.be", "Belgium"], - }, + "order_line": [{ "__id": "purchase:5af1272e-dd26-11e0-b65e-701a04e25543.purchase_order_line-AlhsVDZGoKvJ", "__module": "purchase", diff --git a/addons/sale/test/picking_order_policy.yml b/addons/sale/test/picking_order_policy.yml index a4f88c8c7ae..0d2a2e19a34 100644 --- a/addons/sale/test/picking_order_policy.yml +++ b/addons/sale/test/picking_order_policy.yml @@ -116,7 +116,6 @@ assert invoice.account_id.id == ac,"Invoice account is not correspond." assert invoice.reference == order.client_order_ref or order.name,"Reference is not correspond." assert invoice.partner_id.id == order.partner_id.id,"Customer is not correspond." - assert invoice.address_invoice_id.id == order.partner_invoice_id.id,"Invoice Address is not correspond." assert invoice.currency_id.id == order.pricelist_id.currency_id.id, "Currency is not correspond." assert invoice.comment == order.note or '',"Note is not correspond." assert invoice.journal_id.id in journal_ids,"Sales Journal is not link on Invoice." diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py index 45347a5e131..cfd19252d96 100644 --- a/addons/sale/wizard/sale_line_invoice.py +++ b/addons/sale/wizard/sale_line_invoice.py @@ -66,8 +66,6 @@ class sale_order_line_make_invoice(osv.osv_memory): 'reference': "P%dSO%d" % (order.partner_id.id, order.id), 'account_id': a, 'partner_id': order.partner_id.id, - 'address_invoice_id': order.partner_invoice_id.id, - 'address_contact_id': order.partner_invoice_id.id, 'invoice_line': [(6, 0, lines)], 'currency_id' : order.pricelist_id.currency_id.id, 'comment': order.note, diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py index cb9bb2fc5bd..b51fd9bcb93 100644 --- a/addons/sale/wizard/sale_make_invoice_advance.py +++ b/addons/sale/wizard/sale_make_invoice_advance.py @@ -92,8 +92,6 @@ class sale_advance_payment_inv(osv.osv_memory): 'reference': False, 'account_id': sale.partner_id.property_account_receivable.id, 'partner_id': sale.partner_id.id, - 'address_invoice_id': sale.partner_invoice_id.id, - 'address_contact_id': sale.partner_order_id.id, 'invoice_line': [(6, 0, create_ids)], 'currency_id': sale.pricelist_id.currency_id.id, 'comment': '',