From 9a3f03efe77baa30a074b6ec43e43da05dee8989 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Tue, 15 Nov 2011 12:48:39 +0100 Subject: [PATCH] [REF] purchase, purchase_analytic_plans, account_anglo_saxon: changed name of function inv_line_create into prepare_inv_line bzr revid: qdp-launchpad@openerp.com-20111115114839-3359yjv7vw0t8krn --- addons/account_anglo_saxon/purchase.py | 4 ++-- addons/purchase/purchase.py | 6 +++--- addons/purchase_analytic_plans/purchase_analytic_plans.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/account_anglo_saxon/purchase.py b/addons/account_anglo_saxon/purchase.py index 19f24ce4277..b172fc11bbb 100644 --- a/addons/account_anglo_saxon/purchase.py +++ b/addons/account_anglo_saxon/purchase.py @@ -26,8 +26,8 @@ class purchase_order(osv.osv): _inherit = "purchase.order" _description = "Purchase Order" - def inv_line_create(self, cr, uid, account_id, order_line, context=None): - line = super(purchase_order, self).inv_line_create(cr, uid, account_id, order_line, context=context) + def prepare_inv_line(self, cr, uid, account_id, order_line, context=None): + line = super(purchase_order, self).prepare_inv_line(cr, uid, account_id, order_line, context=context) if ol.product_id and not ol.product_id.type == 'service': oa = ol.product_id.property_stock_account_input and ol.product_id.property_stock_account_input.id if not oa: diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index c9d72571dfc..4a52f669c49 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -320,7 +320,7 @@ class purchase_order(osv.osv): 'ref_doc1': 'purchase.order,%d' % (po.id,), }) - def inv_line_create(self, cr, uid, account_id, order_line, context=None): + def prepare_inv_line(self, cr, uid, account_id, order_line, context=None): """Collects require data from purchase order line that is used to create invoice line for that purchase order line :param account_id: Expense account of the product of PO line if any. @@ -373,7 +373,7 @@ class purchase_order(osv.osv): if not journal_ids: raise osv.except_osv(_('Error !'), _('There is no purchase journal defined for this company: "%s" (id:%d)') % (order.company_id.name, order.company_id.id)) - + # generate invoice line correspond to PO line and link that to created invoice (inv_id) and PO line inv_lines = [] for po_line in order.order_line: @@ -388,7 +388,7 @@ class purchase_order(osv.osv): fpos = order.fiscal_position or False acc_id = fiscal_obj.map_account(cr, uid, fpos, acc_id) - inv_line_data = self.inv_line_create(cr, uid, acc_id, po_line, context=context) + inv_line_data = self.prepare_inv_line(cr, uid, acc_id, po_line, context=context) inv_line_id = inv_line_obj.create(cr, uid, inv_line_data, context=context) inv_lines.append(inv_line_id) diff --git a/addons/purchase_analytic_plans/purchase_analytic_plans.py b/addons/purchase_analytic_plans/purchase_analytic_plans.py index 46d617431c2..27bf8019f5f 100644 --- a/addons/purchase_analytic_plans/purchase_analytic_plans.py +++ b/addons/purchase_analytic_plans/purchase_analytic_plans.py @@ -35,8 +35,8 @@ class purchase_order(osv.osv): _name='purchase.order' _inherit='purchase.order' - def inv_line_create(self, cr, uid, account_id, order_line, context=None): - res = super(purchase_order, self).inv_line_create(cr, uid, account_id, order_line, context=context) + def prepare_inv_line(self, cr, uid, account_id, order_line, context=None): + res = super(purchase_order, self).prepare_inv_line(cr, uid, account_id, order_line, context=context) res['analytics_id'] = order_line.analytics_id.id return res