commit | 735576ab279a14dee2e0622c8214a7c169556e86 | [log] [tgz] |
---|---|---|
author | ruthra kumar <ruthra@erpnext.com> | Wed Jan 24 15:45:46 2024 +0530 |
committer | GitHub <noreply@github.com> | Wed Jan 24 15:45:46 2024 +0530 |
tree | 2fba0779db4d767b882f47a45e9537fc0d55fbc5 | |
parent | 6c8f52b26f0601135ec0dd1be94835951936cd11 [diff] | |
parent | 23199a3271412777663879071a684242d30d5e7f [diff] |
Merge branch 'develop' into dev_fix_payment_terms_status_for_sales_order_report
diff --git a/erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py b/erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py index 00acc80..72b7fa2 100644 --- a/erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py +++ b/erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py
@@ -210,7 +210,6 @@ .where( (so.docstatus == 1) & (so.status.isin(["To Deliver and Bill", "To Bill", "To Pay"])) - & (so.payment_terms_template != "NULL") & (so.company == conditions.company) & (so.transaction_date[conditions.start_date : conditions.end_date]) )