Merge branch 'hotfix'

saurabh6790 · saurabh6790 · commit 25eff13d355c · 2019-06-27T12:51:14.000+05:30
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
@@ -5,7 +5,7 @@
 from erpnext.hooks import regional_overrides
 from frappe.utils import getdate
 
-__version__ = '11.1.41'
+__version__ = '11.1.42'
 
 def get_default_company(user=None):
 	'''Get default company for user'''
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
@@ -1290,10 +1290,13 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 				},
 				callback: function(r) {
 					if(!r.exc) {
-						for (let tax of r.message) {
-							me.frm.add_child("taxes", tax);
+						me.frm.set_value("taxes", r.message);
+
+						if(me.frm.doc.shipping_rule) {
+							me.frm.script_manager.trigger("shipping_rule");
+						} else {
+							me.calculate_taxes_and_totals();
 						}
-						me.calculate_taxes_and_totals();
 					}
 				}
 			});
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -414,6 +414,8 @@ def get_returned_qty_map(delivery_note):
 @frappe.whitelist()
 def make_sales_invoice(source_name, target_doc=None):
 	doc = frappe.get_doc('Delivery Note', source_name)
+
+	to_make_invoice_qty_map = {}
 	returned_qty_map = get_returned_qty_map(source_name)
 	invoiced_qty_map = get_invoiced_qty_map(source_name)
 
@@ -434,8 +436,7 @@ def set_missing_values(source, target):
 			target.update(get_fetch_values("Sales Invoice", 'company_address', target.company_address))
 
 	def update_item(source_doc, target_doc, source_parent):
-		target_doc.qty, returned_qty = get_pending_qty(source_doc)
-		returned_qty_map[source_doc.item_code] = returned_qty
+		target_doc.qty = to_make_invoice_qty_map[source_doc.name]
 
 		if source_doc.serial_no and source_parent.per_billed > 0:
 			target_doc.serial_no = get_delivery_note_serial_no(source_doc.item_code,
@@ -445,7 +446,7 @@ def get_pending_qty(item_row):
 		pending_qty = item_row.qty - invoiced_qty_map.get(item_row.name, 0)
 
 		returned_qty = 0
-		if returned_qty_map.get(item_row.item_code) > 0:
+		if returned_qty_map.get(item_row.item_code, 0) > 0:
 			returned_qty = flt(returned_qty_map.get(item_row.item_code, 0))
 			returned_qty_map[item_row.item_code] -= pending_qty
 
@@ -457,7 +458,9 @@ def get_pending_qty(item_row):
 				pending_qty -= returned_qty
 				returned_qty = 0
 
-		return pending_qty, returned_qty
+		to_make_invoice_qty_map[item_row.name] = pending_qty
+
+		return pending_qty
 
 	doc = get_mapped_doc("Delivery Note", source_name, {
 		"Delivery Note": {
@@ -477,7 +480,7 @@ def get_pending_qty(item_row):
 				"cost_center": "cost_center"
 			},
 			"postprocess": update_item,
-			"filter": lambda d: get_pending_qty(d)[0] <= 0 if not doc.get("is_return") else get_pending_qty(d)[0] > 0
+			"filter": lambda d: get_pending_qty(d) <= 0 if not doc.get("is_return") else get_pending_qty(d) > 0
 		},
 		"Sales Taxes and Charges": {
 			"doctype": "Sales Taxes and Charges",

Original file line number	Diff line number	Diff line change
`@@ -1290,10 +1290,13 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({`
`1290`	`1290`	`},`
`1291`	`1291`	`callback: function(r) {`
`1292`	`1292`	`if(!r.exc) {`
`1293`		`- for (let tax of r.message) {`
`1294`		`- me.frm.add_child("taxes", tax);`
	`1293`	`+ me.frm.set_value("taxes", r.message);`
	`1294`	`+`
	`1295`	`+ if(me.frm.doc.shipping_rule) {`
	`1296`	`+ me.frm.script_manager.trigger("shipping_rule");`
	`1297`	`+ } else {`
	`1298`	`+ me.calculate_taxes_and_totals();`
`1295`	`1299`	`}`
`1296`		`- me.calculate_taxes_and_totals();`
`1297`	`1300`	`}`
`1298`	`1301`	`}`
`1299`	`1302`	`});`