Merge PR #1156 into 13.0

Signed-off-by JordiBForgeFlow
This commit is contained in:
OCA-git-bot
2021-04-14 14:40:33 +00:00

View File

@@ -420,7 +420,9 @@ class AssetReportXlsx(models.AbstractModel):
group_assets = assets.filtered(lambda r: group in r.group_ids)
else:
group_assets = assets
group_assets = group_assets.sorted(lambda r: (r.date_start or "", r.code))
group_assets = group_assets.sorted(
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])