Khalid Hazam
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
12 deletions
-
partner_statement/report/activity_statement.py
|
|
@ -64,12 +64,7 @@ class ActivityStatement(models.AbstractModel): |
|
|
THEN l.name |
|
|
THEN l.name |
|
|
ELSE '/' |
|
|
ELSE '/' |
|
|
END as name, |
|
|
END as name, |
|
|
CASE WHEN (aj.type IN ('sale', 'purchase')) |
|
|
|
|
|
THEN l.ref |
|
|
|
|
|
WHEN (aj.type in ('bank', 'cash')) |
|
|
|
|
|
THEN 'Payment' |
|
|
|
|
|
ELSE '' |
|
|
|
|
|
END as ref, |
|
|
|
|
|
|
|
|
l.ref as ref, |
|
|
l.blocked, l.currency_id, l.company_id, |
|
|
l.blocked, l.currency_id, l.company_id, |
|
|
CASE WHEN (l.currency_id is not null AND l.amount_currency > 0.0) |
|
|
CASE WHEN (l.currency_id is not null AND l.amount_currency > 0.0) |
|
|
THEN sum(l.amount_currency) |
|
|
THEN sum(l.amount_currency) |
|
|
@ -97,12 +92,7 @@ class ActivityStatement(models.AbstractModel): |
|
|
THEN l.name |
|
|
THEN l.name |
|
|
ELSE '/' |
|
|
ELSE '/' |
|
|
END, |
|
|
END, |
|
|
CASE WHEN (aj.type IN ('sale', 'purchase')) |
|
|
|
|
|
THEN l.ref |
|
|
|
|
|
WHEN (aj.type in ('bank', 'cash')) |
|
|
|
|
|
THEN 'Payment' |
|
|
|
|
|
ELSE '' |
|
|
|
|
|
END, |
|
|
|
|
|
|
|
|
l.ref, |
|
|
l.blocked, l.currency_id, l.amount_currency, l.company_id |
|
|
l.blocked, l.currency_id, l.amount_currency, l.company_id |
|
|
""", locals()), "utf-8") |
|
|
""", locals()), "utf-8") |
|
|
|
|
|
|
|
|
|
