openerp-dev-web team mailing list archive

["Ujjvala Collins \(OpenERP\)" <uco@xxxxxxxxxxx>]

Ujjvala Collins (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-account-asset-salvage_value-uco 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-salvage_value-uco/+merge/62453

[ADD] account_asset:
---------------------------------
-> Add .. one float field on asset for salvage value
-> Like we purchase property with 10000 Euro.. and put Salvage value= 1000 Euro.. and create depr. lines.. it will calculate using gross value - salvage (currently it directly use gross value.. )
-> To calculate depr. amount
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-salvage_value-uco/+merge/62453
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/trunk-account-asset-salvage_value-uco into lp:~openerp-dev/openobject-addons/trunk-account-asset.

=== modified file 'account_asset/account_asset.py'
--- account_asset/account_asset.py	2011-05-24 10:13:39 +0000
+++ account_asset/account_asset.py	2011-05-26 10:41:23 +0000
@@ -94,7 +94,7 @@
                 depreciation_lin_obj.unlink(cr, uid, old_depreciation_line_ids, context=context)
 
             undone_dotation_number = asset.method_delay - len(asset.account_move_line_ids)
-            residual_amount = asset.value_residual
+            residual_amount = asset.value_residual - asset.salvage_value
             depreciation_date = datetime.strptime(self._get_last_depreciation_date(cr, uid, [asset.id], context)[asset.id], '%Y-%m-%d')
             day = depreciation_date.day
             month = depreciation_date.month
@@ -104,7 +104,7 @@
                     amount = residual_amount
                 else:
                     if asset.method == 'linear':
-                        amount = asset.purchase_value / undone_dotation_number
+                        amount = (asset.purchase_value - asset.salvage_value) / undone_dotation_number
                     else:
                         amount = residual_amount * asset.method_progress_factor
                 residual_amount -= amount
@@ -172,6 +172,7 @@
         'prorata':fields.boolean('Prorata Temporis', Readonly="True", help='Indicates that the accounting entries for this asset have to be done from the purchase date instead of the first January'),
         'history_ids': fields.one2many('account.asset.history', 'asset_id', 'History', readonly=True),
         'depreciation_line_ids': fields.one2many('account.asset.depreciation.line', 'asset_id', 'Depreciation Lines', readonly=True,),
+        'salvage_value': fields.float('Salvage Value', digits=(16,2), required=True, help="It is the amount you plan to have that you can't depreciate."),
     }
     _defaults = {
         'code': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'account.asset.code'),

=== modified file 'account_asset/account_asset_view.xml'
--- account_asset/account_asset_view.xml	2011-05-24 10:13:39 +0000
+++ account_asset/account_asset_view.xml	2011-05-26 10:41:23 +0000
@@ -53,9 +53,10 @@
                  <field name="category_id" select="1"/>
                  <field name="code" select="1"/>
                  <field name="purchase_value" select="1"/>
+                 <field name="salvage_value"/>
+                 <field name="value_residual"/>
                  <field name="currency_id" select="1"/>
                  <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
-                 <field name="value_residual"/>
               </group>
               <notebook colspan="4">
                  <page string="Depreciation">