From e766f09533253fb837d3a2fc995d562b0c59bda3 Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Fri, 26 Oct 2018 18:06:55 +0200 Subject: [PATCH 1/3] fix report --- .../report/account_asset_report_xls.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 51406b54a..4dc35c46d 100644 --- a/account_asset_management_xls/report/account_asset_report_xls.py +++ b/account_asset_management_xls/report/account_asset_report_xls.py @@ -61,7 +61,7 @@ class AssetReportXlsx(AbstractReportXlsx): }, 'asset': { 'type': 'string', - 'value': self._render("asset.code or ''"), + 'value': self._render("asset.name"), }, 'width': 40, }, @@ -390,8 +390,11 @@ class AssetReportXlsx(AbstractReportXlsx): def _child_get(parent): assets = self.env['account.asset'] - children = parent.child_ids.filtered(lambda r: r.state != 'draft') - children = children.sorted(lambda r: (r.date_start, r.code)) + children = parent.child_ids.filtered( + lambda r: r.type == 'view' or + (r.type == 'normal' and r.state != 'draft')) + children = children.sorted( + lambda r: (r.date_start or '', r.code)) for child in children: assets += child assets += _child_get(child) From d0345fd8fbbad05d765923c6e42a5e74d6abb305 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Thu, 27 Jun 2019 09:59:34 +0000 Subject: [PATCH 2/3] [UPD] Update account_asset_management_xls.pot --- .../i18n/account_asset_management_xls.pot | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/account_asset_management_xls/i18n/account_asset_management_xls.pot b/account_asset_management_xls/i18n/account_asset_management_xls.pot index fa3b72f8c..40a8e4214 100644 --- a/account_asset_management_xls/i18n/account_asset_management_xls.pot +++ b/account_asset_management_xls/i18n/account_asset_management_xls.pot @@ -90,8 +90,8 @@ msgid "Depreciation Base" msgstr "" #. module: account_asset_management_xls -#: code:addons/account_asset_management_xls/report/account_asset_report_xls.py:612 -#: code:addons/account_asset_management_xls/report/account_asset_report_xls.py:616 +#: code:addons/account_asset_management_xls/report/account_asset_report_xls.py:615 +#: code:addons/account_asset_management_xls/report/account_asset_report_xls.py:619 #, python-format msgid "Depreciation Table error for asset %s !" msgstr "" @@ -216,26 +216,26 @@ msgid "Salvage Value" msgstr "" #. module: account_asset_management_xls -#: code:addons/account_asset_management_xls/report/account_asset_report_xls.py:418 +#: code:addons/account_asset_management_xls/report/account_asset_report_xls.py:421 #, python-format msgid "The 'account' field is a mandatory entry of the '_xls_acquisition_fields' list !" msgstr "" #. module: account_asset_management_xls -#: code:addons/account_asset_management_xls/report/account_asset_report_xls.py:517 +#: code:addons/account_asset_management_xls/report/account_asset_report_xls.py:520 #, python-format msgid "The 'account' field is a mandatory entry of the '_xls_active_fields' list !" msgstr "" #. module: account_asset_management_xls -#: code:addons/account_asset_management_xls/report/account_asset_report_xls.py:736 +#: code:addons/account_asset_management_xls/report/account_asset_report_xls.py:739 #, python-format msgid "The 'account' field is a mandatory entry of the '_xls_removal_fields' list !" msgstr "" #. module: account_asset_management_xls -#: code:addons/account_asset_management_xls/report/account_asset_report_xls.py:527 -#: code:addons/account_asset_management_xls/report/account_asset_report_xls.py:746 +#: code:addons/account_asset_management_xls/report/account_asset_report_xls.py:530 +#: code:addons/account_asset_management_xls/report/account_asset_report_xls.py:749 #, python-format msgid "The current version of the asset mangement reporting module supports only fiscal year based reports." msgstr "" @@ -253,7 +253,7 @@ msgid "Totals" msgstr "" #. module: account_asset_management_xls -#: code:addons/account_asset_management_xls/report/account_asset_report_xls.py:605 +#: code:addons/account_asset_management_xls/report/account_asset_report_xls.py:608 #, python-format msgid "You can not report on a Fiscal Year with unposted entries in prior years. Please post depreciation table entry dd. '%s' of asset '%s' !" msgstr "" From 7968310868a6a5a3844f25dd07c7aecce17801eb Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Thu, 27 Jun 2019 10:35:24 +0000 Subject: [PATCH 3/3] account_asset_management_xls 10.0.1.0.1 --- account_asset_management_xls/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_asset_management_xls/__manifest__.py b/account_asset_management_xls/__manifest__.py index 5a4039a72..66cc75929 100644 --- a/account_asset_management_xls/__manifest__.py +++ b/account_asset_management_xls/__manifest__.py @@ -4,7 +4,7 @@ { 'name': 'Assets Management Excel reporting', - 'version': '10.0.1.0.0', + 'version': '10.0.1.0.1', 'license': 'AGPL-3', 'author': "Noviat,Odoo Community Association (OCA)", 'category': 'Accounting & Finance',