Merge PR #1007 into 14.0

Signed-off-by AaronHForgeFlow
pull/1009/head
OCA-git-bot 2023-02-10 10:34:16 +00:00
commit 607b13403e
1 changed files with 5 additions and 2 deletions

View File

@ -159,8 +159,11 @@ class ActivityStatement(models.AbstractModel):
AND %(date_start)s <= l.date AND %(date_start)s <= l.date
AND l.date <= %(date_end)s AND l.date <= %(date_end)s
AND m.state IN ('posted') AND m.state IN ('posted')
GROUP BY l.partner_id, m.name, l.date, l.date_maturity, l.name, GROUP BY l.partner_id, m.name, l.date, l.date_maturity,
aj.type, case_ref, l.blocked, l.currency_id, l.company_id CASE WHEN (aj.type IN ('sale', 'purchase'))
THEN l.name
ELSE '/'
END, case_ref, l.blocked, l.currency_id, l.company_id
""", """,
locals(), locals(),
), ),