[MERGE] forward port of branch saas-3 up to d73eeab
This commit is contained in:
commit
33a8989d77
|
@ -171,17 +171,8 @@ class account_invoice_report(osv.osv):
|
||||||
WHEN ai.type::text = ANY (ARRAY['out_refund'::character varying::text, 'in_invoice'::character varying::text])
|
WHEN ai.type::text = ANY (ARRAY['out_refund'::character varying::text, 'in_invoice'::character varying::text])
|
||||||
THEN - ai.residual
|
THEN - ai.residual
|
||||||
ELSE ai.residual
|
ELSE ai.residual
|
||||||
END / CASE
|
END / (SELECT count(*) FROM account_invoice_line l where invoice_id = ai.id) *
|
||||||
WHEN (( SELECT count(l.id) AS count
|
count(*) AS residual,
|
||||||
FROM account_invoice_line l
|
|
||||||
LEFT JOIN account_invoice a ON a.id = l.invoice_id
|
|
||||||
WHERE a.id = ai.id)) <> 0
|
|
||||||
THEN ( SELECT count(l.id) AS count
|
|
||||||
FROM account_invoice_line l
|
|
||||||
LEFT JOIN account_invoice a ON a.id = l.invoice_id
|
|
||||||
WHERE a.id = ai.id)
|
|
||||||
ELSE 1::bigint
|
|
||||||
END::numeric AS residual,
|
|
||||||
ai.commercial_partner_id as commercial_partner_id,
|
ai.commercial_partner_id as commercial_partner_id,
|
||||||
partner.country_id
|
partner.country_id
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in New Issue