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

Merge PR #842 into 10.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2019-06-27 10:35:24 +00:00
parent f7a224bdad 7968310868
commit 641655aaa0
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account_asset_management_xls/__manifest__.py
View File

@@ -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',

16
account_asset_management_xls/i18n/account_asset_management_xls.pot
View File

@@ -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 ""

9
account_asset_management_xls/report/account_asset_report_xls.py
View File

@@ -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)