From 1c2848b5653b2af384bc0ce5e833a2aa5fe2b34c Mon Sep 17 00:00:00 2001 From: luc-demeyer Date: Tue, 20 Jan 2015 22:16:25 +0100 Subject: [PATCH 1/3] asset mgt fixes --- account_asset_management/__openerp__.py | 2 +- account_asset_management/account_asset.py | 2 +- .../account_asset_view.xml | 4 +-- .../report/account_asset_report_xls.py | 27 ++++++++++++++++--- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/account_asset_management/__openerp__.py b/account_asset_management/__openerp__.py index 9b2fc1b6a..b6a23442b 100644 --- a/account_asset_management/__openerp__.py +++ b/account_asset_management/__openerp__.py @@ -22,7 +22,7 @@ ############################################################################## { 'name': 'Assets Management', - 'version': '2.3', + 'version': '2.4', 'depends': ['account'], 'conflicts': ['account_asset'], 'author': 'OpenERP & Noviat', diff --git a/account_asset_management/account_asset.py b/account_asset_management/account_asset.py index 4e9fa5a17..de12154a0 100644 --- a/account_asset_management/account_asset.py +++ b/account_asset_management/account_asset.py @@ -1541,7 +1541,7 @@ class account_asset_depreciation_line(orm.Model): "FROM account_asset_depreciation_line " "WHERE asset_id = %s " "AND (init_entry=TRUE OR move_check=TRUE)" - "AND line_date >= %s LIMIT 1", + "AND line_date > %s LIMIT 1", (dl.asset_id.id, vals['line_date'])) res = cr.fetchone() if res: diff --git a/account_asset_management/account_asset_view.xml b/account_asset_management/account_asset_view.xml index 879e0c645..d23d8e063 100644 --- a/account_asset_management/account_asset_view.xml +++ b/account_asset_management/account_asset_view.xml @@ -31,7 +31,7 @@ - + @@ -144,7 +144,7 @@ - + diff --git a/account_asset_management_xls/report/account_asset_report_xls.py b/account_asset_management_xls/report/account_asset_report_xls.py index f21800afe..35ffe886f 100644 --- a/account_asset_management_xls/report/account_asset_report_xls.py +++ b/account_asset_management_xls/report/account_asset_report_xls.py @@ -657,10 +657,29 @@ class asset_report_xls(report_xls): error_name = asset.name if asset.code: error_name += ' (' + asset.code + ')' or '' - raise orm.except_orm( - _('Data Error'), - _("Depreciation Table error for asset %s !") - % error_name) + if asset.state in ['open']: + cr.execute( + "SELECT line_date " + "FROM account_asset_depreciation_line " + "WHERE asset_id = %s AND type = 'depreciate' " + "AND init_entry=FALSE AND move_check=FALSe " + "AND line_date < %s" + "ORDER BY line_date ASC LIMIT 1", + (data[0], fy.date_start)) + res = cr.fetchone() + if res: + raise orm.except_orm( + _('Data Error'), + _("You can not report on a Fiscal Year " + "with unposted entries in prior years. " + "Please post depreciation table entry " + "dd. '%s' of asset '%s' !") + % (res[0], error_name)) + else: + raise orm.except_orm( + _('Data Error'), + _("Depreciation Table error for asset %s !") + % error_name) asset.fy_start_value = asset.asset_value - value_depreciated # fy_end_value From 25e61e3516062794484003361e234e8b80d99fca Mon Sep 17 00:00:00 2001 From: luc-demeyer Date: Thu, 22 Jan 2015 11:46:55 +0100 Subject: [PATCH 2/3] FALSe -> FALSE --- account_asset_management_xls/report/account_asset_report_xls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_asset_management_xls/report/account_asset_report_xls.py b/account_asset_management_xls/report/account_asset_report_xls.py index 35ffe886f..55977992d 100644 --- a/account_asset_management_xls/report/account_asset_report_xls.py +++ b/account_asset_management_xls/report/account_asset_report_xls.py @@ -662,7 +662,7 @@ class asset_report_xls(report_xls): "SELECT line_date " "FROM account_asset_depreciation_line " "WHERE asset_id = %s AND type = 'depreciate' " - "AND init_entry=FALSE AND move_check=FALSe " + "AND init_entry=FALSE AND move_check=FALSE " "AND line_date < %s" "ORDER BY line_date ASC LIMIT 1", (data[0], fy.date_start)) From 77b29e702fda70eb8678aafaa21fa6f260c54dd4 Mon Sep 17 00:00:00 2001 From: luc-demeyer Date: Thu, 22 Jan 2015 15:27:28 +0100 Subject: [PATCH 3/3] fix asset mgt xls --- .../report/account_asset_report_xls.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/account_asset_management_xls/report/account_asset_report_xls.py b/account_asset_management_xls/report/account_asset_report_xls.py index 55977992d..859c08471 100644 --- a/account_asset_management_xls/report/account_asset_report_xls.py +++ b/account_asset_management_xls/report/account_asset_report_xls.py @@ -675,6 +675,11 @@ class asset_report_xls(report_xls): "Please post depreciation table entry " "dd. '%s' of asset '%s' !") % (res[0], error_name)) + else: + raise orm.except_orm( + _('Data Error'), + _("Depreciation Table error for asset %s !") + % error_name) else: raise orm.except_orm( _('Data Error'),