From cd1693262cbf7ba0883f064c098cf4f6224290c1 Mon Sep 17 00:00:00 2001 From: bde Date: Fri, 3 Jun 2011 15:39:39 +0530 Subject: [PATCH 1/3] =?UTF-8?q?[IMP]=20optimized=20account=20invoice=20and?= =?UTF-8?q?=20removed=20=C2=B5=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bzr revid: bde@tiny2-desktop-20110603100939-ws1p1yjqd61ktidv --- addons/account_asset/account_asset_invoice.py | 15 ++++++++------- addons/account_asset/µ | 12 ------------ 2 files changed, 8 insertions(+), 19 deletions(-) delete mode 100755 addons/account_asset/µ diff --git a/addons/account_asset/account_asset_invoice.py b/addons/account_asset/account_asset_invoice.py index 8fbcd4053a2..17e167d5be9 100755 --- a/addons/account_asset/account_asset_invoice.py +++ b/addons/account_asset/account_asset_invoice.py @@ -1,6 +1,6 @@ # -*- encoding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,17 +15,17 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## from osv import osv, fields -import time + class account_invoice(osv.osv): _inherit = 'account.invoice' - def line_get_convert(self, cr, uid, x, part, date, context={}): - res = super(account_invoice, self).line_get_convert(cr, uid, x, part, date, context) + def line_get_convert(self, cr, uid, x, part, date, context=None): + res = super(account_invoice, self).line_get_convert(cr, uid, x, part, date, context=context) res['asset_id'] = x.get('asset_id', False) return res account_invoice() @@ -35,9 +35,9 @@ class account_invoice_line(osv.osv): _columns = { 'asset_category_id': fields.many2one('account.asset.category', 'Asset Category'), } - def move_line_get_item(self, cr, uid, line, context={}): + def move_line_get_item(self, cr, uid, line, context=None): asset_obj = self.pool.get('account.asset.asset') - res = super(account_invoice_line, self).move_line_get_item(cr, uid, line, context) + res = super(account_invoice_line, self).move_line_get_item(cr, uid, line, context=context) if line.invoice_id and line.invoice_id.type not in ('out_invoice', 'out_refund') and line.asset_category_id: vals = { 'name': line.product_id and (line.name + ": " + line.product_id.name) or line.name, @@ -52,6 +52,7 @@ class account_invoice_line(osv.osv): if line.asset_category_id.open_asset: asset_obj.validate(cr, uid, [asset_id], context=context) return res + account_invoice_line() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_asset/µ b/addons/account_asset/µ deleted file mode 100755 index 77f0083048b..00000000000 --- a/addons/account_asset/µ +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - From 042007168800d2e603f479bb6dce5456135b9b19 Mon Sep 17 00:00:00 2001 From: bde Date: Fri, 3 Jun 2011 15:54:12 +0530 Subject: [PATCH 2/3] [IMP] removed extra space bzr revid: bde@tiny2-desktop-20110603102412-cc724unw1qklxas5 --- addons/account_asset/account_asset_invoice.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/account_asset/account_asset_invoice.py b/addons/account_asset/account_asset_invoice.py index 17e167d5be9..bf4df4faacd 100755 --- a/addons/account_asset/account_asset_invoice.py +++ b/addons/account_asset/account_asset_invoice.py @@ -56,4 +56,3 @@ class account_invoice_line(osv.osv): account_invoice_line() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - From a361ddda6d9ad683938b175a742cd3c6a5f60658 Mon Sep 17 00:00:00 2001 From: bde Date: Fri, 3 Jun 2011 18:47:44 +0530 Subject: [PATCH 3/3] [CLEANING] cleaned the account asset invoice bzr revid: bde@tiny2-desktop-20110603131744-n80rh7hsoaihx8jo --- addons/account_asset/account_asset_invoice.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/account_asset/account_asset_invoice.py b/addons/account_asset/account_asset_invoice.py index bf4df4faacd..167502cb09f 100755 --- a/addons/account_asset/account_asset_invoice.py +++ b/addons/account_asset/account_asset_invoice.py @@ -2,7 +2,7 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# Copyright (C) 2004-2009 Tiny SPRL (). +# Copyright (C) 2004-2010 Tiny SPRL (). # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -21,20 +21,23 @@ from osv import osv, fields - class account_invoice(osv.osv): + _inherit = 'account.invoice' def line_get_convert(self, cr, uid, x, part, date, context=None): res = super(account_invoice, self).line_get_convert(cr, uid, x, part, date, context=context) res['asset_id'] = x.get('asset_id', False) return res + account_invoice() class account_invoice_line(osv.osv): + _inherit = 'account.invoice.line' _columns = { 'asset_category_id': fields.many2one('account.asset.category', 'Asset Category'), } + def move_line_get_item(self, cr, uid, line, context=None): asset_obj = self.pool.get('account.asset.asset') res = super(account_invoice_line, self).move_line_get_item(cr, uid, line, context=context)