Merge branch 'develop' into Abdeali/account-category-enhancement

Author: Abdeali099

erpnext/assets/doctype/asset_capitalization/asset_capitalization.js

@@ -16,6 +16,7 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
 
 	refresh() {
 		this.show_general_ledger();
+		erpnext.toggle_serial_batch_fields(this.frm);
 
 		if (this.frm.doc.stock_items && this.frm.doc.stock_items.length) {
 			this.show_stock_ledger();

erpnext/crm/doctype/lead/lead.py

@@ -10,6 +10,7 @@
 from frappe.contacts.doctype.address.address import get_default_address
 from frappe.contacts.doctype.contact.contact import get_default_contact
 from frappe.email.inbox import link_communication_to_document
+from frappe.model.document import Document
 from frappe.model.mapper import get_mapped_doc
 from frappe.utils import comma_and, get_link_to_form, has_gravatar, validate_email_address
 
@@ -314,7 +315,7 @@ def create_prospect(self, company_name):
 
 
 @frappe.whitelist()
-def make_customer(source_name, target_doc=None):
+def make_customer(source_name: str, target_doc: str | Document | None = None):
 	return _make_customer(source_name, target_doc)
 
 
@@ -361,7 +362,7 @@ def set_missing_values(source, target):
 
 
 @frappe.whitelist()
-def make_opportunity(source_name, target_doc=None):
+def make_opportunity(source_name: str, target_doc: str | Document | None = None):
 	def set_missing_values(source, target):
 		_set_missing_values(source, target)
 
@@ -391,7 +392,7 @@ def set_missing_values(source, target):
 
 
 @frappe.whitelist()
-def make_quotation(source_name, target_doc=None):
+def make_quotation(source_name: str, target_doc: str | Document | None = None):
 	def set_missing_values(source, target):
 		_set_missing_values(source, target)
 

erpnext/crm/doctype/opportunity/opportunity.py

@@ -8,6 +8,7 @@
 from frappe import _
 from frappe.contacts.address_and_contact import load_address_and_contact
 from frappe.email.inbox import link_communication_to_document
+from frappe.model.document import Document
 from frappe.model.mapper import get_mapped_doc
 from frappe.query_builder import DocType, Interval
 from frappe.query_builder.functions import Now
@@ -380,7 +381,7 @@ def get_item_details(item_code):
 
 
 @frappe.whitelist()
-def make_quotation(source_name, target_doc=None):
+def make_quotation(source_name: str, target_doc: str | Document | None = None):
 	def set_missing_values(source, target):
 		from erpnext.controllers.accounts_controller import get_default_taxes_and_charges
 
@@ -433,7 +434,7 @@ def set_missing_values(source, target):
 
 
 @frappe.whitelist()
-def make_request_for_quotation(source_name, target_doc=None):
+def make_request_for_quotation(source_name: str, target_doc: str | Document | None = None):
 	def update_item(obj, target, source_parent):
 		target.conversion_factor = 1.0
 
@@ -455,7 +456,7 @@ def update_item(obj, target, source_parent):
 
 
 @frappe.whitelist()
-def make_customer(source_name, target_doc=None):
+def make_customer(source_name: str, target_doc: str | Document | None = None):
 	def set_missing_values(source, target):
 		target.opportunity_name = source.name
 
@@ -479,7 +480,7 @@ def set_missing_values(source, target):
 
 
 @frappe.whitelist()
-def make_supplier_quotation(source_name, target_doc=None):
+def make_supplier_quotation(source_name: str, target_doc: str | Document | None = None):
 	doclist = get_mapped_doc(
 		"Opportunity",
 		source_name,

erpnext/crm/doctype/prospect/prospect.py

@@ -6,6 +6,7 @@
 	delete_contact_and_address,
 	load_address_and_contact,
 )
+from frappe.model.document import Document
 from frappe.model.mapper import get_mapped_doc
 
 from erpnext.crm.utils import CRMNote, copy_comments, link_communications, link_open_events
@@ -87,7 +88,7 @@ def link_with_lead_contact_and_address(self):
 
 
 @frappe.whitelist()
-def make_customer(source_name, target_doc=None):
+def make_customer(source_name: str, target_doc: str | Document | None = None):
 	def set_missing_values(source, target):
 		target.customer_type = "Company"
 		target.company_name = source.name
@@ -111,7 +112,7 @@ def set_missing_values(source, target):
 
 
 @frappe.whitelist()
-def make_opportunity(source_name, target_doc=None):
+def make_opportunity(source_name: str, target_doc: str | Document | None = None):
 	def set_missing_values(source, target):
 		target.opportunity_from = "Prospect"
 		target.customer_name = source.company_name

erpnext/hooks.py

@@ -219,6 +219,16 @@
 	{"from_route": "/tasks", "to_route": "Task"},
 ]
 
+standard_navbar_items = [
+	{
+		"item_label": "Clear Demo Data",
+		"item_type": "Action",
+		"action": "erpnext.demo.clear_demo();",
+		"is_standard": 1,
+		"condition": "eval: frappe.boot.sysdefaults.demo_company",
+	},
+]
+
 standard_portal_menu_items = [
 	{"title": "Projects", "route": "/project", "reference_doctype": "Project", "role": "Customer"},
 	{

erpnext/patches.txt

@@ -470,4 +470,5 @@ erpnext.patches.v15_0.delete_quotation_lost_record_detail
 erpnext.patches.v16_0.add_portal_redirects
 erpnext.patches.v16_0.update_order_qty_and_requested_qty_based_on_mr_and_po
 erpnext.patches.v16_0.complete_onboarding_steps_for_older_sites #2
+erpnext.patches.v16_0.enable_serial_batch_setting
 erpnext.patches.v16_0.set_root_type_in_account_categories

erpnext/patches/v16_0/enable_serial_batch_setting.py

@@ -0,0 +1,9 @@
+import frappe
+
+
+def execute():
+	if not frappe.get_all("Serial No", limit=1) and not frappe.get_all("Batch", limit=1):
+		return
+
+	frappe.db.set_single_value("Stock Settings", "enable_serial_and_batch_no_for_item", 1)
+	frappe.db.set_default("enable_serial_and_batch_no_for_item", 1)

erpnext/public/js/controllers/transaction.js

@@ -580,6 +580,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 		this.validate_has_items();
 		erpnext.utils.view_serial_batch_nos(this.frm);
 		this.set_route_options_for_new_doc();
+		erpnext.toggle_serial_batch_fields(this.frm);
 	}
 
 	set_route_options_for_new_doc() {

erpnext/public/js/utils.js

@@ -19,6 +19,71 @@ $.extend(erpnext, {
 		return currency_list;
 	},
 
+	toggle_serial_batch_fields(frm) {
+		let hide_fields = cint(frappe.user_defaults?.enable_serial_and_batch_no_for_item) === 0 ? 1 : 0;
+		let fields = ["serial_and_batch_bundle", "use_serial_batch_fields", "serial_no", "batch_no"];
+
+		if (
+			[
+				"Stock Entry",
+				"Purchase Receipt",
+				"Purchase Invoice",
+				"Stock Reconciliation",
+				"Subcontracting Receipt",
+			].includes(frm.doc.doctype)
+		) {
+			fields.push("add_serial_batch_bundle");
+		}
+
+		if (["Stock Reconciliation"].includes(frm.doc.doctype)) {
+			fields.push("reconcile_all_serial_batch");
+		}
+
+		if (["Sales Invoice", "Delivery Note", "Pick List"].includes(frm.doc.doctype)) {
+			fields.push("pick_serial_and_batch");
+		}
+
+		if (["Purchase Receipt", "Purchase Invoice", "Subcontracting Receipt"].includes(frm.doc.doctype)) {
+			fields.push("add_serial_batch_for_rejected_qty", "rejected_serial_and_batch_bundle");
+		}
+
+		let child_name = "items";
+		if (frm.doc.doctype === "Pick List") {
+			child_name = "locations";
+		}
+
+		if (frm.doc.doctype === "Asset Capitalization") {
+			child_name = "stock_items";
+		}
+
+		fields.forEach((field) => {
+			frm.fields_dict[child_name].grid.update_docfield_property(field, "hidden", hide_fields);
+
+			frm.fields_dict[child_name].grid.update_docfield_property(
+				field,
+				"in_list_view",
+				hide_fields ? 0 : 1
+			);
+
+			if (
+				frm.doc.doctype === "Subcontracting Receipt" &&
+				!["add_serial_batch_for_rejected_qty", "rejected_serial_and_batch_bundle"].includes(field)
+			) {
+				frm.fields_dict["supplied_items"].grid.update_docfield_property(field, "hidden", hide_fields);
+
+				frm.fields_dict["supplied_items"].grid.update_docfield_property(
+					field,
+					"in_list_view",
+					hide_fields ? 0 : 1
+				);
+
+				frm.fields_dict["supplied_items"].grid.reset_grid();
+			}
+		});
+
+		frm.fields_dict[child_name].grid.reset_grid();
+	},
+
 	toggle_naming_series: function () {
 		if (
 			cur_frm &&

erpnext/setup/utils.py

@@ -221,6 +221,8 @@ def set_defaults_for_tests():
 		frappe.db.set_default(key, value)
 	frappe.db.set_single_value("Stock Settings", "auto_insert_price_list_rate_if_missing", 0)
 
+	frappe.db.set_single_value("Stock Settings", "enable_serial_and_batch_no_for_item", 1)
+
 
 def insert_record(records):
 	from frappe.desk.page.setup_wizard.setup_wizard import make_records