[MERGE]

bzr revid: bde@tiny2-desktop-20110525044851-s1dvc75u9grpjbz0

addons/account_asset/account_asset.py

@@ -37,10 +37,22 @@ class account_asset_category(osv.osv):
         'account_expense_depreciation_id': fields.many2one('account.account', 'Depr. Expense Account', required=True),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True),
         'company_id': fields.many2one('res.company', 'Company', required=True),
+        'method': fields.selection([('linear','Linear'),('progressif','Progressive')], 'Computation method', required=True),
+        'method_delay': fields.integer('During (interval)'),
+        'method_period': fields.integer('Depre. all (period)'),
+        'method_progress_factor': fields.float('Progressif Factor'),
+        'method_time': fields.selection([('delay','Delay'),('end','Ending Period')], 'Time Method', required=True),
+        'prorata':fields.boolean('Prorata Temporis', help='Indicates that the accounting entries for this asset have to be done from the purchase date instead of the first January'),
+        'open_asset': fields.boolean('Skip Draft State', help="Check this if you want to automatically confirm the assets of this category when created by invoice."),
     }
 
     _defaults = {
         'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'account.asset.category', context=context),
+        'method': 'linear',
+        'method_delay': 5,
+        'method_time': 'delay',
+        'method_period': 12,
+        'method_progress_factor': 0.3,
     }
 
 account_asset_category()
@@ -124,7 +136,7 @@ class account_asset_asset(osv.osv):
 
     def validate(self, cr, uid, ids, context={}):
         return self.write(cr, uid, ids, {
-            'state':'normal'
+            'state':'open'
         }, context)
 
     def _amount_total(self, cr, uid, ids, name, args, context={}):
@@ -198,7 +210,21 @@ class account_asset_asset(osv.osv):
         'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'account.asset.asset',context=context),
     }
 
-
+    def onchange_category_id(self, cr, uid, ids, category_id, context=None):
+        res = {'value':{}}
+        asset_categ_obj = self.pool.get('account.asset.category')
+        if category_id:
+            category_obj = asset_categ_obj.browse(cr, uid, category_id, context=context)
+            res['value'] = {
+                            'method': category_obj.method, 
+                            'method_delay': category_obj.method_delay,
+                            'method_time': category_obj.method_time,
+                            'method_period': category_obj.method_period,
+                            'method_progress_factor': category_obj.method_progress_factor,
+                            'prorata': category_obj.prorata,
+            }
+        return res
+    
     def _compute_period(self, cr, uid, property, context={}):
         if (len(property.entry_asset_ids or [])/2)>=property.method_delay:
             return False
@@ -301,7 +327,7 @@ class account_asset_depreciation_line(osv.osv):
         'depreciated_value': fields.float('Amount Already Depreciated', required=True),
         'depreciation_date': fields.char('Depreciation Date', size=64, select=1),
         'move_id': fields.many2one('account.move', 'Depreciation Entry'),
-        'move_check': fields.function(_get_move_check, method=True, type='boolean', string='Move Included', store=True)
+        'move_check': fields.function(_get_move_check, method=True, type='boolean', string='Posted', store=True)
     }
 
     def create_move(self, cr, uid,ids, context=None):

addons/account_asset/account_asset_invoice.py

@@ -33,13 +33,20 @@ account_invoice()
 class account_invoice_line(osv.osv):
     _inherit = 'account.invoice.line'
     _columns = {
-        'asset_id': fields.many2one('account.asset.asset', 'Asset'),
+        'asset_category_id': fields.many2one('account.asset.category', 'Asset Category'),
     }
     def move_line_get_item(self, cr, uid, line, context={}):
+        asset_obj = self.pool.get('account.asset.asset')
         res = super(account_invoice_line, self).move_line_get_item(cr, uid, line, context)
-        res['asset_id'] = line.asset_id.id or False
-        if line.asset_id.id and (line.asset_id.state=='draft'):
-            self.pool.get('account.asset.asset').validate(cr, uid, [line.asset_id.id], context)
+        if line.asset_category_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.open_asset:
+                asset_obj.validate(cr, uid, [asset_id], context=context)
         return res
 account_invoice_line()
 

addons/account_asset/account_asset_invoice_view.xml

@@ -13,7 +13,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <field name="invoice_line_tax_id" position="before">
-                <field name="asset_id" context="name=name"/>
+                <field name="asset_category_id" context="name=name"/>
             </field>
         </field>
     </record>

addons/account_asset/account_asset_view.xml

@@ -15,6 +15,19 @@
                 <field name="account_asset_id"/>
                 <field name="account_depreciation_id"/>
                 <field name="account_expense_depreciation_id"/>
+                <group colspan="2" col="2">
+                    <separator string="Depreciation Dates" colspan="2" />
+                    <field name="method_time"/>
+                    <field name="method_delay"/>
+                    <field name="method_period" attrs="{'invisible':[('method_time','=','end')]}"/>                
+                </group>
+                <group colspan="2" col="2">
+                    <separator string="Depreciation Method" colspan="2" />
+                    <field name="method"/>
+                    <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')]}"/>
+                    <field name="prorata"/>
+                    <field name="open_asset"/>
+                </group>
         	<group col="4" colspan="4" groups="analytic.group_analytic_accounting">
         	    <separator string="Analytic information" colspan="4" />
         	    <newline/>
@@ -50,7 +63,7 @@
            <form string="Asset">
               <group col="6" colspan="4">
                  <field name="name" select="1"/>
-                 <field name="category_id" select="1"/>
+                 <field name="category_id" select="1" on_change="onchange_category_id(category_id)"/>
                  <field name="code" select="1"/>
                  <field name="purchase_value" select="1"/>
                  <field name="currency_id" select="1"/>
@@ -90,8 +103,8 @@
                     <newline/>
                  </page>
                  <page string="Depreciation board">
-                    <field name="depreciation_line_ids" colspan="4" nolabel="1" mode="tree,graph">
-                       <tree>
+                    <field name="depreciation_line_ids" colspan="4" nolabel="1" mode="tree,graph" >
+                       <tree colors="blue:(move_check == False);black:(move_check == True)">
                           <field name="depreciation_date"/>
                           <field name="sequence" invisible="1"/>
                           <field name="amount"/>
@@ -106,7 +119,7 @@
                           <field name="depreciated_value"/>
                        </graph>
                     </field>
-                    <button type="object" name="compute_depreciation_board" string="Compute" icon="terp-stock_format-scientific" colspan="2"/>
+                    <button type="object" attrs="{'invisible':[('state','&lt;&gt;','open')]}" name="compute_depreciation_board" string="Compute" icon="terp-stock_format-scientific" colspan="2"/>
                  </page>
                  <page string="History">
                     <field name="account_move_line_ids" colspan="4" nolabel="1" readonly="1"/>