From fea906b883060fecaaf7fbdc95f5c1a97ea5d847 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 4 Apr 2024 15:25:46 +0530 Subject: [PATCH 1/2] fix: Don't set delivery date as today while making SO from Quotation (cherry picked from commit fec20decc109ff1965fa2afe592f57113482cd73) --- erpnext/selling/doctype/quotation/quotation.py | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py index 62cca80837e..f9442204df1 100644 --- a/erpnext/selling/doctype/quotation/quotation.py +++ b/erpnext/selling/doctype/quotation/quotation.py @@ -384,7 +384,6 @@ def _make_sales_order(source_name, target_doc=None, customer_group=None, ignore_ ) target.flags.ignore_permissions = ignore_permissions - target.delivery_date = nowdate() target.run_method("set_missing_values") target.run_method("calculate_taxes_and_totals") From 0ee91a2e541b59146a333fde7248c1e2eee2a797 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 11 Apr 2024 11:01:28 +0530 Subject: [PATCH 2/2] fix: test cases (cherry picked from commit 65c74fa3c7197f0e751ba62abe1f63c8e7735147) --- erpnext/selling/doctype/quotation/test_quotation.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erpnext/selling/doctype/quotation/test_quotation.py b/erpnext/selling/doctype/quotation/test_quotation.py index b901240bcdb..7b66b7a251a 100644 --- a/erpnext/selling/doctype/quotation/test_quotation.py +++ b/erpnext/selling/doctype/quotation/test_quotation.py @@ -122,6 +122,7 @@ class TestQuotation(FrappeTestCase): sales_order.naming_series = "_T-Quotation-" sales_order.transaction_date = nowdate() + sales_order.delivery_date = nowdate() sales_order.insert() def test_make_sales_order_with_terms(self): @@ -152,6 +153,7 @@ class TestQuotation(FrappeTestCase): sales_order.naming_series = "_T-Quotation-" sales_order.transaction_date = nowdate() + sales_order.delivery_date = nowdate() sales_order.insert() # Remove any unknown taxes if applied