Merge branch 'hotfix'

* [minor] don't trigger the expense type trigger if value is not set

* [minor] check if account is selected or not in Payment Entry

* [minor] check mode_of_payment in Payment entry

erpnext/__init__.py

@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = '8.4.0'
+__version__ = '8.4.3'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/accounts/doctype/payment_entry/payment_entry.js

@@ -291,7 +291,7 @@ frappe.ui.form.on('Payment Entry', {
 
 	set_account_currency_and_balance: function(frm, account, currency_field,
 			balance_field, callback_function) {
-		if (frm.doc.posting_date) {
+		if (frm.doc.posting_date && account) {
 			frappe.call({
 				method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_account_details",
 				args: {

erpnext/hr/doctype/expense_claim/expense_claim.js

@@ -27,6 +27,10 @@ erpnext.hr.ExpenseClaimController = frappe.ui.form.Controller.extend({
 			return;
 		}
 
+		if(!d.expense_type) {
+			return;
+		}
+
 		return frappe.call({
 			method: "erpnext.hr.doctype.expense_claim.expense_claim.get_expense_claim_account",
 			args: {

erpnext/patches.txt

@@ -415,5 +415,5 @@ erpnext.patches.v8_1.gst_fixes #2017-07-06
 erpnext.patches.v8_0.update_production_orders
 erpnext.patches.v8_1.remove_sales_invoice_from_returned_serial_no
 erpnext.patches.v8_1.allow_invoice_copy_to_edit_after_submit
-erpnext.patches.v8_1.update_gst_state
-erpnext.patches.v8_1.add_hsn_sac_codes
+erpnext.patches.v8_1.add_hsn_sac_codes
+erpnext.patches.v8_1.update_gst_state

erpnext/patches/v7_0/fix_nonwarehouse_ledger_gl_entries_for_transactions.py

@@ -7,10 +7,11 @@ import frappe, erpnext
 def execute():
 	frappe.reload_doctype("Account")
 
-	warehouses = frappe.db.sql_list("""select name, company from tabAccount
+	warehouses = frappe.db.sql("""select name, company from tabAccount
 		where account_type = 'Stock' and is_group = 0
-		and (warehouse is null or warehouse = '')""", as_dict)
+		and (warehouse is null or warehouse = '')""", as_dict=1)
 	warehouses = [d.name for d in warehouses if erpnext.is_perpetual_inventory_enabled(d.company)]
+
 	if len(warehouses) > 0:
 		warehouses = set_warehouse_for_stock_account(warehouses)
 		if not warehouses:

erpnext/patches/v8_1/update_gst_state.py

@@ -2,5 +2,12 @@ import frappe
 from erpnext.regional.india import states
 
 def execute():
+	company = frappe.get_all('Company', filters = {'country': 'India'})
+	if not company:
+		return
+
+	if not frappe.db.get_value("Custom Field", filters={'fieldname':'gst_state'}):
+		return
+
 	frappe.db.sql("update `tabCustom Field` set options=%s where fieldname='gst_state'", '\n'.join(states))
 	frappe.db.sql("update `tabAddress` set gst_state='Chhattisgarh' where gst_state='Chattisgarh'")

erpnext/public/js/controllers/accounts.js

@@ -94,6 +94,10 @@ var get_payment_mode_account = function(frm, mode_of_payment, callback) {
 		frappe.throw(__("Please select the Company first"));
 	}
 
+	if(!mode_of_payment) {
+		return;
+	}
+
 	return  frappe.call({
 		method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.get_bank_cash_account",
 		args: {

erpnext/selling/doctype/sales_order/sales_order.js

@@ -5,7 +5,6 @@
 
 frappe.ui.form.on("Sales Order", {
 	setup: function(frm) {
-		$.extend(frm.cscript, new erpnext.selling.SalesOrderController({frm: frm}));
 		frm.custom_make_buttons = {
 			'Delivery Note': 'Delivery',
 			'Sales Invoice': 'Invoice',
@@ -347,3 +346,5 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
 		}
 	}
 });
+
+$.extend(cur_frm.cscript, new erpnext.selling.SalesOrderController({frm: cur_frm}));

erpnext/stock/doctype/delivery_note/delivery_note.js

@@ -63,7 +63,6 @@ frappe.ui.form.on("Delivery Note", {
 		});
 
 
-		$.extend(frm.cscript, new erpnext.stock.DeliveryNoteController({frm: frm}));
 	},
 	print_without_amount: function(frm) {
 		erpnext.stock.delivery_note.set_print_hide(frm.doc);
@@ -86,7 +85,6 @@ frappe.ui.form.on("Delivery Note Item", {
 	}
 });
 
-
 erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend({
 	setup: function(doc) {
 		this.setup_posting_date_time_check();
@@ -225,6 +223,8 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend(
 
 });
 
+$.extend(cur_frm.cscript, new erpnext.stock.DeliveryNoteController({frm: cur_frm}));
+
 frappe.ui.form.on('Delivery Note', {
 	setup: function(frm) {
 		if(frm.doc.company) {
@@ -268,3 +268,4 @@ erpnext.stock.delivery_note.set_print_hide = function(doc, cdt, cdn){
 			dn_fields['taxes'].print_hide = 0;
 	}
 }
+

erpnext/stock/doctype/stock_entry/stock_entry.js

@@ -4,7 +4,6 @@ frappe.provide("erpnext.stock");
 
 frappe.ui.form.on('Stock Entry', {
 	setup: function(frm) {
-		$.extend(frm.cscript, new erpnext.stock.StockEntry({frm: frm}));
 
 		frm.set_query('production_order', function() {
 			return {
@@ -583,3 +582,5 @@ erpnext.stock.select_batch_and_serial_no = (frm, item) => {
 	});
 
 }
+
+$.extend(cur_frm.cscript, new erpnext.stock.StockEntry({frm: cur_frm}));