|
@ -404,11 +404,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 += """ |
|
@ -418,11 +418,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 |
|
|