Merge branch 'version-13' into version-13-hotfix

erpnext/__init__.py

@@ -4,7 +4,7 @@ import frappe
 
 from erpnext.hooks import regional_overrides
 
-__version__ = "13.42.7"
+__version__ = "13.52.3"
 
 
 def get_default_company(user=None):

erpnext/accounts/doctype/payment_entry/payment_entry.py

@@ -206,6 +206,7 @@ class PaymentEntry(AccountsController):
 			elif latest.outstanding_amount < latest.invoice_amount and flt(
 				d.outstanding_amount, d.precision("outstanding_amount")
 			) != flt(latest.outstanding_amount, d.precision("outstanding_amount")):
+
 				frappe.throw(
 					_(
 						"{0} {1} has already been partly paid. Please use the 'Get Outstanding Invoice' or the 'Get Outstanding Orders' button to get the latest outstanding amounts."

erpnext/hooks.py

@@ -29,6 +29,10 @@ doctype_js = {
 
 override_doctype_class = {"Address": "erpnext.accounts.custom.address.ERPNextAddress"}
 
+override_whitelisted_methods = {
+	"frappe.www.contact.send_message": "erpnext.templates.utils.send_message"
+}
+
 welcome_email = "erpnext.setup.utils.welcome_email"
 
 # setup wizard

erpnext/public/js/website_utils.js

@@ -3,18 +3,6 @@
 
 if(!window.erpnext) window.erpnext = {};
 
-// Add / update a new Lead / Communication
-// subject, sender, description
-frappe.send_message = function(opts, btn) {
-	return frappe.call({
-		type: "POST",
-		method: "erpnext.templates.utils.send_message",
-		btn: btn,
-		args: opts,
-		callback: opts.callback
-	});
-};
-
 erpnext.subscribe_to_newsletter = function(opts, btn) {
 	return frappe.call({
 		type: "POST",
@@ -24,6 +12,3 @@ erpnext.subscribe_to_newsletter = function(opts, btn) {
 		callback: opts.callback
 	});
 }
-
-// for backward compatibility
-erpnext.send_message = frappe.send_message;

erpnext/regional/report/gst_itemised_purchase_register/gst_itemised_purchase_register.py

@@ -28,7 +28,7 @@ def execute(filters=None):
 			"gst_category",
 			"export_type",
 			"ecommerce_gstin",
-			"gst_hsn_code",
+			"`tabPurchase Invoice Item`.gst_hsn_code",
 			"bill_no",
 			"bill_date",
 		],

erpnext/regional/report/gst_itemised_sales_register/gst_itemised_sales_register.py

@@ -39,7 +39,7 @@ def execute(filters=None):
 		"gst_category",
 		"export_type",
 		"ecommerce_gstin",
-		"gst_hsn_code",
+		"`tabSales Invoice Item`.gst_hsn_code",
 	]
 
 	additional_conditions = get_conditions(filters, additional_query_columns)