Skip to content

Commit

Permalink
fix: allow to create sales order from expired quotation (frappe#33582)
Browse files Browse the repository at this point in the history
fix: allow to create sales order from expired quotation (frappe#33582)

(cherry picked from commit dceef03)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
  • Loading branch information
mergify[bot] and barredterra authored Jan 16, 2023
1 parent eef0f45 commit 2f81f15
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 12 deletions.
9 changes: 1 addition & 8 deletions erpnext/selling/doctype/quotation/quotation.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,14 +191,7 @@ def get_list_context(context=None):


@frappe.whitelist()
def make_sales_order(source_name, target_doc=None):
quotation = frappe.db.get_value(
"Quotation", source_name, ["transaction_date", "valid_till"], as_dict=1
)
if quotation.valid_till and (
quotation.valid_till < quotation.transaction_date or quotation.valid_till < getdate(nowdate())
):
frappe.throw(_("Validity period of this quotation has ended."))
def make_sales_order(source_name: str, target_doc=None):
return _make_sales_order(source_name, target_doc)


Expand Down
11 changes: 7 additions & 4 deletions erpnext/selling/doctype/quotation/test_quotation.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,17 +118,20 @@ def test_make_sales_order_with_terms(self):
sales_order.payment_schedule[1].due_date, getdate(add_days(quotation.transaction_date, 30))
)

def test_valid_till(self):
from erpnext.selling.doctype.quotation.quotation import make_sales_order

def test_valid_till_before_transaction_date(self):
quotation = frappe.copy_doc(test_records[0])
quotation.valid_till = add_days(quotation.transaction_date, -1)
self.assertRaises(frappe.ValidationError, quotation.validate)

def test_so_from_expired_quotation(self):
from erpnext.selling.doctype.quotation.quotation import make_sales_order

quotation = frappe.copy_doc(test_records[0])
quotation.valid_till = add_days(nowdate(), -1)
quotation.insert()
quotation.submit()
self.assertRaises(frappe.ValidationError, make_sales_order, quotation.name)

make_sales_order(quotation.name)

def test_shopping_cart_without_website_item(self):
if frappe.db.exists("Website Item", {"item_code": "_Test Item Home Desktop 100"}):
Expand Down

0 comments on commit 2f81f15

Please sign in to comment.