fix: Missing commits from hotfix branch (#17997)
* fix: merge conflict
* fix: restored missing set_gst_state_and_state_number function
* fix: style linting as per codacy
* fix: Fixes related to customer/lead merging
* fix: merge conflict
* fix: Fixes related to customer/lead merging
* fix: Assign isue/opportunity to user
* fix: Assign isue/opportunity to user
* fix: Replaced Invoice type by GST Category
* fix: merge conflict
* fix: merge conflict
* fix: test cases
* fix: test cases
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index fe2e0a4..f1d784c 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -321,8 +321,21 @@
out["manufacturer_part_no"] = None
out["manufacturer"] = None
+ child_doctype = args.doctype + ' Item'
+ meta = frappe.get_meta(child_doctype)
+ if meta.get_field("barcode"):
+ update_barcode_value(out)
+
return out
+def update_barcode_value(out):
+ from erpnext.accounts.doctype.sales_invoice.pos import get_barcode_data
+ barcode_data = get_barcode_data([out])
+
+ # If item has one barcode then update the value of the barcode field
+ if barcode_data and len(barcode_data.get(out.item_code)) == 1:
+ out['barcode'] = barcode_data.get(out.item_code)[0]
+
@frappe.whitelist()
def get_item_tax_info(company, tax_category, item_codes):
out = {}
@@ -651,6 +664,10 @@
def get_party_item_code(args, item_doc, out):
if args.transaction_type=="selling" and args.customer:
out.customer_item_code = None
+
+ if args.quotation_to and args.quotation_to != 'Customer':
+ return
+
customer_item_code = item_doc.get("customer_items", {"customer_name": args.customer})
if customer_item_code: