Browse Source
[FIX] account_financial_report_qweb: date condition in open items report.
This commit includes move lines on the report date by default. These lines shouldn't be considered in the futur.
pull/359/head
Adrien Peiffer (ACSONE)
7 years ago
No known key found for this signature in database
GPG Key ID: D71294F474342C2
1 changed files with
4 additions and
4 deletions
-
account_financial_report_qweb/report/open_items.py
|
|
@ -387,11 +387,11 @@ FROM |
|
|
LEFT JOIN |
|
|
LEFT JOIN |
|
|
account_move_line ml_future |
|
|
account_move_line ml_future |
|
|
ON ml.balance < 0 AND pr.debit_move_id = ml_future.id |
|
|
ON ml.balance < 0 AND pr.debit_move_id = ml_future.id |
|
|
AND ml_future.date >= %s |
|
|
|
|
|
|
|
|
AND ml_future.date > %s |
|
|
LEFT JOIN |
|
|
LEFT JOIN |
|
|
account_move_line ml_past |
|
|
account_move_line ml_past |
|
|
ON ml.balance < 0 AND pr.debit_move_id = ml_past.id |
|
|
ON ml.balance < 0 AND pr.debit_move_id = ml_past.id |
|
|
AND ml_past.date < %s |
|
|
|
|
|
|
|
|
AND ml_past.date <= %s |
|
|
""" |
|
|
""" |
|
|
else: |
|
|
else: |
|
|
sub_query += """ |
|
|
sub_query += """ |
|
|
@ -401,11 +401,11 @@ FROM |
|
|
LEFT JOIN |
|
|
LEFT JOIN |
|
|
account_move_line ml_future |
|
|
account_move_line ml_future |
|
|
ON ml.balance > 0 AND pr.credit_move_id = ml_future.id |
|
|
ON ml.balance > 0 AND pr.credit_move_id = ml_future.id |
|
|
AND ml_future.date >= %s |
|
|
|
|
|
|
|
|
AND ml_future.date > %s |
|
|
LEFT JOIN |
|
|
LEFT JOIN |
|
|
account_move_line ml_past |
|
|
account_move_line ml_past |
|
|
ON ml.balance > 0 AND pr.credit_move_id = ml_past.id |
|
|
ON ml.balance > 0 AND pr.credit_move_id = ml_past.id |
|
|
AND ml_past.date < %s |
|
|
|
|
|
|
|
|
AND ml_past.date <= %s |
|
|
""" |
|
|
""" |
|
|
sub_query += """ |
|
|
sub_query += """ |
|
|
WHERE |
|
|
WHERE |
|
|
|
