audrius/account-financial-tools
1
0
Fork 0
mirror of https://github.com/OCA/account-financial-tools.git synced 2025-02-02 12:47:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

early removal bugfix

Browse Source
This commit is contained in:
luc-demeyer
2014-12-15 18:32:40 +01:00
parent d02a73afbf
commit 2fd3a41be8
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
account_asset_management/account_asset.py
View File

@@ -79,10 +79,10 @@ class account_asset_category(orm.Model):
'account.account', 'Depr. Expense Account', required=True,
domain=[('type', '=', 'other')]),
'account_plus_value_id': fields.many2one(
'account.account', 'Plus-Value Account', required=True,
'account.account', 'Plus-Value Account',
domain=[('type', '=', 'other')]),
'account_min_value_id': fields.many2one(
'account.account', 'Min-Value Account', required=True,
'account.account', 'Min-Value Account',
domain=[('type', '=', 'other')]),
'account_residual_value_id': fields.many2one(
'account.account', 'Residual Value Account',
@@ -868,7 +868,8 @@ class account_asset_asset(orm.Model):
cr.execute(
"SELECT COALESCE(SUM(amount),0.0) AS amount "
"FROM account_asset_depreciation_line "
"WHERE asset_id in %s AND type='depreciate' "
"WHERE asset_id in %s "
"AND type in ('depreciate','remove') "
"AND (init_entry=TRUE OR move_check=TRUE)",
(tuple(child_ids),))
value_depreciated = cr.fetchone()[0]
@@ -921,7 +922,7 @@ class account_asset_asset(orm.Model):
def _get_assets_from_dl(self, cr, uid, ids, context=None):
asset_ids = []
for dl in filter(
lambda x: x.type == 'depreciate' and
lambda x: x.type in ['depreciate', 'remove'] and
(x.init_entry or x.move_id),
self.pool.get('account.asset.depreciation.line').browse(
cr, uid, ids, context=context)):

2
account_asset_management/wizard/account_asset_remove.py
View File

@@ -325,7 +325,7 @@ class account_asset_remove(orm.TransientModel):
# create asset line
asset_line_vals = {
'amount': asset.asset_value,
'amount': residual_value,
'asset_id': asset_id,
'name': line_name,
'line_date': wiz_data.date_remove,