[cleanup] form dashboards

erpnext/buying/doctype/request_for_quotation/request_for_quotation_dashboard.py

@@ -3,9 +3,6 @@ from frappe import _
 data = {
 	'docstatus': 1,
 	'fieldname': 'request_for_quotation',
-	# 'non_standard_fieldnames': {
-	# 	'Purchase Order': 'prevdoc_detail_docname',
-	# },
 	'transactions': [
 		{
 			'label': _('Related Documents'),

erpnext/controllers/accounts_controller.py

@@ -173,6 +173,7 @@ class AccountsController(TransactionBase):
 
 					ret = get_item_details(args)
 
+
 					for fieldname, value in ret.items():
 						if item.meta.get_field(fieldname) and value is not None:
 							if (item.get(fieldname) is None or fieldname in force_item_fields):

erpnext/controllers/buying_controller.py

@@ -28,7 +28,7 @@ class BuyingController(StockController):
 		super(BuyingController, self).validate()
 		if getattr(self, "supplier", None) and not self.supplier_name:
 			self.supplier_name = frappe.db.get_value("Supplier", self.supplier, "supplier_name")
-		self.is_item_table_empty()
+
 		self.set_qty_as_per_stock_uom()
 		self.validate_stock_or_nonstock_items()
 		self.validate_warehouse()
@@ -129,7 +129,7 @@ class BuyingController(StockController):
 					valuation_amount_adjustment -= item.item_tax_amount
 
 				self.round_floats_in(item)
-				if flt(item.conversion_factor)==0:
+				if flt(item.conversion_factor)==0.0:
 					item.conversion_factor = get_conversion_factor(item.item_code, item.uom).get("conversion_factor") or 1.0
 
 				qty_in_stock_uom = flt(item.qty * item.conversion_factor)
@@ -276,10 +276,6 @@ class BuyingController(StockController):
 
 		return self._sub_contracted_items
 
-	def is_item_table_empty(self):
-		if not len(self.get("items")):
-			frappe.throw(_("Item table can not be blank"))
-
 	def set_qty_as_per_stock_uom(self):
 		for d in self.get("items"):
 			if d.meta.get_field("stock_qty"):

erpnext/controllers/status_updater.py

@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.utils import flt, comma_or
-from frappe import msgprint, _, throw
+from frappe import _
 from frappe.model.document import Document
 
 def validate_status(status, options):
@@ -135,15 +135,12 @@ class StatusUpdater(Document):
 						item['idx'] = d.idx
 						item['target_ref_field'] = args['target_ref_field'].replace('_', ' ')
 
-						if not item[args['target_ref_field']]:
+						# if not item[args['target_ref_field']]:
-							msgprint(_("Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0").format(item.item_code))
+						# 	msgprint(_("Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0").format(item.item_code))
-						elif args.get('no_tolerance'):
+						if args.get('no_tolerance'):
 							item['reduce_by'] = item[args['target_field']] - item[args['target_ref_field']]
 							if item['reduce_by'] > .01:
-								msgprint(_("Allowance for over-{0} crossed for Item {1}")
+								self.limits_crossed_error(args, item)
-									.format(args["overflow_type"], item.item_code))
-								throw(_("{0} must be reduced by {1} or you should increase overflow tolerance")
-									.format(_(item.target_ref_field.title()), item["reduce_by"]))
 
 						else:
 							self.check_overflow_with_tolerance(item, args)
@@ -162,10 +159,20 @@ class StatusUpdater(Document):
 			item['max_allowed'] = flt(item[args['target_ref_field']] * (100+tolerance)/100)
 			item['reduce_by'] = item[args['target_field']] - item['max_allowed']
 
-			msgprint(_("Allowance for over-{0} crossed for Item {1}.")
+			self.limits_crossed_error(args, item)
-				.format(args["overflow_type"], item["item_code"]))
+
-			throw(_("{0} must be reduced by {1} or you should increase overflow tolerance")
+	def limits_crossed_error(self, args, item):
-				.format(_(item["target_ref_field"].title()), item["reduce_by"]))
+		'''Raise exception for limits crossed'''
+		frappe.throw(_('This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?')
+			.format(
+				frappe.bold(_(item["target_ref_field"].title())),
+				frappe.bold(item["reduce_by"]),
+				frappe.bold(_(args.get('target_dt'))),
+				frappe.bold(_(self.doctype)),
+				frappe.bold(item.get('item_code'))
+			) + '<br><br>' +
+				_('To allow over-billing or over-ordering, update "Allowance" in Stock Settings or the Item.'),
+			title = _('Limit Crossed'))
 
 	def update_qty(self, update_modified=True):
 		"""Updates qty or amount at row level

erpnext/demo/data/item.json

@@ -92,7 +92,8 @@
   "image": null,
   "item_code": "Base Plate",
   "item_group": "Raw Material",
-  "item_name": "Base Plate"
+  "item_name": "Base Plate",
+  "is_sub_contracted_item": 1
  },
  {
   "default_supplier": "Scott Ties",

erpnext/demo/demo.py

@@ -4,7 +4,7 @@ import frappe, sys
 import erpnext
 import frappe.utils
 from erpnext.demo.setup_data import setup_data
-from erpnext.demo.user import hr, sales
+from erpnext.demo.user import hr, sales, purchase
 
 def make(domain='Manufacturing'):
 	frappe.flags.domain = domain
@@ -42,7 +42,7 @@ def simulate():
 
 		hr.work()
 		sales.work()
-		# run_purchase()
+		purchase.work()
 		# run_manufacturing()
 		# run_stock()
 		# run_accounts()

erpnext/demo/setup_data.py

@@ -300,3 +300,8 @@ def setup_user_roles():
 		user = frappe.get_doc('User', 'GabrielleLoftus@example.com')
 		user.add_roles('Sales User', 'Sales Manager', 'Accounts User')
 		frappe.db.set_global('demo_sales_user_2', user.name)
+
+	if not frappe.db.get_global('demo_purchase_user'):
+		user = frappe.get_doc('User', 'MichalSobczak@example.com')
+		user.add_roles('Purchase User', 'Purchase Manager', 'Accounts User')
+		frappe.db.set_global('demo_purchase_user', user.name)

erpnext/demo/user/purchase.py

@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 
 import frappe, random
-from frappe.utils.make_random import how_many, can_make, get_random
+from frappe.utils.make_random import how_many, get_random
 from frappe.desk import query_report
 from erpnext.setup.utils import get_exchange_rate
 from erpnext.accounts.party import get_party_account_currency
@@ -13,16 +13,22 @@ from erpnext.stock.doctype.material_request.material_request import make_request
 from erpnext.buying.doctype.request_for_quotation.request_for_quotation import \
 			 make_supplier_quotation as make_quotation_from_rfq
 
-def run_purchase(current_date):
+def work():
+	frappe.set_user(frappe.db.get_global('demo_purchase_user'))
+
 	if random.random() < 0.3:
 		report = "Items To Be Requested"
-		for row in query_report.run(report)["result"][:how_many("Material Request")]:
+		for row in query_report.run(report)["result"][:random.randint(1, 5)]:
 			item_code, qty = row[0], abs(row[-1])
 
 			mr = make_material_request(item_code, qty)
 
 	if random.random() < 0.3:
-		for mr in frappe.get_all('Material Request', filters={'material_request_type': 'Purchase', 'status': 'Open'}):
+		for mr in frappe.get_all('Material Request',
+			filters={'material_request_type': 'Purchase', 'status': 'Open'},
+			limit=random.randint(1,6)):
+			if not frappe.get_all('Request for Quotation',
+				filters={'material_request': mr.name}, limit=1):
 				rfq = make_request_for_quotation(mr.name)
 				rfq.transaction_date = frappe.flags.current_date
 				add_suppliers(rfq)
@@ -31,8 +37,12 @@ def run_purchase(current_date):
 
 	# Make suppier quotation from RFQ against each supplier.
 	if random.random() < 0.3:
-		for supplier_quotation in frappe.get_all('Request for Quotation', {'status': 'Open'}):
+		for rfq in frappe.get_all('Request for Quotation',
+			filters={'status': 'Open'}, limit=random.randint(1, 6)):
+			if not frappe.get_all('Supplier Quotation',
+				filters={'request_for_quotation': rfq.name}, limit=1):
 				rfq = frappe.get_doc('Request for Quotation', rfq.name)
+
 				for supplier in rfq.suppliers:
 					supplier_quotation = make_quotation_from_rfq(rfq.name, supplier.supplier)
 					supplier_quotation.save()
@@ -49,14 +59,14 @@ def run_purchase(current_date):
 		exchange_rate = get_exchange_rate(party_account_currency, company_currency)
 
 	# make supplier quotations
-	if can_make("Supplier Quotation"):
+	if random.random() < 0.3:
 		from erpnext.stock.doctype.material_request.material_request import make_supplier_quotation
 
 		report = "Material Requests for which Supplier Quotations are not created"
 		for row in query_report.run(report)["result"][:how_many("Supplier Quotation")]:
 			if row[0] != "'Total'":
 				sq = frappe.get_doc(make_supplier_quotation(row[0]))
-				sq.transaction_date = current_date
+				sq.transaction_date = frappe.flags.current_date
 				sq.supplier = supplier
 				sq.currency = party_account_currency or company_currency
 				sq.conversion_rate = exchange_rate
@@ -65,7 +75,7 @@ def run_purchase(current_date):
 				frappe.db.commit()
 
 	# make purchase orders
-	if can_make("Purchase Order"):
+	if random.random() < 0.3:
 		from erpnext.stock.doctype.material_request.material_request import make_purchase_order
 		report = "Requested Items To Be Ordered"
 		for row in query_report.run(report)["result"][:how_many("Purchase Order")]:
@@ -74,13 +84,13 @@ def run_purchase(current_date):
 				po.supplier = supplier
 				po.currency = party_account_currency or company_currency
 				po.conversion_rate = exchange_rate
-				po.transaction_date = current_date
+				po.transaction_date = frappe.flags.current_date
 				po.insert()
 				po.submit()
 				frappe.db.commit()
 
-	if can_make("Subcontract"):
+	if random.random() < 0.3:
-		make_subcontract(current_date)
+		make_subcontract()
 
 def make_material_request(item_code, qty):
 	mr = frappe.new_doc("Material Request")

erpnext/stock/doctype/material_request/material_request_dashboard.py

@@ -3,9 +3,6 @@ from frappe import _
 data = {
 	'docstatus': 1,
 	'fieldname': 'material_request',
-	'non_standard_fieldnames': {
-		'Purchase Order': 'prevdoc_detail_docname',
-	},
 	'transactions': [
 		{
 			'label': _('Related Documents'),