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 #1165 into 12.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2021-04-23 17:56:33 +00:00
parent 83d2bef876 0f7a66282d
commit 101625b6b3
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
account_asset_management/report/account_asset_report_xls.py
View File

@@ -441,7 +441,8 @@ class AssetReportXlsx(models.AbstractModel):
else:
group_assets = assets
group_assets = group_assets.sorted(
lambda r: (r.date_start or '', r.code))
lambda r: (r.date_start or "", r.code or "", r.name)
)
grouped_assets[group] = {'assets': group_assets}
for child in group.child_ids:
self._group_assets(assets, child, grouped_assets[group])

7
account_asset_management/tests/test_asset_management_xls.py
View File

@@ -23,8 +23,11 @@ class TestAssetManagementXls(SavepointCase):
cls._load('account_asset_management', 'tests',
'account_asset_test_data.xml')
# Ensure we have something to report on
cls.env.ref('account_asset_management.'
'account_asset_asset_ict0').validate()
asset = cls.env.ref(
'account_asset_management.account_asset_asset_ict0')
asset.validate()
asset2 = asset.copy({"code": False})
asset2.validate()
module = __name__.split('addons.')[1].split('.')[0]
cls.xls_report_name = '{}.asset_report_xls'.format(module)
cls.wiz_model = cls.env['wiz.account.asset.report']