Bharat Devnani (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-account-asset-improve-bde into lp:~openerp-dev/openobject-addons/trunk-account-asset.
Requested reviews: OpenERP R&D Team (openerp-dev) For more details, see: https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-improve-bde/+merge/63358 Hello Sir, Improved the asset invoice and also removed µ file. Thanks & Regards, Devnani Bharat R. -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-improve-bde/+merge/63358 Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/trunk-account-asset-improve-bde into lp:~openerp-dev/openobject-addons/trunk-account-asset.
=== modified file 'account_asset/account_asset_invoice.py' --- account_asset/account_asset_invoice.py 2011-05-27 13:38:54 +0000 +++ account_asset/account_asset_invoice.py 2011-06-03 10:13:28 +0000 @@ -1,6 +1,6 @@ # -*- encoding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). # @@ -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 <http://www.gnu.org/licenses/>. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## 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 @@ _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 @@ 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: === removed file 'account_asset/µ' --- account_asset/µ 2011-03-30 13:25:27 +0000 +++ account_asset/µ 1970-01-01 00:00:00 +0000 @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<openerp> - <data> - <report - auto="false" - id="account_asset_report_view" - model="account.asset.asset" - name="entry.ids" - string="Entries" /> - - </data> -</openerp>
_______________________________________________ Mailing list: https://launchpad.net/~openerp-dev-gtk Post to : [email protected] Unsubscribe : https://launchpad.net/~openerp-dev-gtk More help : https://help.launchpad.net/ListHelp
