X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Faccount_asset%2Faccount_asset_invoice.py;h=700832881c4c1409aab583a2289312d4324ecb94;hb=refs%2Ftags%2F6.1.1-addons;hp=e6c5d03dd66ebac62a01c3f68346bb23fc683d8f;hpb=2c05c96a408a9eea0065dcd7f81143b1e5368d7d;p=odoo%2Fodoo.git

diff --git a/addons/account_asset/account_asset_invoice.py b/addons/account_asset/account_asset_invoice.py
old mode 100755
new mode 100644
index e6c5d03..7008328
--- a/addons/account_asset/account_asset_invoice.py
+++ b/addons/account_asset/account_asset_invoice.py
@@ -1,8 +1,8 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -15,40 +15,56 @@
 #    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 action_number(self, cr, uid, ids, *args):
+        result = super(account_invoice, self).action_number(cr, uid, ids, *args)
+        for inv in self.browse(cr, uid, ids):
+            self.pool.get('account.invoice.line').asset_create(cr, uid, inv.invoice_line)
+        return result
+
+    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={}):
+    def asset_create(self, cr, uid, lines, context=None):
+        context = context or {}
         asset_obj = self.pool.get('account.asset.asset')
-        res = super(account_invoice_line, self).move_line_get_item(cr, uid, line, context)
-        if line.asset_category_id and line.asset_category_id.id:
-            vals = {
-                'name': line.product_id and (line.name + ": " + line.product_id.name) or line.name,
-                'category_id': line.asset_category_id.id,
-                'purchase_value': line.price_subtotal
-            }
-            asset_id = asset_obj.create(cr, uid, vals, context=context)
-            if line.asset_category_id.asset_normal:
-                asset_obj.validate(cr, uid, [asset_id], context=context)
-        return res
+        for line in lines:
+            if line.asset_category_id:
+                vals = {
+                    'name': line.name,
+                    'code': line.invoice_id.number or False,
+                    'category_id': line.asset_category_id.id,
+                    'purchase_value': line.price_subtotal,
+                    'period_id': line.invoice_id.period_id.id,
+                    'partner_id': line.invoice_id.partner_id.id,
+                    'company_id': line.invoice_id.company_id.id,
+                    'currency_id': line.invoice_id.currency_id.id,
+                }
+                changed_vals = asset_obj.onchange_category_id(cr, uid, [], vals['category_id'], context=context)
+                vals.update(changed_vals['value'])
+                asset_id = asset_obj.create(cr, uid, vals, context=context)
+                if line.asset_category_id.open_asset:
+                    asset_obj.validate(cr, uid, [asset_id], context=context)
+        return True
+
 account_invoice_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-