Merge branch 'develop' into gross-profit-percentage

erpnext/accounts/doctype/payment_request/payment_request.py

@@ -548,10 +548,14 @@ def make_payment_order(source_name, target_doc=None):
 
 	return doclist
 
-def validate_payment(doc, method=""):
-	if not frappe.db.has_column(doc.reference_doctype, 'status'):
+def validate_payment(doc, method=None):
+	if doc.reference_doctype != "Payment Request" or (
+		frappe.db.get_value(doc.reference_doctype, doc.reference_docname, 'status')
+		!= "Paid"
+	):
 		return
 
-	status = frappe.db.get_value(doc.reference_doctype, doc.reference_docname, 'status')
-	if status == 'Paid':
-		frappe.throw(_("The Payment Request {0} is already paid, cannot process payment twice").format(doc.reference_docname))
+	frappe.throw(
+		_("The Payment Request {0} is already paid, cannot process payment twice")
+		.format(doc.reference_docname)
+	)

erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py

@@ -110,9 +110,15 @@ class POSInvoiceMergeLog(Document):
 
 	def merge_pos_invoice_into(self, invoice, data):
 		items, payments, taxes = [], [], []
+
 		loyalty_amount_sum, loyalty_points_sum = 0, 0
+
 		rounding_adjustment, base_rounding_adjustment = 0, 0
 		rounded_total, base_rounded_total = 0, 0
+
+		loyalty_amount_sum, loyalty_points_sum, idx = 0, 0, 1
+
+
 		for doc in data:
 			map_doc(doc, invoice, table_map={ "doctype": invoice.doctype })
 
@@ -146,6 +152,8 @@ class POSInvoiceMergeLog(Document):
 						found = True
 				if not found:
 					tax.charge_type = 'Actual'
+					tax.idx = idx
+					idx += 1
 					tax.included_in_print_rate = 0
 					tax.tax_amount = tax.tax_amount_after_discount_amount
 					tax.base_tax_amount = tax.base_tax_amount_after_discount_amount
@@ -163,8 +171,8 @@ class POSInvoiceMergeLog(Document):
 					payments.append(payment)
 			rounding_adjustment += doc.rounding_adjustment
 			rounded_total += doc.rounded_total
-			base_rounding_adjustment += doc.rounding_adjustment
-			base_rounded_total += doc.rounded_total
+			base_rounding_adjustment += doc.base_rounding_adjustment
+			base_rounded_total += doc.base_rounded_total
 
 
 		if loyalty_points_sum:
@@ -176,9 +184,9 @@ class POSInvoiceMergeLog(Document):
 		invoice.set('payments', payments)
 		invoice.set('taxes', taxes)
 		invoice.set('rounding_adjustment',rounding_adjustment)
-		invoice.set('rounding_adjustment',base_rounding_adjustment)
-		invoice.set('base_rounded_total',base_rounded_total)
+		invoice.set('base_rounding_adjustment',base_rounding_adjustment)
 		invoice.set('rounded_total',rounded_total)
+		invoice.set('base_rounded_total',base_rounded_total)
 		invoice.additional_discount_percentage = 0
 		invoice.discount_amount = 0.0
 		invoice.taxes_and_charges = None

erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py

@@ -543,6 +543,75 @@ class TestPricingRule(unittest.TestCase):
 		frappe.get_doc("Item Price", {"item_code": "Water Flask"}).delete()
 		item.delete()
 
+	def test_pricing_rule_for_different_currency(self):
+		make_item("Test Sanitizer Item")
+
+		pricing_rule_record = {
+			"doctype": "Pricing Rule",
+			"title": "_Test Sanitizer Rule",
+			"apply_on": "Item Code",
+			"items": [{
+				"item_code": "Test Sanitizer Item",
+			}],
+			"selling": 1,
+			"currency": "INR",
+			"rate_or_discount": "Rate",
+			"rate": 0,
+			"priority": 2,
+			"margin_type": "Percentage",
+			"margin_rate_or_amount": 0.0,
+			"company": "_Test Company"
+		}
+
+		rule = frappe.get_doc(pricing_rule_record)
+		rule.rate_or_discount = 'Rate'
+		rule.rate = 100.0
+		rule.insert()
+
+		rule1 = frappe.get_doc(pricing_rule_record)
+		rule1.currency = 'USD'
+		rule1.rate_or_discount = 'Rate'
+		rule1.rate = 2.0
+		rule1.priority = 1
+		rule1.insert()
+
+		args = frappe._dict({
+			"item_code": "Test Sanitizer Item",
+			"company": "_Test Company",
+			"price_list": "_Test Price List",
+			"currency": "USD",
+			"doctype": "Sales Invoice",
+			"conversion_rate": 1,
+			"price_list_currency": "_Test Currency",
+			"plc_conversion_rate": 1,
+			"order_type": "Sales",
+			"customer": "_Test Customer",
+			"name": None,
+			"transaction_date": frappe.utils.nowdate()
+		})
+
+		details = get_item_details(args)
+		self.assertEqual(details.price_list_rate, 2.0)
+
+
+		args = frappe._dict({
+			"item_code": "Test Sanitizer Item",
+			"company": "_Test Company",
+			"price_list": "_Test Price List",
+			"currency": "INR",
+			"doctype": "Sales Invoice",
+			"conversion_rate": 1,
+			"price_list_currency": "_Test Currency",
+			"plc_conversion_rate": 1,
+			"order_type": "Sales",
+			"customer": "_Test Customer",
+			"name": None,
+			"transaction_date": frappe.utils.nowdate()
+		})
+
+		details = get_item_details(args)
+		self.assertEqual(details.price_list_rate, 100.0)
+
 	def test_pricing_rule_for_transaction(self):
 		make_item("Water Flask 1")
 		frappe.delete_doc_if_exists('Pricing Rule', '_Test Pricing Rule')

erpnext/accounts/doctype/pricing_rule/utils.py

@@ -264,6 +264,11 @@ def filter_pricing_rules(args, pricing_rules, doc=None):
 			else:
 				p.variant_of = None
 
+	if len(pricing_rules) > 1:
+		filtered_rules = list(filter(lambda x: x.currency==args.get('currency'), pricing_rules))
+		if filtered_rules:
+			pricing_rules = filtered_rules
+
 	# find pricing rule with highest priority
 	if pricing_rules:
 		max_priority = max(cint(p.priority) for p in pricing_rules)

erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py

@@ -13,6 +13,7 @@ from erpnext.accounts.doctype.account.test_account import create_account, get_in
 from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
 from erpnext.buying.doctype.supplier.test_supplier import create_supplier
 from erpnext.controllers.accounts_controller import get_payment_terms
+from erpnext.controllers.buying_controller import QtyMismatchError
 from erpnext.exceptions import InvalidCurrency
 from erpnext.projects.doctype.project.test_project import make_project
 from erpnext.stock.doctype.item.test_item import create_item
@@ -35,6 +36,27 @@ class TestPurchaseInvoice(unittest.TestCase):
 	def tearDownClass(self):
 		unlink_payment_on_cancel_of_invoice(0)
 
+	def test_purchase_invoice_received_qty(self):
+		"""
+			1. Test if received qty is validated against accepted + rejected
+			2. Test if received qty is auto set on save
+		"""
+		pi = make_purchase_invoice(
+			qty=1,
+			rejected_qty=1,
+			received_qty=3,
+			item_code="_Test Item Home Desktop 200",
+			rejected_warehouse = "_Test Rejected Warehouse - _TC",
+			update_stock=True, do_not_save=True)
+		self.assertRaises(QtyMismatchError, pi.save)
+
+		pi.items[0].received_qty = 0
+		pi.save()
+		self.assertEqual(pi.items[0].received_qty, 2)
+
+		# teardown
+		pi.delete()
+
 	def test_gl_entries_without_perpetual_inventory(self):
 		frappe.db.set_value("Company", "_Test Company", "round_off_account", "Round Off - _TC")
 		pi = frappe.copy_doc(test_records[0])

erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json

@@ -22,10 +22,10 @@
   "received_qty",
   "qty",
   "rejected_qty",
-  "stock_uom",
   "col_break2",
   "uom",
   "conversion_factor",
+  "stock_uom",
   "stock_qty",
   "sec_break1",
   "price_list_rate",
@@ -175,7 +175,8 @@
   {
    "fieldname": "received_qty",
    "fieldtype": "Float",
-   "label": "Received Qty"
+   "label": "Received Qty",
+   "read_only": 1
   },
   {
    "bold": 1,
@@ -223,7 +224,7 @@
   {
    "fieldname": "stock_qty",
    "fieldtype": "Float",
-   "label": "Stock Qty",
+   "label": "Accepted Qty in Stock UOM",
    "print_hide": 1,
    "read_only": 1,
    "reqd": 1
@@ -870,10 +871,11 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-09-01 16:04:03.538643",
+ "modified": "2021-11-15 17:04:07.191013",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice Item",
+ "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
  "sort_field": "modified",

erpnext/controllers/buying_controller.py

@@ -3,7 +3,7 @@
 
 
 import frappe
-from frappe import _, msgprint
+from frappe import ValidationError, _, msgprint
 from frappe.contacts.doctype.address.address import get_address_display
 from frappe.utils import cint, cstr, flt, getdate
 
@@ -17,6 +17,9 @@ from erpnext.stock.get_item_details import get_conversion_factor
 from erpnext.stock.utils import get_incoming_rate
 
 
+class QtyMismatchError(ValidationError):
+	pass
+
 class BuyingController(StockController, Subcontracting):
 
 	def get_feed(self):
@@ -360,19 +363,15 @@ class BuyingController(StockController, Subcontracting):
 	def validate_accepted_rejected_qty(self):
 		for d in self.get("items"):
 			self.validate_negative_quantity(d, ["received_qty","qty", "rejected_qty"])
-			if not flt(d.received_qty) and flt(d.qty):
-				d.received_qty = flt(d.qty) - flt(d.rejected_qty)
-
-			elif not flt(d.qty) and flt(d.rejected_qty):
-				d.qty = flt(d.received_qty) - flt(d.rejected_qty)
 
-			elif not flt(d.rejected_qty):
-				d.rejected_qty = flt(d.received_qty) -  flt(d.qty)
+			if not flt(d.received_qty) and (flt(d.qty) or flt(d.rejected_qty)):
+				d.received_qty = flt(d.qty) + flt(d.rejected_qty)
 
-			val  = flt(d.qty) + flt(d.rejected_qty)
 			# Check Received Qty = Accepted Qty + Rejected Qty
+			val = flt(d.qty) + flt(d.rejected_qty)
 			if (flt(val, d.precision("received_qty")) != flt(d.received_qty, d.precision("received_qty"))):
-				frappe.throw(_("Accepted + Rejected Qty must be equal to Received quantity for Item {0}").format(d.item_code))
+				message = _("Row #{0}: Received Qty must be equal to Accepted + Rejected Qty for Item {1}").format(d.idx, d.item_code)
+				frappe.throw(msg=message, title=_("Mismatch"), exc=QtyMismatchError)
 
 	def validate_negative_quantity(self, item_row, field_list):
 		if self.is_return:

erpnext/manufacturing/doctype/job_card/job_card.js

@@ -23,12 +23,6 @@ frappe.ui.form.on('Job Card', {
 		);
 	},
 
-	onload: function(frm) {
-		if (frm.doc.scrap_items.length == 0) {
-			frm.fields_dict['scrap_items_section'].collapse();
-		}
-	},
-
 	refresh: function(frm) {
 		frappe.flags.pause_job = 0;
 		frappe.flags.resume_job = 0;

erpnext/manufacturing/doctype/job_card/job_card.py

@@ -627,17 +627,22 @@ def make_material_request(source_name, target_doc=None):
 
 @frappe.whitelist()
 def make_stock_entry(source_name, target_doc=None):
-	def update_item(obj, target, source_parent):
+	def update_item(source, target, source_parent):
 		target.t_warehouse = source_parent.wip_warehouse
+
 		if not target.conversion_factor:
 			target.conversion_factor = 1
 
+		pending_rm_qty = flt(source.required_qty) - flt(source.transferred_qty)
+		if pending_rm_qty > 0:
+			target.qty = pending_rm_qty
+
 	def set_missing_values(source, target):
 		target.purpose = "Material Transfer for Manufacture"
 		target.from_bom = 1
 
 		# avoid negative 'For Quantity'
-		pending_fg_qty = source.get('for_quantity', 0) - source.get('transferred_qty', 0)
+		pending_fg_qty = flt(source.get('for_quantity', 0)) - flt(source.get('transferred_qty', 0))
 		target.fg_completed_qty = pending_fg_qty if pending_fg_qty > 0 else 0
 
 		target.set_transfer_qty()

erpnext/manufacturing/doctype/job_card/test_job_card.py

@@ -15,11 +15,22 @@ from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
 
 
 class TestJobCard(unittest.TestCase):
-
 	def setUp(self):
+		make_bom_for_jc_tests()
+
 		transfer_material_against, source_warehouse = None, None
-		tests_that_transfer_against_jc = ("test_job_card_multiple_materials_transfer",
-			"test_job_card_excess_material_transfer")
+
+		tests_that_skip_setup = (
+			"test_job_card_material_transfer_correctness",
+		)
+		tests_that_transfer_against_jc = (
+			"test_job_card_multiple_materials_transfer",
+			"test_job_card_excess_material_transfer",
+			"test_job_card_partial_material_transfer"
+		)
+
+		if self._testMethodName in tests_that_skip_setup:
+			return
 
 		if self._testMethodName in tests_that_transfer_against_jc:
 			transfer_material_against = "Job Card"
@@ -190,4 +201,132 @@ class TestJobCard(unittest.TestCase):
 		job_card.submit()
 
 		# JC is Completed with excess transfer
-		self.assertEqual(job_card.status, "Completed")
+		self.assertEqual(job_card.status, "Completed")
+
+	def test_job_card_partial_material_transfer(self):
+		"Test partial material transfer against Job Card"
+
+		make_stock_entry(item_code="_Test Item", target="Stores - _TC",
+			qty=25, basic_rate=100)
+		make_stock_entry(item_code="_Test Item Home Desktop Manufactured",
+			target="Stores - _TC", qty=15, basic_rate=100)
+
+		job_card_name = frappe.db.get_value("Job Card", {'work_order': self.work_order.name})
+		job_card = frappe.get_doc("Job Card", job_card_name)
+
+		# partially transfer
+		transfer_entry = make_stock_entry_from_jc(job_card_name)
+		transfer_entry.fg_completed_qty = 1
+		transfer_entry.get_items()
+		transfer_entry.insert()
+		transfer_entry.submit()
+
+		job_card.reload()
+		self.assertEqual(job_card.transferred_qty, 1)
+		self.assertEqual(transfer_entry.items[0].qty, 5)
+		self.assertEqual(transfer_entry.items[1].qty, 3)
+
+		# transfer remaining
+		transfer_entry_2 = make_stock_entry_from_jc(job_card_name)
+
+		self.assertEqual(transfer_entry_2.fg_completed_qty, 1)
+		self.assertEqual(transfer_entry_2.items[0].qty, 5)
+		self.assertEqual(transfer_entry_2.items[1].qty, 3)
+
+		transfer_entry_2.insert()
+		transfer_entry_2.submit()
+
+		job_card.reload()
+		self.assertEqual(job_card.transferred_qty, 2)
+
+	def test_job_card_material_transfer_correctness(self):
+		"""
+			1. Test if only current Job Card Items are pulled in a Stock Entry against a Job Card
+			2. Test impact of changing 'For Qty' in such a Stock Entry
+		"""
+		create_bom_with_multiple_operations()
+		work_order = make_wo_with_transfer_against_jc()
+
+		job_card_name = frappe.db.get_value(
+			"Job Card",
+			{"work_order": work_order.name,"operation": "Test Operation A"}
+		)
+		job_card = frappe.get_doc("Job Card", job_card_name)
+
+		self.assertEqual(len(job_card.items), 1)
+		self.assertEqual(job_card.items[0].item_code, "_Test Item")
+
+		# check if right items are mapped in transfer entry
+		transfer_entry = make_stock_entry_from_jc(job_card_name)
+		transfer_entry.insert()
+
+		self.assertEqual(len(transfer_entry.items), 1)
+		self.assertEqual(transfer_entry.items[0].item_code, "_Test Item")
+		self.assertEqual(transfer_entry.items[0].qty, 4)
+
+		# change 'For Qty' and check impact on items table
+		# no.of items should be the same with qty change
+		transfer_entry.fg_completed_qty = 2
+		transfer_entry.get_items()
+
+		self.assertEqual(len(transfer_entry.items), 1)
+		self.assertEqual(transfer_entry.items[0].item_code, "_Test Item")
+		self.assertEqual(transfer_entry.items[0].qty, 2)
+
+		# rollback via tearDown method
+
+def create_bom_with_multiple_operations():
+	"Create a BOM with multiple operations and Material Transfer against Job Card"
+	from erpnext.manufacturing.doctype.operation.test_operation import make_operation
+
+	test_record = frappe.get_test_records("BOM")[2]
+	bom_doc = frappe.get_doc(test_record)
+
+	row = {
+		"operation": "Test Operation A",
+		"workstation": "_Test Workstation A",
+		"hour_rate_rent": 300,
+		"time_in_mins": 60
+	}
+	make_workstation(row)
+	make_operation(row)
+
+	bom_doc.append("operations", {
+		"operation": "Test Operation A",
+		"description": "Test Operation A",
+		"workstation": "_Test Workstation A",
+		"hour_rate": 300,
+		"time_in_mins": 60,
+		"operating_cost": 100
+	})
+
+	bom_doc.transfer_material_against = "Job Card"
+	bom_doc.save()
+	bom_doc.submit()
+
+	return bom_doc
+
+def make_wo_with_transfer_against_jc():
+	"Create a WO with multiple operations and Material Transfer against Job Card"
+
+	work_order = make_wo_order_test_record(
+		item="_Test FG Item 2",
+		qty=4,
+		transfer_material_against="Job Card",
+		source_warehouse="Stores - _TC",
+		do_not_submit=True
+	)
+	work_order.required_items[0].operation = "Test Operation A"
+	work_order.required_items[1].operation = "_Test Operation 1"
+	work_order.submit()
+
+	return work_order
+
+def make_bom_for_jc_tests():
+	test_records = frappe.get_test_records('BOM')
+	bom = frappe.copy_doc(test_records[2])
+	bom.set_rate_of_sub_assembly_item_based_on_bom = 0
+	bom.rm_cost_as_per = "Valuation Rate"
+	bom.items[0].uom = "_Test UOM 1"
+	bom.items[0].conversion_factor = 5
+	bom.insert()

erpnext/manufacturing/doctype/operation/test_operation.py

@@ -17,15 +17,13 @@ def make_operation(*args, **kwargs):
 
 	args = frappe._dict(args)
 
-	try:
+	if not frappe.db.exists("Operation", args.operation):
 		doc = frappe.get_doc({
 			"doctype": "Operation",
 			"name": args.operation,
 			"workstation": args.workstation
 		})
-
 		doc.insert()
-
 		return doc
-	except frappe.DuplicateEntryError:
-		return frappe.get_doc("Operation", args.operation)
+
+	return frappe.get_doc("Operation", args.operation)

erpnext/manufacturing/doctype/workstation/test_workstation.py

@@ -89,7 +89,7 @@ def make_workstation(*args, **kwargs):
 	args = frappe._dict(args)
 
 	workstation_name = args.workstation_name or args.workstation
-	try:
+	if not frappe.db.exists("Workstation", workstation_name):
 		doc = frappe.get_doc({
 			"doctype": "Workstation",
 			"workstation_name": workstation_name
@@ -99,5 +99,5 @@ def make_workstation(*args, **kwargs):
 		doc.insert()
 
 		return doc
-	except frappe.DuplicateEntryError:
-		return frappe.get_doc("Workstation", workstation_name)
+
+	return frappe.get_doc("Workstation", workstation_name)

erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py

@@ -28,8 +28,15 @@ def get_production_plan_item_details(filters, data, order_details):
 
 	production_plan_doc = frappe.get_cached_doc("Production Plan", filters.get("production_plan"))
 	for row in production_plan_doc.po_items:
-		work_order = frappe.get_cached_value("Work Order", {"production_plan_item": row.name,
-			"bom_no": row.bom_no, "production_item": row.item_code}, "name")
+		work_order = frappe.get_value(
+			"Work Order",
+			{
+				"production_plan_item": row.name,
+				"bom_no": row.bom_no,
+				"production_item": row.item_code
+			},
+			"name"
+		)
 
 		if row.item_code not in itemwise_indent:
 			itemwise_indent.setdefault(row.item_code, {})
@@ -40,10 +47,10 @@ def get_production_plan_item_details(filters, data, order_details):
 			"item_name": frappe.get_cached_value("Item", row.item_code, "item_name"),
 			"qty": row.planned_qty,
 			"document_type": "Work Order",
-			"document_name": work_order,
+			"document_name": work_order or "",
 			"bom_level": frappe.get_cached_value("BOM", row.bom_no, "bom_level"),
-			"produced_qty": order_details.get((work_order, row.item_code)).get("produced_qty"),
-			"pending_qty": flt(row.planned_qty) - flt(order_details.get((work_order, row.item_code)).get("produced_qty"))
+			"produced_qty": order_details.get((work_order, row.item_code), {}).get("produced_qty", 0),
+			"pending_qty": flt(row.planned_qty) - flt(order_details.get((work_order, row.item_code), {}).get("produced_qty", 0))
 		})
 
 		get_production_plan_sub_assembly_item_details(filters, row, production_plan_doc, data, order_details)
@@ -54,11 +61,23 @@ def get_production_plan_sub_assembly_item_details(filters, row, production_plan_
 			subcontracted_item = (item.type_of_manufacturing == 'Subcontract')
 
 			if subcontracted_item:
-				docname = frappe.get_cached_value("Purchase Order Item",
-					{"production_plan_sub_assembly_item": item.name, "docstatus": ("<", 2)}, "parent")
+				docname = frappe.get_value(
+					"Purchase Order Item",
+					{
+						"production_plan_sub_assembly_item": item.name,
+						"docstatus": ("<", 2)
+					},
+					"parent"
+				)
 			else:
-				docname = frappe.get_cached_value("Work Order",
-					{"production_plan_sub_assembly_item": item.name, "docstatus": ("<", 2)}, "name")
+				docname = frappe.get_value(
+					"Work Order",
+					{
+						"production_plan_sub_assembly_item": item.name,
+						"docstatus": ("<", 2)
+					},
+					"name"
+				)
 
 			data.append({
 				"indent": 1,
@@ -66,10 +85,10 @@ def get_production_plan_sub_assembly_item_details(filters, row, production_plan_
 				"item_name": item.item_name,
 				"qty": item.qty,
 				"document_type": "Work Order" if not subcontracted_item else "Purchase Order",
-				"document_name": docname,
+				"document_name": docname or "",
 				"bom_level": item.bom_level,
-				"produced_qty": order_details.get((docname, item.production_item)).get("produced_qty"),
-				"pending_qty": flt(item.qty) - flt(order_details.get((docname, item.production_item)).get("produced_qty"))
+				"produced_qty": order_details.get((docname, item.production_item), {}).get("produced_qty", 0),
+				"pending_qty": flt(item.qty) - flt(order_details.get((docname, item.production_item), {}).get("produced_qty", 0))
 			})
 
 def get_work_order_details(filters, order_details):

erpnext/public/js/controllers/buying.js

@@ -165,43 +165,31 @@ erpnext.buying.BuyingController = class BuyingController extends erpnext.Transac
 	}
 
 	qty(doc, cdt, cdn) {
-		var item = frappe.get_doc(cdt, cdn);
 		if ((doc.doctype == "Purchase Receipt") || (doc.doctype == "Purchase Invoice" && (doc.update_stock || doc.is_return))) {
-			frappe.model.round_floats_in(item, ["qty", "received_qty"]);
-
-			if(!doc.is_return && this.validate_negative_quantity(cdt, cdn, item, ["qty", "received_qty"])){ return }
-
-			if(!item.rejected_qty && item.qty) {
-				item.received_qty = item.qty;
-			}
-
-			frappe.model.round_floats_in(item, ["qty", "received_qty"]);
-			item.rejected_qty = flt(item.received_qty - item.qty, precision("rejected_qty", item));
-			item.received_stock_qty = flt(item.conversion_factor, precision("conversion_factor", item)) * flt(item.received_qty);
+			this.calculate_received_qty(doc, cdt, cdn)
 		}
 		super.qty(doc, cdt, cdn);
 	}
 
-	batch_no(doc, cdt, cdn) {
-		super.batch_no(doc, cdt, cdn);
-	}
-
-	received_qty(doc, cdt, cdn) {
-		this.calculate_accepted_qty(doc, cdt, cdn)
-	}
-
 	rejected_qty(doc, cdt, cdn) {
-		this.calculate_accepted_qty(doc, cdt, cdn)
+		this.calculate_received_qty(doc, cdt, cdn)
 	}
 
-	calculate_accepted_qty(doc, cdt, cdn){
+	calculate_received_qty(doc, cdt, cdn){
 		var item = frappe.get_doc(cdt, cdn);
-		frappe.model.round_floats_in(item, ["received_qty", "rejected_qty"]);
+		frappe.model.round_floats_in(item, ["qty", "rejected_qty"]);
+
+		if(!doc.is_return && this.validate_negative_quantity(cdt, cdn, item, ["qty", "rejected_qty"])){ return }
 
-		if(!doc.is_return && this.validate_negative_quantity(cdt, cdn, item, ["received_qty", "rejected_qty"])){ return }
+		let received_qty = flt(item.qty + item.rejected_qty, precision("received_qty", item));
+		let received_stock_qty = flt(item.conversion_factor, precision("conversion_factor", item)) * flt(received_qty);
 
-		item.qty = flt(item.received_qty - item.rejected_qty, precision("qty", item));
-		this.qty(doc, cdt, cdn);
+		frappe.model.set_value(cdt, cdn, "received_qty", received_qty);
+		frappe.model.set_value(cdt, cdn, "received_stock_qty", received_stock_qty);
+	}
+
+	batch_no(doc, cdt, cdn) {
+		super.batch_no(doc, cdt, cdn);
 	}
 
 	validate_negative_quantity(cdt, cdn, item, fieldnames){

erpnext/selling/doctype/customer/customer.py

@@ -463,11 +463,14 @@ def get_customer_list(doctype, txt, searchfield, start, page_len, filters=None):
 
 
 def check_credit_limit(customer, company, ignore_outstanding_sales_order=False, extra_amount=0):
+	credit_limit = get_credit_limit(customer, company)
+	if not credit_limit:
+		return
+
 	customer_outstanding = get_customer_outstanding(customer, company, ignore_outstanding_sales_order)
 	if extra_amount > 0:
 		customer_outstanding += flt(extra_amount)
 
-	credit_limit = get_credit_limit(customer, company)
 	if credit_limit > 0 and flt(customer_outstanding) > credit_limit:
 		msgprint(_("Credit limit has been crossed for customer {0} ({1}/{2})")
 			.format(customer, customer_outstanding, credit_limit))

erpnext/setup/doctype/company/company.py

@@ -413,7 +413,7 @@ def install_country_fixtures(company, country):
 			frappe.get_attr(module_name)(company, False)
 		except Exception as e:
 			frappe.log_error()
-			frappe.throw(_("Failed to setup defaults for country {0}. Please contact support@erpnext.com").format(frappe.bold(country)))
+			frappe.throw(_("Failed to setup defaults for country {0}. Please contact support.").format(frappe.bold(country)))
 
 
 def update_company_current_month_sales(company):

erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py

@@ -10,6 +10,7 @@ from frappe.utils import add_days, cint, cstr, flt, today
 
 import erpnext
 from erpnext.accounts.doctype.account.test_account import get_inventory_account
+from erpnext.controllers.buying_controller import QtyMismatchError
 from erpnext.stock.doctype.item.test_item import create_item, make_item
 from erpnext.stock.doctype.purchase_receipt.purchase_receipt import make_purchase_invoice
 from erpnext.stock.doctype.serial_no.serial_no import SerialNoDuplicateError, get_serial_nos
@@ -22,20 +23,54 @@ class TestPurchaseReceipt(ERPNextTestCase):
 	def setUp(self):
 		frappe.db.set_value("Buying Settings", None, "allow_multiple_items", 1)
 
+	def test_purchase_receipt_received_qty(self):
+		"""
+			1. Test if received qty is validated against accepted + rejected
+			2. Test if received qty is auto set on save
+		"""
+		pr = make_purchase_receipt(
+			qty=1,
+			rejected_qty=1,
+			received_qty=3,
+			item_code="_Test Item Home Desktop 200",
+			do_not_save=True
+		)
+		self.assertRaises(QtyMismatchError, pr.save)
+
+		pr.items[0].received_qty = 0
+		pr.save()
+		self.assertEqual(pr.items[0].received_qty, 2)
+
+		# teardown
+		pr.delete()
+
 	def test_reverse_purchase_receipt_sle(self):
 
 		pr = make_purchase_receipt(qty=0.5, item_code="_Test Item Home Desktop 200")
 
-		sl_entry = frappe.db.get_all("Stock Ledger Entry", {"voucher_type": "Purchase Receipt",
-			"voucher_no": pr.name}, ['actual_qty'])
+		sl_entry = frappe.db.get_all(
+			"Stock Ledger Entry",
+			{
+				"voucher_type": "Purchase Receipt",
+				"voucher_no": pr.name
+			},
+			['actual_qty']
+		)
 
 		self.assertEqual(len(sl_entry), 1)
 		self.assertEqual(sl_entry[0].actual_qty, 0.5)
 
 		pr.cancel()
 
-		sl_entry_cancelled = frappe.db.get_all("Stock Ledger Entry", {"voucher_type": "Purchase Receipt",
-			"voucher_no": pr.name}, ['actual_qty'], order_by='creation')
+		sl_entry_cancelled = frappe.db.get_all(
+			"Stock Ledger Entry",
+			{
+				"voucher_type": "Purchase Receipt",
+				"voucher_no": pr.name
+			},
+			['actual_qty'],
+			order_by='creation'
+		)
 
 		self.assertEqual(len(sl_entry_cancelled), 2)
 		self.assertEqual(sl_entry_cancelled[1].actual_qty, -0.5)
@@ -61,8 +96,15 @@ class TestPurchaseReceipt(ERPNextTestCase):
 					}]
 			}).insert()
 
-		template = frappe.db.get_value('Payment Terms Template', '_Test Payment Terms Template For Purchase Invoice')
-		old_template_in_supplier = frappe.db.get_value("Supplier", "_Test Supplier", "payment_terms")
+		template = frappe.db.get_value(
+			"Payment Terms Template",
+			"_Test Payment Terms Template For Purchase Invoice"
+		)
+		old_template_in_supplier = frappe.db.get_value(
+			"Supplier",
+			"_Test Supplier",
+			"payment_terms"
+		)
 		frappe.db.set_value("Supplier", "_Test Supplier", "payment_terms", template)
 
 		pr = make_purchase_receipt(do_not_save=True)
@@ -88,30 +130,59 @@ class TestPurchaseReceipt(ERPNextTestCase):
 		# teardown
 		pi.delete() # draft PI
 		pr.cancel()
-		frappe.db.set_value("Supplier", "_Test Supplier", "payment_terms", old_template_in_supplier)
-		frappe.get_doc('Payment Terms Template', '_Test Payment Terms Template For Purchase Invoice').delete()
+		frappe.db.set_value(
+			"Supplier",
+			"_Test Supplier",
+			"payment_terms",
+			old_template_in_supplier
+		)
+		frappe.get_doc(
+			"Payment Terms Template",
+			"_Test Payment Terms Template For Purchase Invoice"
+		).delete()
 
 	def test_purchase_receipt_no_gl_entry(self):
 		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
 
-		company = frappe.db.get_value('Warehouse', '_Test Warehouse - _TC', 'company')
-
-		existing_bin_qty, existing_bin_stock_value = frappe.db.get_value("Bin", {"item_code": "_Test Item",
-			"warehouse": "_Test Warehouse - _TC"}, ["actual_qty", "stock_value"])
+		existing_bin_qty, existing_bin_stock_value = frappe.db.get_value(
+			"Bin",
+			{
+				"item_code": "_Test Item",
+				"warehouse": "_Test Warehouse - _TC"
+			},
+			["actual_qty", "stock_value"]
+		)
 
 		if existing_bin_qty < 0:
-			make_stock_entry(item_code="_Test Item", target="_Test Warehouse - _TC", qty=abs(existing_bin_qty))
+			make_stock_entry(
+				item_code="_Test Item",
+				target="_Test Warehouse - _TC",
+				qty=abs(existing_bin_qty)
+			)
 
 		pr = make_purchase_receipt()
 
-		stock_value_difference = frappe.db.get_value("Stock Ledger Entry",
-			{"voucher_type": "Purchase Receipt", "voucher_no": pr.name,
-				"item_code": "_Test Item", "warehouse": "_Test Warehouse - _TC"}, "stock_value_difference")
+		stock_value_difference = frappe.db.get_value(
+			"Stock Ledger Entry",
+			{
+				"voucher_type": "Purchase Receipt",
+				"voucher_no": pr.name,
+				"item_code": "_Test Item",
+				"warehouse": "_Test Warehouse - _TC"
+			},
+			"stock_value_difference"
+		)
 
 		self.assertEqual(stock_value_difference, 250)
 
-		current_bin_stock_value = frappe.db.get_value("Bin", {"item_code": "_Test Item",
-			"warehouse": "_Test Warehouse - _TC"}, "stock_value")
+		current_bin_stock_value = frappe.db.get_value(
+			"Bin",
+			{
+				"item_code": "_Test Item",
+				"warehouse": "_Test Warehouse - _TC"
+			},
+			"stock_value"
+		)
 		self.assertEqual(current_bin_stock_value, existing_bin_stock_value + 250)
 
 		self.assertFalse(get_gl_entries("Purchase Receipt", pr.name))
@@ -133,13 +204,17 @@ class TestPurchaseReceipt(ERPNextTestCase):
 
 		pr = make_purchase_receipt(item_code=item.name, qty=5, rate=500)
 
-		self.assertTrue(frappe.db.get_value('Batch', {'item': item.name, 'reference_name': pr.name}))
+		self.assertTrue(
+			frappe.db.get_value('Batch', {'item': item.name, 'reference_name': pr.name})
+		)
 
 		pr.load_from_db()
 		batch_no = pr.items[0].batch_no
 		pr.cancel()
 
-		self.assertFalse(frappe.db.get_value('Batch', {'item': item.name, 'reference_name': pr.name}))
+		self.assertFalse(
+			frappe.db.get_value('Batch', {'item': item.name, 'reference_name': pr.name})
+		)
 		self.assertFalse(frappe.db.get_all('Serial No', {'batch_no': batch_no}))
 
 	def test_duplicate_serial_nos(self):
@@ -158,42 +233,78 @@ class TestPurchaseReceipt(ERPNextTestCase):
 		pr = make_purchase_receipt(item_code=item.name, qty=2, rate=500)
 		pr.load_from_db()
 
-		serial_nos = frappe.db.get_value('Stock Ledger Entry',
-			{'voucher_type': 'Purchase Receipt', 'voucher_no': pr.name, 'item_code': item.name}, 'serial_no')
+		serial_nos = frappe.db.get_value(
+			"Stock Ledger Entry",
+			{
+				"voucher_type": "Purchase Receipt",
+				"voucher_no": pr.name,
+				"item_code": item.name
+			},
+			"serial_no"
+		)
 
 		serial_nos = get_serial_nos(serial_nos)
 
 		self.assertEquals(get_serial_nos(pr.items[0].serial_no), serial_nos)
 
 		# Then tried to receive same serial nos in difference company
-		pr_different_company = make_purchase_receipt(item_code=item.name, qty=2, rate=500,
-			serial_no='\n'.join(serial_nos), company='_Test Company 1', do_not_submit=True,
-			warehouse = 'Stores - _TC1')
+		pr_different_company = make_purchase_receipt(
+			item_code=item.name,
+			qty=2,
+			rate=500,
+			serial_no='\n'.join(serial_nos),
+			company='_Test Company 1',
+			do_not_submit=True,
+			warehouse = 'Stores - _TC1'
+		)
 
 		self.assertRaises(SerialNoDuplicateError, pr_different_company.submit)
 
 		# Then made delivery note to remove the serial nos from stock
-		dn = create_delivery_note(item_code=item.name, qty=2, rate = 1500, serial_no='\n'.join(serial_nos))
+		dn = create_delivery_note(
+			item_code=item.name,
+			qty=2,
+			rate=1500,
+			serial_no='\n'.join(serial_nos)
+		)
 		dn.load_from_db()
 		self.assertEquals(get_serial_nos(dn.items[0].serial_no), serial_nos)
 
 		posting_date = add_days(today(), -3)
 
 		# Try to receive same serial nos again in the same company with backdated.
-		pr1 = make_purchase_receipt(item_code=item.name, qty=2, rate=500,
-			posting_date=posting_date, serial_no='\n'.join(serial_nos), do_not_submit=True)
+		pr1 = make_purchase_receipt(
+			item_code=item.name,
+			qty=2,
+			rate=500,
+			posting_date=posting_date,
+			serial_no='\n'.join(serial_nos),
+			do_not_submit=True
+		)
 
 		self.assertRaises(SerialNoExistsInFutureTransaction, pr1.submit)
 
 		# Try to receive same serial nos with different company with backdated.
-		pr2 = make_purchase_receipt(item_code=item.name, qty=2, rate=500,
-			posting_date=posting_date, serial_no='\n'.join(serial_nos), company='_Test Company 1', do_not_submit=True,
-			warehouse = 'Stores - _TC1')
+		pr2 = make_purchase_receipt(
+			item_code=item.name,
+			qty=2,
+			rate=500,
+			posting_date=posting_date,
+			serial_no='\n'.join(serial_nos),
+			company="_Test Company 1",
+			do_not_submit=True,
+			warehouse="Stores - _TC1"
+		)
 
 		self.assertRaises(SerialNoExistsInFutureTransaction, pr2.submit)
 
 		# Receive the same serial nos after the delivery note posting date and time
-		make_purchase_receipt(item_code=item.name, qty=2, rate=500, serial_no='\n'.join(serial_nos))
+		make_purchase_receipt(
+			item_code=item.name,
+			qty=2,
+			rate=500,
+			serial_no='\n'.join(serial_nos)
+		)
 
 		# Raise the error for backdated deliver note entry cancel
 		self.assertRaises(SerialNoExistsInFutureTransaction, dn.cancel)
@@ -236,11 +347,23 @@ class TestPurchaseReceipt(ERPNextTestCase):
 	def test_subcontracting(self):
 		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
 
-		frappe.db.set_value("Buying Settings", None, "backflush_raw_materials_of_subcontract_based_on", "BOM")
-		make_stock_entry(item_code="_Test Item", target="_Test Warehouse 1 - _TC", qty=100, basic_rate=100)
-		make_stock_entry(item_code="_Test Item Home Desktop 100", target="_Test Warehouse 1 - _TC",
-			qty=100, basic_rate=100)
-		pr = make_purchase_receipt(item_code="_Test FG Item", qty=10, rate=500, is_subcontracted="Yes")
+		frappe.db.set_value(
+			"Buying Settings", None,
+			"backflush_raw_materials_of_subcontract_based_on", "BOM"
+		)
+
+		make_stock_entry(
+			item_code="_Test Item", qty=100,
+			target="_Test Warehouse 1 - _TC", basic_rate=100
+		)
+		make_stock_entry(
+			item_code="_Test Item Home Desktop 100", qty=100,
+			target="_Test Warehouse 1 - _TC", basic_rate=100
+		)
+		pr = make_purchase_receipt(
+			item_code="_Test FG Item", qty=10,
+			rate=500, is_subcontracted="Yes"
+		)
 		self.assertEqual(len(pr.get("supplied_items")), 2)
 
 		rm_supp_cost = sum(d.amount for d in pr.get("supplied_items"))
@@ -250,17 +373,33 @@ class TestPurchaseReceipt(ERPNextTestCase):
 
 	def test_subcontracting_gle_fg_item_rate_zero(self):
 		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
-		frappe.db.set_value("Buying Settings", None, "backflush_raw_materials_of_subcontract_based_on", "BOM")
+		frappe.db.set_value(
+			"Buying Settings", None,
+			"backflush_raw_materials_of_subcontract_based_on", "BOM"
+		)
 
-		se1 = make_stock_entry(item_code="_Test Item", target="Work In Progress - TCP1",
-			qty=100, basic_rate=100, company="_Test Company with perpetual inventory")
+		se1 = make_stock_entry(
+			item_code="_Test Item",
+			target="Work In Progress - TCP1",
+			qty=100, basic_rate=100,
+			company="_Test Company with perpetual inventory"
+		)
 
-		se2 = make_stock_entry(item_code="_Test Item Home Desktop 100", target="Work In Progress - TCP1",
-			qty=100, basic_rate=100, company="_Test Company with perpetual inventory")
+		se2 = make_stock_entry(
+			item_code="_Test Item Home Desktop 100",
+			target="Work In Progress - TCP1",
+			qty=100, basic_rate=100,
+			company="_Test Company with perpetual inventory"
+		)
 
-		pr = make_purchase_receipt(item_code="_Test FG Item", qty=10, rate=0, is_subcontracted="Yes",
-			company="_Test Company with perpetual inventory", warehouse='Stores - TCP1',
-			supplier_warehouse='Work In Progress - TCP1')
+		pr = make_purchase_receipt(
+			item_code="_Test FG Item",
+			qty=10, rate=0,
+			is_subcontracted="Yes",
+			company="_Test Company with perpetual inventory",
+			warehouse="Stores - TCP1",
+			supplier_warehouse="Work In Progress - TCP1"
+		)
 
 		gl_entries = get_gl_entries("Purchase Receipt", pr.name)
 
@@ -294,13 +433,23 @@ class TestPurchaseReceipt(ERPNextTestCase):
 		po = create_purchase_order(item_code=item_code, qty=1, include_exploded_items=0,
 			is_subcontracted="Yes", supplier_warehouse="_Test Warehouse 1 - _TC")
 
-		#stock raw materials in a warehouse before transfer
-		se1 = make_stock_entry(target="_Test Warehouse - _TC",
-			item_code = "Test Extra Item 1", qty=10, basic_rate=100)
-		se2 = make_stock_entry(target="_Test Warehouse - _TC",
-			item_code = "_Test FG Item", qty=1, basic_rate=100)
-		se3 = make_stock_entry(target="_Test Warehouse - _TC",
-			item_code = "Test Extra Item 2", qty=1, basic_rate=100)
+		# stock raw materials in a warehouse before transfer
+		make_stock_entry(
+			target="_Test Warehouse - _TC",
+			item_code = "Test Extra Item 1",
+			qty=10, basic_rate=100
+		)
+		make_stock_entry(
+			target="_Test Warehouse - _TC",
+			item_code = "_Test FG Item",
+			qty=1, basic_rate=100
+		)
+		make_stock_entry(
+			target="_Test Warehouse - _TC",
+			item_code = "Test Extra Item 2",
+			qty=1, basic_rate=100
+		)
+
 		rm_items = [
 			{
 				"item_code": item_code,
@@ -334,11 +483,17 @@ class TestPurchaseReceipt(ERPNextTestCase):
 
 	def test_serial_no_supplier(self):
 		pr = make_purchase_receipt(item_code="_Test Serialized Item With Series", qty=1)
-		self.assertEqual(frappe.db.get_value("Serial No", pr.get("items")[0].serial_no, "supplier"),
-			pr.supplier)
+		pr_row_1_serial_no = pr.get("items")[0].serial_no
+
+		self.assertEqual(
+			frappe.db.get_value("Serial No", pr_row_1_serial_no, "supplier"),
+			pr.supplier
+		)
 
 		pr.cancel()
-		self.assertFalse(frappe.db.get_value("Serial No", pr.get("items")[0].serial_no, "warehouse"))
+		self.assertFalse(
+			frappe.db.get_value("Serial No", pr_row_1_serial_no, "warehouse")
+		)
 
 	def test_rejected_serial_no(self):
 		pr = frappe.copy_doc(test_records[0])
@@ -365,18 +520,33 @@ class TestPurchaseReceipt(ERPNextTestCase):
 		pr.cancel()
 
 	def test_purchase_return_partial(self):
-		pr = make_purchase_receipt(company="_Test Company with perpetual inventory",
-			warehouse = "Stores - TCP1", supplier_warehouse = "Work in Progress - TCP1")
+		pr = make_purchase_receipt(
+			company="_Test Company with perpetual inventory",
+			warehouse = "Stores - TCP1",
+			supplier_warehouse = "Work in Progress - TCP1"
+		)
 
-		return_pr = make_purchase_receipt(company="_Test Company with perpetual inventory",
-			warehouse = "Stores - TCP1", supplier_warehouse = "Work in Progress - TCP1",
-			is_return=1, return_against=pr.name, qty=-2, do_not_submit=1)
+		return_pr = make_purchase_receipt(
+			company="_Test Company with perpetual inventory",
+			warehouse = "Stores - TCP1",
+			supplier_warehouse = "Work in Progress - TCP1",
+			is_return=1,
+			return_against=pr.name,
+			qty=-2,
+			do_not_submit=1
+		)
 		return_pr.items[0].purchase_receipt_item = pr.items[0].name
 		return_pr.submit()
 
 		# check sle
-		outgoing_rate = frappe.db.get_value("Stock Ledger Entry", {"voucher_type": "Purchase Receipt",
-			"voucher_no": return_pr.name}, "outgoing_rate")
+		outgoing_rate = frappe.db.get_value(
+			"Stock Ledger Entry",
+			{
+				"voucher_type": "Purchase Receipt",
+				"voucher_no": return_pr.name
+			},
+			"outgoing_rate"
+		)
 
 		self.assertEqual(outgoing_rate, 50)
 
@@ -440,11 +610,21 @@ class TestPurchaseReceipt(ERPNextTestCase):
 		pr.cancel()
 
 	def test_purchase_return_full(self):
-		pr = make_purchase_receipt(company="_Test Company with perpetual inventory", warehouse = "Stores - TCP1",
-			supplier_warehouse = "Work in Progress - TCP1")
+		pr = make_purchase_receipt(
+			company="_Test Company with perpetual inventory",
+			warehouse = "Stores - TCP1",
+			supplier_warehouse = "Work in Progress - TCP1"
+		)
 
-		return_pr = make_purchase_receipt(company="_Test Company with perpetual inventory", warehouse = "Stores - TCP1",
-			supplier_warehouse = "Work in Progress - TCP1", is_return=1, return_against=pr.name, qty=-5, do_not_submit=1)
+		return_pr = make_purchase_receipt(
+			company="_Test Company with perpetual inventory",
+			warehouse = "Stores - TCP1",
+			supplier_warehouse = "Work in Progress - TCP1",
+			is_return=1,
+			return_against=pr.name,
+			qty=-5,
+			do_not_submit=1
+		)
 		return_pr.items[0].purchase_receipt_item = pr.items[0].name
 		return_pr.submit()
 
@@ -466,15 +646,41 @@ class TestPurchaseReceipt(ERPNextTestCase):
 
 		rejected_warehouse="_Test Rejected Warehouse - TCP1"
 		if not frappe.db.exists("Warehouse", rejected_warehouse):
-			get_warehouse(company = "_Test Company with perpetual inventory",
-				abbr = " - TCP1", warehouse_name = "_Test Rejected Warehouse").name
+			get_warehouse(
+				company = "_Test Company with perpetual inventory",
+				abbr = " - TCP1",
+				warehouse_name = "_Test Rejected Warehouse"
+			).name
 
-		pr = make_purchase_receipt(company="_Test Company with perpetual inventory", warehouse = "Stores - TCP1", supplier_warehouse = "Work in Progress - TCP1", received_qty=4, qty=2, rejected_warehouse=rejected_warehouse)
+		pr = make_purchase_receipt(
+			company="_Test Company with perpetual inventory",
+			warehouse = "Stores - TCP1",
+			supplier_warehouse = "Work in Progress - TCP1",
+			qty=2,
+			rejected_qty=2,
+			rejected_warehouse=rejected_warehouse
+		)
 
-		return_pr = make_purchase_receipt(company="_Test Company with perpetual inventory", warehouse = "Stores - TCP1", supplier_warehouse = "Work in Progress - TCP1", is_return=1, return_against=pr.name, received_qty = -4, qty=-2, rejected_warehouse=rejected_warehouse)
+		return_pr = make_purchase_receipt(
+			company="_Test Company with perpetual inventory",
+			warehouse = "Stores - TCP1",
+			supplier_warehouse = "Work in Progress - TCP1",
+			is_return=1,
+			return_against=pr.name,
+			qty=-2,
+			rejected_qty = -2,
+			rejected_warehouse=rejected_warehouse
+		)
 
-		actual_qty = frappe.db.get_value("Stock Ledger Entry", {"voucher_type": "Purchase Receipt",
-			"voucher_no": return_pr.name, 'warehouse': return_pr.items[0].rejected_warehouse}, "actual_qty")
+		actual_qty = frappe.db.get_value(
+			"Stock Ledger Entry",
+			{
+				"voucher_type": "Purchase Receipt",
+				"voucher_no": return_pr.name,
+				"warehouse": return_pr.items[0].rejected_warehouse
+			},
+			"actual_qty"
+		)
 
 		self.assertEqual(actual_qty, -2)
 
@@ -499,8 +705,13 @@ class TestPurchaseReceipt(ERPNextTestCase):
 			"purchase_document_no": pr.name
 		})
 
-		return_pr = make_purchase_receipt(item_code="_Test Serialized Item With Series", qty=-1,
-			is_return=1, return_against=pr.name, serial_no=serial_no)
+		return_pr = make_purchase_receipt(
+			item_code="_Test Serialized Item With Series",
+			qty=-1,
+			is_return=1,
+			return_against=pr.name,
+			serial_no=serial_no
+		)
 
 		_check_serial_no_values(serial_no, {
 			"warehouse": "",
@@ -522,9 +733,21 @@ class TestPurchaseReceipt(ERPNextTestCase):
 			})
 			row.db_update()
 
-		pr = make_purchase_receipt(item_code=item_code, qty=1, uom="Box", conversion_factor=1.0)
-		return_pr = make_purchase_receipt(item_code=item_code, qty=-10, uom="Unit",
-			stock_uom="Box", conversion_factor=0.1, is_return=1, return_against=pr.name)
+		pr = make_purchase_receipt(
+			item_code=item_code,
+			qty=1,
+			uom="Box",
+			conversion_factor=1.0
+		)
+		return_pr = make_purchase_receipt(
+			item_code=item_code,
+			qty=-10,
+			uom="Unit",
+			stock_uom="Box",
+			conversion_factor=0.1,
+			is_return=1,
+			return_against=pr.name
+		)
 
 		self.assertEqual(abs(return_pr.items[0].stock_qty), 1.0)
 
@@ -540,13 +763,19 @@ class TestPurchaseReceipt(ERPNextTestCase):
 		pr.submit()
 
 		update_purchase_receipt_status(pr.name, "Closed")
-		self.assertEqual(frappe.db.get_value("Purchase Receipt", pr.name, "status"), "Closed")
+		self.assertEqual(
+			frappe.db.get_value("Purchase Receipt", pr.name, "status"), "Closed"
+		)
 
 		pr.reload()
 		pr.cancel()
 
 	def test_pr_billing_status(self):
-		# PO -> PR1 -> PI and PO -> PI and PO -> PR2
+		"""Flow:
+			1. PO -> PR1 -> PI
+			2. PO -> PI
+			3. PO -> PR2.
+		"""
 		from erpnext.buying.doctype.purchase_order.purchase_order import (
 			make_purchase_invoice as make_purchase_invoice_from_po,
 		)
@@ -610,21 +839,39 @@ class TestPurchaseReceipt(ERPNextTestCase):
 		pr_doc = make_purchase_receipt(item_code=item_code,
 			qty=1, serial_no = serial_no)
 
-		self.assertEqual(serial_no, frappe.db.get_value("Serial No",
-			{"purchase_document_type": "Purchase Receipt", "purchase_document_no": pr_doc.name}, "name"))
+		self.assertEqual(
+			serial_no,
+			frappe.db.get_value(
+				"Serial No",
+				{
+					"purchase_document_type": "Purchase Receipt",
+					"purchase_document_no": pr_doc.name
+				},
+				"name"
+			)
+		)
 
 		pr_doc.cancel()
 
-		#check for the auto created serial nos
+		# check for the auto created serial nos
 		item_code = "Test Auto Created Serial No"
 		if not frappe.db.exists("Item", item_code):
-			item = make_item(item_code, dict(has_serial_no=1, serial_no_series="KLJL.###"))
+			make_item(item_code, dict(has_serial_no=1, serial_no_series="KLJL.###"))
 
 		new_pr_doc = make_purchase_receipt(item_code=item_code, qty=1)
 
 		serial_no = get_serial_nos(new_pr_doc.items[0].serial_no)[0]
-		self.assertEqual(serial_no, frappe.db.get_value("Serial No",
-			{"purchase_document_type": "Purchase Receipt", "purchase_document_no": new_pr_doc.name}, "name"))
+		self.assertEqual(
+			serial_no,
+			frappe.db.get_value(
+				"Serial No",
+				{
+					"purchase_document_type": "Purchase Receipt",
+					"purchase_document_no": new_pr_doc.name
+				},
+				"name"
+			)
+		)
 
 		new_pr_doc.cancel()
 
@@ -700,8 +947,12 @@ class TestPurchaseReceipt(ERPNextTestCase):
 
 	def test_purchase_receipt_cost_center(self):
 		from erpnext.accounts.doctype.cost_center.test_cost_center import create_cost_center
+
 		cost_center = "_Test Cost Center for BS Account - TCP1"
-		create_cost_center(cost_center_name="_Test Cost Center for BS Account", company="_Test Company with perpetual inventory")
+		create_cost_center(
+			cost_center_name="_Test Cost Center for BS Account",
+			company="_Test Company with perpetual inventory"
+		)
 
 		if not frappe.db.exists('Location', 'Test Location'):
 			frappe.get_doc({
@@ -709,10 +960,16 @@ class TestPurchaseReceipt(ERPNextTestCase):
 				'location_name': 'Test Location'
 			}).insert()
 
-		pr = make_purchase_receipt(cost_center=cost_center, company="_Test Company with perpetual inventory",
-			warehouse = "Stores - TCP1", supplier_warehouse = "Work in Progress - TCP1")
+		pr = make_purchase_receipt(
+			cost_center=cost_center,
+			company="_Test Company with perpetual inventory",
+			warehouse = "Stores - TCP1",
+			supplier_warehouse = "Work in Progress - TCP1"
+		)
 
-		stock_in_hand_account = get_inventory_account(pr.company, pr.get("items")[0].warehouse)
+		stock_in_hand_account = get_inventory_account(
+			pr.company, pr.get("items")[0].warehouse
+		)
 		gl_entries = get_gl_entries("Purchase Receipt", pr.name)
 
 		self.assertTrue(gl_entries)
@@ -736,9 +993,16 @@ class TestPurchaseReceipt(ERPNextTestCase):
 				'doctype': 'Location',
 				'location_name': 'Test Location'
 			}).insert()
-		pr = make_purchase_receipt(company="_Test Company with perpetual inventory", warehouse = "Stores - TCP1", supplier_warehouse = "Work in Progress - TCP1")
 
-		stock_in_hand_account = get_inventory_account(pr.company, pr.get("items")[0].warehouse)
+		pr = make_purchase_receipt(
+			company="_Test Company with perpetual inventory",
+			warehouse = "Stores - TCP1",
+			supplier_warehouse = "Work in Progress - TCP1"
+		)
+
+		stock_in_hand_account = get_inventory_account(
+			pr.company, pr.get("items")[0].warehouse
+		)
 		gl_entries = get_gl_entries("Purchase Receipt", pr.name)
 
 		self.assertTrue(gl_entries)
@@ -766,7 +1030,11 @@ class TestPurchaseReceipt(ERPNextTestCase):
 		po = create_purchase_order()
 		pr = create_pr_against_po(po.name)
 
-		pr1 = make_purchase_receipt(is_return=1, return_against=pr.name, qty=-1, do_not_submit=True)
+		pr1 = make_purchase_receipt(
+			qty=-1,
+			is_return=1, return_against=pr.name,
+			do_not_submit=True
+		)
 		pr1.items[0].purchase_order = po.name
 		pr1.items[0].purchase_order_item = po.items[0].name
 		pr1.items[0].purchase_receipt_item = pr.items[0].name
@@ -799,7 +1067,11 @@ class TestPurchaseReceipt(ERPNextTestCase):
 		pi1.save()
 		pi1.submit()
 
-		pr2 = make_purchase_receipt(is_return=1, return_against=pr1.name, qty=-2, do_not_submit=True)
+		pr2 = make_purchase_receipt(
+			qty=-2,
+			is_return=1, return_against=pr1.name,
+			do_not_submit=True
+		)
 		pr2.items[0].purchase_receipt_item = pr1.items[0].name
 		pr2.submit()
 
@@ -841,14 +1113,22 @@ class TestPurchaseReceipt(ERPNextTestCase):
 		pr1.cancel()
 
 	def test_stock_transfer_from_purchase_receipt_with_valuation(self):
-		create_warehouse("_Test Warehouse for Valuation", company="_Test Company with perpetual inventory",
-			properties={"account": '_Test Account Stock In Hand - TCP1'})
+		create_warehouse(
+			"_Test Warehouse for Valuation",
+			company="_Test Company with perpetual inventory",
+			properties={"account": '_Test Account Stock In Hand - TCP1'}
+		)
 
-		pr1 = make_purchase_receipt(warehouse = '_Test Warehouse for Valuation - TCP1',
-			company="_Test Company with perpetual inventory")
+		pr1 = make_purchase_receipt(
+			warehouse = '_Test Warehouse for Valuation - TCP1',
+			company="_Test Company with perpetual inventory"
+		)
 
-		pr = make_purchase_receipt(company="_Test Company with perpetual inventory",
-			warehouse = "Stores - TCP1", do_not_save=1)
+		pr = make_purchase_receipt(
+			company="_Test Company with perpetual inventory",
+			warehouse = "Stores - TCP1",
+			do_not_save=1
+		)
 
 		pr.items[0].from_warehouse = '_Test Warehouse for Valuation - TCP1'
 		pr.supplier_warehouse = ''
@@ -930,10 +1210,24 @@ class TestPurchaseReceipt(ERPNextTestCase):
 		}
 
 		rm_items = [
-			{"item_code":item_code,"rm_item_code":"Sub Contracted Raw Material 3","item_name":"_Test Item",
-				"qty":300,"warehouse":"_Test Warehouse - _TC", "stock_uom":"Nos", "name": po.supplied_items[0].name},
-			{"item_code":item_code,"rm_item_code":"Sub Contracted Raw Material 3","item_name":"_Test Item",
-				"qty":200,"warehouse":"_Test Warehouse - _TC", "stock_uom":"Nos", "name": po.supplied_items[0].name}
+			{
+				"item_code":item_code,
+				"rm_item_code":"Sub Contracted Raw Material 3",
+				"item_name":"_Test Item",
+				"qty":300,
+				"warehouse":"_Test Warehouse - _TC",
+				"stock_uom":"Nos",
+				"name": po.supplied_items[0].name
+			},
+			{
+				"item_code":item_code,
+				"rm_item_code":"Sub Contracted Raw Material 3",
+				"item_name":"_Test Item",
+				"qty":200,
+				"warehouse":"_Test Warehouse - _TC",
+				"stock_uom":"Nos",
+				"name": po.supplied_items[0].name
+			}
 		]
 
 		rm_item_string = json.dumps(rm_items)
@@ -943,8 +1237,14 @@ class TestPurchaseReceipt(ERPNextTestCase):
 		se.items[1].batch_no = ste2.items[0].batch_no
 		se.submit()
 
-		supplied_qty = frappe.db.get_value("Purchase Order Item Supplied",
-			{"parent": po.name, "rm_item_code": "Sub Contracted Raw Material 3"}, "supplied_qty")
+		supplied_qty = frappe.db.get_value(
+			"Purchase Order Item Supplied",
+			{
+				"parent": po.name,
+				"rm_item_code": "Sub Contracted Raw Material 3"
+			},
+			"supplied_qty"
+		)
 
 		self.assertEqual(supplied_qty, 500.00)
 
@@ -1016,10 +1316,18 @@ class TestPurchaseReceipt(ERPNextTestCase):
 		company = '_Test Company with perpetual inventory'
 		service_item = '_Test Non Stock Item'
 
-		before_test_value = frappe.db.get_value('Company', company, 'enable_perpetual_inventory_for_non_stock_items')
-		frappe.db.set_value('Company', company, 'enable_perpetual_inventory_for_non_stock_items', 1)
+		before_test_value = frappe.db.get_value(
+			'Company', company, 'enable_perpetual_inventory_for_non_stock_items'
+		)
+		frappe.db.set_value(
+			'Company', company,
+			'enable_perpetual_inventory_for_non_stock_items', 1
+		)
 		srbnb_account = 'Stock Received But Not Billed - TCP1'
-		frappe.db.set_value('Company', company, 'service_received_but_not_billed', srbnb_account)
+		frappe.db.set_value(
+			'Company', company,
+			'service_received_but_not_billed', srbnb_account
+		)
 
 		pr = make_purchase_receipt(
 			company=company, item=service_item,
@@ -1051,7 +1359,10 @@ class TestPurchaseReceipt(ERPNextTestCase):
 		self.assertEqual(len(item_one_gl_entry), 1)
 		self.assertEqual(len(item_two_gl_entry), 1)
 
-		frappe.db.set_value('Company', company, 'enable_perpetual_inventory_for_non_stock_items', before_test_value)
+		frappe.db.set_value(
+			'Company', company,
+			'enable_perpetual_inventory_for_non_stock_items', before_test_value
+		)
 
 	def test_purchase_receipt_with_exchange_rate_difference(self):
 		from erpnext.accounts.doctype.purchase_invoice.purchase_invoice import (
@@ -1076,10 +1387,19 @@ class TestPurchaseReceipt(ERPNextTestCase):
 		pr.submit()
 
 		# Get exchnage gain and loss account
-		exchange_gain_loss_account = frappe.db.get_value('Company', pr.company, 'exchange_gain_loss_account')
+		exchange_gain_loss_account = frappe.db.get_value(
+			'Company', pr.company, 'exchange_gain_loss_account'
+		)
 
 		# fetching the latest GL Entry with exchange gain and loss account account
-		amount = frappe.db.get_value('GL Entry', {'account': exchange_gain_loss_account, 'voucher_no': pr.name}, 'credit')
+		amount = frappe.db.get_value(
+			'GL Entry',
+			{
+				'account': exchange_gain_loss_account,
+				'voucher_no': pr.name
+			},
+			'credit'
+		)
 		discrepancy_caused_by_exchange_rate_diff = abs(pi.items[0].base_net_amount - pr.items[0].base_net_amount)
 
 		self.assertEqual(discrepancy_caused_by_exchange_rate_diff, amount)
@@ -1225,8 +1545,8 @@ def make_purchase_receipt(**args):
 	pr.return_against = args.return_against
 	pr.apply_putaway_rule = args.apply_putaway_rule
 	qty = args.qty or 5
-	received_qty = args.received_qty or qty
-	rejected_qty = args.rejected_qty or flt(received_qty) - flt(qty)
+	rejected_qty = args.rejected_qty or 0
+	received_qty = args.received_qty or flt(rejected_qty) + flt(qty)
 
 	item_code = args.item or args.item_code or "_Test Item"
 	uom = args.uom or frappe.db.get_value("Item", item_code, "stock_uom") or "_Test UOM"
@@ -1249,9 +1569,12 @@ def make_purchase_receipt(**args):
 
 	if args.get_multiple_items:
 		pr.items = []
-		for item in get_items(warehouse= args.warehouse, cost_center = args.cost_center or frappe.get_cached_value('Company', pr.company, 'cost_center')):
-			pr.append("items", item)
 
+		company_cost_center = frappe.get_cached_value('Company', pr.company, 'cost_center')
+		cost_center = args.cost_center or company_cost_center
+
+		for item in get_items(warehouse=args.warehouse, cost_center=cost_center):
+			pr.append("items", item)
 
 	if args.get_taxes_and_charges:
 		for tax in get_taxes():

erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json

@@ -197,6 +197,7 @@
   },
   {
    "bold": 1,
+   "default": "0",
    "fieldname": "received_qty",
    "fieldtype": "Float",
    "label": "Received Quantity",
@@ -204,6 +205,7 @@
    "oldfieldtype": "Currency",
    "print_hide": 1,
    "print_width": "100px",
+   "read_only": 1,
    "reqd": 1,
    "width": "100px"
   },
@@ -219,8 +221,10 @@
    "width": "100px"
   },
   {
+   "columns": 1,
    "fieldname": "rejected_qty",
    "fieldtype": "Float",
+   "in_list_view": 1,
    "label": "Rejected Quantity",
    "oldfieldname": "rejected_qty",
    "oldfieldtype": "Currency",
@@ -327,7 +331,7 @@
   },
   {
    "bold": 1,
-   "columns": 3,
+   "columns": 2,
    "fieldname": "rate",
    "fieldtype": "Currency",
    "in_list_view": 1,
@@ -543,6 +547,7 @@
    "fieldname": "stock_qty",
    "fieldtype": "Float",
    "label": "Accepted Qty in Stock UOM",
+   "no_copy": 1,
    "oldfieldname": "stock_qty",
    "oldfieldtype": "Currency",
    "print_hide": 1,
@@ -882,7 +887,9 @@
    "fieldname": "received_stock_qty",
    "fieldtype": "Float",
    "label": "Received Qty in Stock UOM",
-   "print_hide": 1
+   "no_copy": 1,
+   "print_hide": 1,
+   "read_only": 1
   },
   {
    "depends_on": "eval: doc.uom != doc.stock_uom",
@@ -969,10 +976,11 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-09-01 16:02:40.338597",
+ "modified": "2021-11-15 15:46:10.591600",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Purchase Receipt Item",
+ "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,

erpnext/stock/doctype/stock_entry/stock_entry.py

@@ -1462,52 +1462,94 @@ class StockEntry(StockController):
 		return item_dict
 
 	def get_pro_order_required_items(self, backflush_based_on=None):
-		item_dict = frappe._dict()
-		pro_order = frappe.get_doc("Work Order", self.work_order)
-		if not frappe.db.get_value("Warehouse", pro_order.wip_warehouse, "is_group"):
-			wip_warehouse = pro_order.wip_warehouse
+		"""
+			Gets Work Order Required Items only if Stock Entry purpose is **Material Transferred for Manufacture**.
+		"""
+		item_dict, job_card_items = frappe._dict(), []
+		work_order = frappe.get_doc("Work Order", self.work_order)
+
+		consider_job_card = work_order.transfer_material_against == "Job Card" and self.get("job_card")
+		if consider_job_card:
+			job_card_items = self.get_job_card_item_codes(self.get("job_card"))
+
+		if not frappe.db.get_value("Warehouse", work_order.wip_warehouse, "is_group"):
+			wip_warehouse = work_order.wip_warehouse
 		else:
 			wip_warehouse = None
 
-		for d in pro_order.get("required_items"):
-			if ( ((flt(d.required_qty) > flt(d.transferred_qty)) or
-				(backflush_based_on == "Material Transferred for Manufacture")) and
-				(d.include_item_in_manufacturing or self.purpose != "Material Transfer for Manufacture")):
+		for d in work_order.get("required_items"):
+			if consider_job_card and (d.item_code not in job_card_items):
+				continue
+
+			transfer_pending = flt(d.required_qty) > flt(d.transferred_qty)
+			can_transfer = transfer_pending or (backflush_based_on == "Material Transferred for Manufacture")
+
+			if not can_transfer:
+				continue
+
+			if d.include_item_in_manufacturing:
 				item_row = d.as_dict()
+				item_row["idx"] = len(item_dict) + 1
+
+				if consider_job_card:
+					job_card_item = frappe.db.get_value(
+						"Job Card Item",
+						{
+							"item_code": d.item_code,
+							"parent": self.get("job_card")
+						}
+					)
+					item_row["job_card_item"] = job_card_item or None
+
 				if d.source_warehouse and not frappe.db.get_value("Warehouse", d.source_warehouse, "is_group"):
 					item_row["from_warehouse"] = d.source_warehouse
 
 				item_row["to_warehouse"] = wip_warehouse
 				if item_row["allow_alternative_item"]:
-					item_row["allow_alternative_item"] = pro_order.allow_alternative_item
+					item_row["allow_alternative_item"] = work_order.allow_alternative_item
 
 				item_dict.setdefault(d.item_code, item_row)
 
 		return item_dict
 
+	def get_job_card_item_codes(self, job_card=None):
+		if not job_card:
+			return []
+
+		job_card_items = frappe.get_all(
+			"Job Card Item",
+			filters={
+				"parent": job_card
+			},
+			fields=["item_code"],
+			distinct=True
+		)
+		return [d.item_code for d in job_card_items]
+
 	def add_to_stock_entry_detail(self, item_dict, bom_no=None):
 		for d in item_dict:
-			stock_uom = item_dict[d].get("stock_uom") or frappe.db.get_value("Item", d, "stock_uom")
+			item_row = item_dict[d]
+			stock_uom = item_row.get("stock_uom") or frappe.db.get_value("Item", d, "stock_uom")
 
 			se_child = self.append('items')
-			se_child.s_warehouse = item_dict[d].get("from_warehouse")
-			se_child.t_warehouse = item_dict[d].get("to_warehouse")
-			se_child.item_code = item_dict[d].get('item_code') or cstr(d)
-			se_child.uom = item_dict[d]["uom"] if item_dict[d].get("uom") else stock_uom
+			se_child.s_warehouse = item_row.get("from_warehouse")
+			se_child.t_warehouse = item_row.get("to_warehouse")
+			se_child.item_code = item_row.get('item_code') or cstr(d)
+			se_child.uom = item_row["uom"] if item_row.get("uom") else stock_uom
 			se_child.stock_uom = stock_uom
-			se_child.qty = flt(item_dict[d]["qty"], se_child.precision("qty"))
-			se_child.allow_alternative_item = item_dict[d].get("allow_alternative_item", 0)
-			se_child.subcontracted_item = item_dict[d].get("main_item_code")
-			se_child.cost_center = (item_dict[d].get("cost_center") or
-				get_default_cost_center(item_dict[d], company = self.company))
-			se_child.is_finished_item = item_dict[d].get("is_finished_item", 0)
-			se_child.is_scrap_item = item_dict[d].get("is_scrap_item", 0)
-			se_child.is_process_loss = item_dict[d].get("is_process_loss", 0)
+			se_child.qty = flt(item_row["qty"], se_child.precision("qty"))
+			se_child.allow_alternative_item = item_row.get("allow_alternative_item", 0)
+			se_child.subcontracted_item = item_row.get("main_item_code")
+			se_child.cost_center = (item_row.get("cost_center") or
+				get_default_cost_center(item_row, company = self.company))
+			se_child.is_finished_item = item_row.get("is_finished_item", 0)
+			se_child.is_scrap_item = item_row.get("is_scrap_item", 0)
+			se_child.is_process_loss = item_row.get("is_process_loss", 0)
 
 			for field in ["idx", "po_detail", "original_item", "expense_account",
 				"description", "item_name", "serial_no", "batch_no", "allow_zero_valuation_rate"]:
-				if item_dict[d].get(field):
-					se_child.set(field, item_dict[d].get(field))
+				if item_row.get(field):
+					se_child.set(field, item_row.get(field))
 
 			if se_child.s_warehouse==None:
 				se_child.s_warehouse = self.from_warehouse
@@ -1515,12 +1557,11 @@ class StockEntry(StockController):
 				se_child.t_warehouse = self.to_warehouse
 
 			# in stock uom
-			se_child.conversion_factor = flt(item_dict[d].get("conversion_factor")) or 1
-			se_child.transfer_qty = flt(item_dict[d]["qty"]*se_child.conversion_factor, se_child.precision("qty"))
-
+			se_child.conversion_factor = flt(item_row.get("conversion_factor")) or 1
+			se_child.transfer_qty = flt(item_row["qty"]*se_child.conversion_factor, se_child.precision("qty"))
 
-			# to be assigned for finished item
-			se_child.bom_no = bom_no
+			se_child.bom_no = bom_no # to be assigned for finished item
+			se_child.job_card_item = item_row.get("job_card_item") if self.get("job_card") else None
 
 	def validate_with_material_request(self):
 		for item in self.get("items"):

erpnext/stock/page/warehouse_capacity_summary/warehouse_capacity_summary.html

@@ -1,19 +1,19 @@
 {% for d in data %}
 	<div class="dashboard-list-item" style="padding: 7px 15px;">
 		<div class="row">
-			<div class="col-sm-2 small" style="margin-top: 8px;">
+			<div class="col-sm-2" style="margin-top: 8px;">
 				<a data-type="warehouse" data-name="{{ d.warehouse }}">{{ d.warehouse }}</a>
 			</div>
-			<div class="col-sm-2 small" style="margin-top: 8px; ">
+			<div class="col-sm-2" style="margin-top: 8px; ">
 				<a data-type="item" data-name="{{ d.item_code }}">{{ d.item_code }}</a>
 			</div>
-			<div class="col-sm-1 small" style="margin-top: 8px; ">
+			<div class="col-sm-1" style="margin-top: 8px; ">
 				{{ d.stock_capacity }}
 			</div>
-			<div class="col-sm-2 small" style="margin-top: 8px; ">
+			<div class="col-sm-2" style="margin-top: 8px; ">
 				{{ d.actual_qty }}
 			</div>
-			<div class="col-sm-2 small">
+			<div class="col-sm-2">
 				<div class="progress" title="Occupied Qty: {{ d.actual_qty }}" style="margin-bottom: 4px; height: 7px; margin-top: 14px;">
 					<div class="progress-bar" role="progressbar"
 						aria-valuenow="{{ d.percent_occupied }}"
@@ -23,16 +23,19 @@
 					</div>
 				</div>
 			</div>
-			<div class="col-sm-1 small" style="margin-top: 8px;">
+			<div class="col-sm-1" style="margin-top: 8px;">
 				{{ d.percent_occupied }}%
 			</div>
 			{% if can_write %}
-			<div class="col-sm-1 text-right" style="margin-top: 2px;">
-				<button class="btn btn-default btn-xs btn-edit"
-				style="margin-top: 4px;margin-bottom: 4px;"
-				data-warehouse="{{ d.warehouse }}"
-				data-item="{{ escape(d.item_code) }}"
-				data-company="{{ escape(d.company) }}">{{ __("Edit Capacity") }}</a>
+			<div class="col-sm-2 text-right" style="margin-top: 2px;">
+				<button
+					class="btn btn-default btn-xs btn-edit"
+					style="margin: 4px 0; float: left;"
+					data-warehouse="{{ d.warehouse }}"
+					data-item="{{ escape(d.item_code) }}"
+					data-company="{{ escape(d.company) }}">
+					{{ __("Edit Capacity") }}
+				</button>
 			</div>
 			{% endif %}
 		</div>

erpnext/stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js

@@ -4,7 +4,7 @@ frappe.pages['warehouse-capacity-summary'].on_page_load = function(wrapper) {
 		title: 'Warehouse Capacity Summary',
 		single_column: true
 	});
-	page.set_secondary_action('Refresh', () => page.capacity_dashboard.refresh(), 'octicon octicon-sync');
+	page.set_secondary_action('Refresh', () => page.capacity_dashboard.refresh(), 'refresh');
 	page.start = 0;
 
 	page.company_field = page.add_field({

erpnext/stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html

@@ -1,18 +1,18 @@
 <div class="dashboard-list-item" style="padding: 12px 15px;">
 	<div class="row">
-		<div class="col-sm-2 small text-muted" style="margin-top: 8px;">
+		<div class="col-sm-2 text-muted" style="margin-top: 8px;">
 			Warehouse
 		</div>
-		<div class="col-sm-2 small text-muted" style="margin-top: 8px;">
+		<div class="col-sm-2 text-muted" style="margin-top: 8px;">
 			Item
 		</div>
-		<div class="col-sm-1 small text-muted" style="margin-top: 8px;">
+		<div class="col-sm-1 text-muted" style="margin-top: 8px;">
 			Stock Capacity
 		</div>
-		<div class="col-sm-2 small text-muted" style="margin-top: 8px;">
+		<div class="col-sm-2 text-muted" style="margin-top: 8px;">
 			Balance Stock Qty
 		</div>
-		<div class="col-sm-2 small text-muted" style="margin-top: 8px;">
+		<div class="col-sm-2 text-muted" style="margin-top: 8px;">
 			% Occupied
 		</div>
 	</div>