odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] merged asset enhancement: prorata feature on degressive method 

bzr revid: qdp-launchpad@openerp.com-20110915165000-h9kxm198ee8jhexm
This commit is contained in:
Quentin (OpenERP) 2011-09-15 18:50:00 +02:00
parent 884d5ad5c0 f599d2a138
commit f0d47c5d30
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/account_asset/account_asset.py
View File

@ -112,6 +112,12 @@ class account_asset_asset(osv.osv):
amount = (amount_to_depr / asset.method_number) / total_days * (total_days - days)
elif asset.method == 'degressive':
amount = residual_amount * asset.method_progress_factor
if asset.prorata:
days = total_days - float(depreciation_date.strftime('%j'))
if i == 1:
amount = (residual_amount * asset.method_progress_factor) / total_days * days
elif i == undone_dotation_number:
amount = (residual_amount * asset.method_progress_factor) / total_days * (total_days - days)
return amount
def _compute_board_undone_dotation_nb(self, cr, uid, asset, depreciation_date, total_days, context=None):
@ -242,13 +248,13 @@ class account_asset_asset(osv.osv):
def _check_prorata(self, cr, uid, ids, context=None):
for asset in self.browse(cr, uid, ids, context=context):
if asset.prorata and (asset.method != 'linear' or asset.method_time != 'number'):
if asset.prorata and asset.method_time != 'number':
return False
return True
_constraints = [
(_check_recursion, 'Error ! You can not create recursive assets.', ['parent_id']),
(_check_prorata, 'Prorata temporis can be applied only for computation method "linear" and time method "number of depreciations".', ['prorata']),
(_check_prorata, 'Prorata temporis can be applied only for time method "number of depreciations".', ['prorata']),
]
def onchange_category_id(self, cr, uid, ids, category_id, context=None):
@ -267,9 +273,9 @@ class account_asset_asset(osv.osv):
}
return res
def onchange_method_time(self, cr, uid, ids, method='linear', method_time='number', context=None):
def onchange_method_time(self, cr, uid, ids, method_time='number', context=None):
res = {'value': {}}
if method != 'linear' or method_time != 'number':
if method_time != 'number':
res['value'] = {'prorata': False}
return res

6
addons/account_asset/account_asset_view.xml
View File

@ -29,7 +29,7 @@
<separator string="Depreciation Method" colspan="2"/>
<field name="method"/>
<field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
<field name="prorata" attrs="{'invisible':[('method','&lt;&gt;','linear')]}"/>
<field name="prorata"/>
<field name="open_asset"/>
</group>
<group col="2" colspan="2" groups="analytic.group_analytic_accounting">
@ -109,9 +109,9 @@
</group>
<group colspan="2" col="2">
<separator string="Depreciation Method" colspan="2"/>
<field name="method" on_change="onchange_method_time(method)"/>
<field name="method"/>
<field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
<field name="prorata" attrs="{'invisible': ['|',('method_time','=','end'),('method','!=','linear')]}"/>
<field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
</group>
<newline/>
<separator string="" colspan="4"/>