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

fix report

Browse Source
This commit is contained in:
Luc De Meyer
2018-10-26 18:06:55 +02:00
committed by Benoit Aimont
parent f7a224bdad
commit e766f09533
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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)