schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #33732 from frappe/mergify/bp/version-13-hotfix/pr-33723

Browse Source 
fix: don't add template item in sales/purchase transaction (backport #33723)
This commit is contained in:
rohitwaghchaure
2023-01-20 08:30:41 +05:30
committed by GitHub
parent 40ab5b034c b702a02f61
commit 61d06dd702
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/buying/doctype/purchase_order/test_purchase_order.py
View File

@@ -1239,6 +1239,11 @@ class TestPurchaseOrder(FrappeTestCase):
automatically_fetch_payment_terms(enable=0) automatically_fetch_payment_terms(enable=0)
def test_variant_item_po(self):
po = create_purchase_order(item_code="_Test Variant Item", qty=1, rate=100, do_not_save=1)
self.assertRaises(frappe.ValidationError, po.save)
def make_pr_against_po(po, received_qty=0): def make_pr_against_po(po, received_qty=0):
pr = make_purchase_receipt(po) pr = make_purchase_receipt(po)
@@ -1342,8 +1347,8 @@ def create_purchase_order(**args):
}, },
) )
po.set_missing_values()
if not args.do_not_save: if not args.do_not_save:
po.set_missing_values()
po.insert() po.insert()
if not args.do_not_submit: if not args.do_not_submit:
if po.is_subcontracted == "Yes": if po.is_subcontracted == "Yes":

6
erpnext/stock/get_item_details.py
View File

@@ -226,8 +226,10 @@ def validate_item_details(args, item):
validate_end_of_life(item.name, item.end_of_life, item.disabled) validate_end_of_life(item.name, item.end_of_life, item.disabled)
if args.transaction_type == "selling" and cint(item.has_variants): if cint(item.has_variants):
throw(_("Item {0} is a template, please select one of its variants").format(item.name)) msg = f"Item {item.name} is a template, please select one of its variants"
throw(_(msg), title=_("Template Item Selected"))
elif args.transaction_type == "buying" and args.doctype != "Material Request": elif args.transaction_type == "buying" and args.doctype != "Material Request":
if args.get("is_subcontracted") == "Yes" and item.is_sub_contracted_item != 1: if args.get("is_subcontracted") == "Yes" and item.is_sub_contracted_item != 1: