Merge branch 'hotfix'

[fix] 'NoneType' object is not iterable while saving quotation

erpnext/__init__.py

@@ -4,7 +4,7 @@ import inspect
 import frappe
 from erpnext.hooks import regional_overrides
 
-__version__ = '8.11.6'
+__version__ = '9.0.3'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/accounts/doctype/payment_entry/payment_entry.py

@@ -765,6 +765,7 @@ def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount=
 	pe.append("references", {
 		"reference_doctype": dt,
 		"reference_name": dn,
+		"bill_no": doc.get("bill_no"),
 		"due_date": doc.get("due_date"),
 		"total_amount": grand_total,
 		"outstanding_amount": outstanding_amount,

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py

@@ -30,7 +30,8 @@ class PaymentReconciliation(Document):
 		return payment_entries
 
 	def get_jv_entries(self):
-		dr_or_cr = self.get_dr_or_cr()
+		dr_or_cr = "credit_in_account_currency" if self.party_type == "Customer" \
+			else "debit_in_account_currency"
 
 		bank_account_condition = "t2.against_account like %(bank_cash_account)s" \
 				if self.bank_cash_account else "1=1"
@@ -72,13 +73,13 @@ class PaymentReconciliation(Document):
 			row = self.append('payments', {})
 			row.update(e)
 
-	def get_invoice_entries(self, paying_party=False):
+	def get_invoice_entries(self):
 		#Fetch JVs, Sales and Purchase Invoices for 'invoices' to reconcile against
 
 		condition = self.check_condition()
 
 		non_reconciled_invoices = get_outstanding_invoices(self.party_type, self.party,
-			self.receivable_payable_account, condition=condition, paying_party=paying_party)
+			self.receivable_payable_account, condition=condition)
 
 		self.add_invoice_entries(non_reconciled_invoices)
 
@@ -102,7 +103,8 @@ class PaymentReconciliation(Document):
 
 		self.get_invoice_entries()
 		self.validate_invoice()
-		dr_or_cr = self.get_dr_or_cr()
+		dr_or_cr = "credit_in_account_currency" \
+			if self.party_type == "Customer" else "debit_in_account_currency"
 			
 		lst = []
 		for e in self.get('payments'):
@@ -182,12 +184,3 @@ class PaymentReconciliation(Document):
 			cond += " and `{0}` <= {1}".format(dr_or_cr, flt(self.maximum_amount))
 
 		return cond
-
-	def get_dr_or_cr(self):
-		'''Return credit_in_account_currency if not set and party is customer.'''
-		if hasattr(self, "dr_or_cr"):
-			return self.dr_or_cr
-		if self.party_type == 'Customer':
-			return "credit_in_account_currency"
-		else:
-			return "debit_in_account_currency"

erpnext/accounts/doctype/pricing_rule/pricing_rule.json

@@ -1023,7 +1023,7 @@
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
-   "precision": "2", 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
@@ -1284,7 +1284,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-08-31 16:34:41.614743", 
+ "modified": "2017-09-27 08:31:38.432574", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Pricing Rule", 

erpnext/accounts/doctype/pricing_rule/pricing_rule.py

@@ -348,7 +348,6 @@ def apply_internal_priority(pricing_rules, field_set, args):
 	return filtered_rules or pricing_rules
 
 def set_transaction_type(args):
-	if args.transaction_type:return
 	if args.doctype in ("Opportunity", "Quotation", "Sales Order", "Delivery Note", "Sales Invoice"):
 		args.transaction_type = "selling"
 	elif args.doctype in ("Material Request", "Supplier Quotation", "Purchase Order",

erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json

@@ -699,7 +699,7 @@
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
-   "precision": "2", 
+   "precision": "", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
@@ -2166,7 +2166,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-07-17 17:54:48.246507", 
+ "modified": "2017-09-27 08:31:37.827893", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice Item", 

erpnext/accounts/doctype/tax_rule/tax_rule.py

@@ -8,6 +8,7 @@ from frappe import _
 from frappe.model.document import Document
 from frappe.utils import cstr, cint
 from frappe.contacts.doctype.address.address import get_default_address
+from frappe.utils.nestedset import get_root_of
 from erpnext.setup.doctype.customer_group.customer_group import get_parent_customer_groups
 
 class IncorrectCustomerGroup(frappe.ValidationError): pass
@@ -136,7 +137,7 @@ def get_tax_template(posting_date, args):
 		if key=="use_for_shopping_cart":
 			conditions.append("use_for_shopping_cart = {0}".format(1 if value else 0))
 		if key == 'customer_group':
-			if not value: value = _("All Customer Groups")
+			if not value: value = get_root_of("Customer Group")
 			customer_group_condition = get_customer_group_condition(value)
 			conditions.append("ifnull({0}, '') in ('', {1})".format(key, customer_group_condition))
 		else:

erpnext/accounts/report/general_ledger/general_ledger.js

@@ -83,7 +83,7 @@ frappe.query_reports["General Ledger"] = {
 					return;
 				}
 
-				var fieldname = frappe.model.scrub(party_type)+"_name";
+				var fieldname = party_type.toLowerCase() + "_name";
 				frappe.db.get_value(party_type, party, fieldname, function(value) {
 					frappe.query_report_filters_by_name.party_name.set_value(value[fieldname]);
 				});

erpnext/accounts/utils.py

@@ -569,11 +569,11 @@ def get_stock_rbnb_difference(posting_date, company):
 	# Amount should be credited
 	return flt(stock_rbnb) + flt(sys_bal)
 
-def get_outstanding_invoices(party_type, party, account, condition=None, paying_party=False):
+def get_outstanding_invoices(party_type, party, account, condition=None):
 	outstanding_invoices = []
 	precision = frappe.get_precision("Sales Invoice", "outstanding_amount")
 
-	if party_type=="Customer" or paying_party:
+	if party_type=="Customer":
 		dr_or_cr = "debit_in_account_currency - credit_in_account_currency"
 		payment_dr_or_cr = "payment_gl_entry.credit_in_account_currency - payment_gl_entry.debit_in_account_currency"
 	else:

erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js

@@ -2,29 +2,29 @@
 // For license information, please see license.txt
 
 frappe.query_reports["Quoted Item Comparison"] = {
-	"filters": [
+	filters: [
 		{
-			"fieldname": "supplier_quotation",
-			"label": __("Supplier Quotation"),
-			"fieldtype": "Link",
-			"options": "Supplier Quotation",
-			"default": "",
-			"get_query": function () {
+			fieldtype: "Link",
+			label: __("Supplier Quotation"),
+			options: "Supplier Quotation",
+			fieldname: "supplier_quotation",
+			default: "",
+			get_query: () => {
 				return { filters: { "docstatus": ["<", 2] } }
 			}
 		},
 		{
-			"fieldname": "item",
-			"label": __("Item"),
-			"fieldtype": "Link",
-			"options": "Item",
-			"default": "",
-			"reqd": 1,
-			"get_query": function () {
-				var quote = frappe.query_report_filters_by_name.supplier_quotation.get_value();
+			reqd: 1,
+			default: "",
+			options: "Item",
+			label: __("Item"),
+			fieldname: "item",
+			fieldtype: "Link",
+			get_query: () => {
+				let quote = frappe.query_report_filters_by_name.supplier_quotation.get_value();
 				if (quote != "") {
 					return {
-						query: "erpnext.buying.doctype.quality_inspection.quality_inspection.item_query",
+						query: "erpnext.stock.doctype.quality_inspection.quality_inspection.item_query",
 						filters: {
 							"from": "Supplier Quotation Item",
 							"parent": quote
@@ -39,47 +39,50 @@ frappe.query_reports["Quoted Item Comparison"] = {
 			}
 		}
 	],
-	onload: function (report) {
+	onload: (report) => {
 		// Create a button for setting the default supplier
-		report.page.add_inner_button(__("Select Default Supplier"), function () {
-
-			var reporter = frappe.query_reports["Quoted Item Comparison"];
+		report.page.add_inner_button(__("Select Default Supplier"), () => {
+			let reporter = frappe.query_reports["Quoted Item Comparison"];
 
 			//Always make a new one so that the latest values get updated
 			reporter.make_default_supplier_dialog(report);
-			report.dialog.show();
-			setTimeout(function () { report.dialog.input.focus(); }, 1000);
-
 		}, 'Tools');
 
 	},
-	"make_default_supplier_dialog": function (report) {
+	make_default_supplier_dialog: (report) => {
 		// Get the name of the item to change
-		var filters = report.get_values();
-		var item_code = filters.item;
+		if(!report.data) return;
+
+		let filters = report.get_values();
+		let item_code = filters.item;
 
 		// Get a list of the suppliers (with a blank as well) for the user to select
-		var select_options = "";
-		for (let supplier of report.data) {
-			select_options += supplier.supplier_name + '\n'
-		}
+		let suppliers = $.map(report.data, (row, idx)=>{ return row.supplier_name })
 
 		// Create a dialog window for the user to pick their supplier
-		var d = new frappe.ui.Dialog({
+		let dialog = new frappe.ui.Dialog({
 			title: __('Select Default Supplier'),
 			fields: [
-				{ fieldname: 'supplier', fieldtype: 'Select', label: 'Supplier', reqd: 1, options: select_options },
-				{ fieldname: 'ok_button', fieldtype: 'Button', label: 'Set Default Supplier' },
+				{
+					reqd: 1,
+					label: 'Supplier',
+					fieldtype: 'Link',
+					options: 'Supplier',
+					fieldname: 'supplier',
+					get_query: () => {
+						return {
+							filters: {
+								'name': ['in', suppliers]
+							}
+						}
+					}
+				}
 			]
 		});
 
-		// On the user clicking the ok button
-		d.fields_dict.ok_button.input.onclick = function () {
-			var btn = d.fields_dict.ok_button.input;
-			var v = report.dialog.get_values();
-			if (v) {
-				$(btn).set_working();
-
+		dialog.set_primary_action("Set Default Supplier", () => {
+			let values = dialog.get_values();
+			if(values) {
 				// Set the default_supplier field of the appropriate Item to the selected supplier
 				frappe.call({
 					method: "frappe.client.set_value",
@@ -87,17 +90,17 @@ frappe.query_reports["Quoted Item Comparison"] = {
 						doctype: "Item",
 						name: item_code,
 						fieldname: "default_supplier",
-						value: v.supplier,
+						value: values.supplier,
 					},
-					callback: function (r) {
-						$(btn).done_working();
+					freeze: true,
+					callback: (r) => {
 						frappe.msgprint("Successfully Set Supplier");
-						report.dialog.hide();
+						dialog.hide();
 					}
 				});
 			}
-		}
-		report.dialog = d;
+		});
+		dialog.show();
 	}
 }
 

erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.py

@@ -8,53 +8,55 @@ import frappe
 
 def execute(filters=None):
 	qty_list = get_quantity_list(filters.item)
-	
 	data = get_quote_list(filters.item, qty_list)
-	
 	columns = get_columns(qty_list)
-	
 	return columns, data
 	
 def get_quote_list(item, qty_list):
 	out = []
-	if item:
-		price_data = []
-		suppliers = []
-		company_currency = frappe.db.get_default("currency")
-		float_precision = cint(frappe.db.get_default("float_precision")) or 2 
-		# Get the list of suppliers
-		for root in frappe.db.sql("""select parent, qty, rate from `tabSupplier Quotation Item` where item_code=%s and docstatus < 2""", item, as_dict=1):
-			for splr in frappe.db.sql("""SELECT supplier from `tabSupplier Quotation` where name =%s and docstatus < 2""", root.parent, as_dict=1):
-				ip = frappe._dict({
+	if not item:
+		return []
+
+	suppliers = []
+	price_data = []
+	company_currency = frappe.db.get_default("currency")
+	float_precision = cint(frappe.db.get_default("float_precision")) or 2 
+	# Get the list of suppliers
+	for root in frappe.db.sql("""select parent, qty, rate from `tabSupplier Quotation Item`
+		where item_code=%s and docstatus < 2""", item, as_dict=1):
+		for splr in frappe.db.sql("""select supplier from `tabSupplier Quotation`
+			where name =%s and docstatus < 2""", root.parent, as_dict=1):
+			ip = frappe._dict({
 				"supplier": splr.supplier,
 				"qty": root.qty,
 				"parent": root.parent,
-				"rate": root.rate})
-				price_data.append(ip)
-				suppliers.append(splr.supplier)
-			
-		#Add a row for each supplier
-		for root in set(suppliers):
-			supplier_currency = frappe.db.get_value("Supplier", root, "default_currency")
-			if supplier_currency:
-				exchange_rate = get_exchange_rate(supplier_currency, company_currency)
-			else:
-				exchange_rate = 1
-
-			row = frappe._dict({
-				"supplier_name": root
+				"rate": root.rate
 			})
-			for col in qty_list:
-				# Get the quantity for this row
-				for item_price in price_data:
-					if str(item_price.qty) == col.key and item_price.supplier == root:
-						row[col.key] = flt(item_price.rate * exchange_rate, float_precision)
-						row[col.key + "QUOTE"] = item_price.parent
-						break
-					else:
-						row[col.key] = ""
-						row[col.key + "QUOTE"] = ""
-			out.append(row)
+			price_data.append(ip)
+			suppliers.append(splr.supplier)
+
+	#Add a row for each supplier
+	for root in set(suppliers):
+		supplier_currency = frappe.db.get_value("Supplier", root, "default_currency")
+		if supplier_currency:
+			exchange_rate = get_exchange_rate(supplier_currency, company_currency)
+		else:
+			exchange_rate = 1
+
+		row = frappe._dict({
+			"supplier_name": root
+		})
+		for col in qty_list:
+			# Get the quantity for this row
+			for item_price in price_data:
+				if str(item_price.qty) == col.key and item_price.supplier == root:
+					row[col.key] = flt(item_price.rate * exchange_rate, float_precision)
+					row[col.key + "QUOTE"] = item_price.parent
+					break
+				else:
+					row[col.key] = ""
+					row[col.key + "QUOTE"] = ""
+		out.append(row)
 			
 	return out
 	
@@ -62,7 +64,8 @@ def get_quantity_list(item):
 	out = []
 	
 	if item:
-		qty_list = frappe.db.sql("""select distinct qty from `tabSupplier Quotation Item` where ifnull(item_code,'')=%s and docstatus < 2""", item, as_dict=1)
+		qty_list = frappe.db.sql("""select distinct qty from `tabSupplier Quotation Item`
+			where ifnull(item_code,'')=%s and docstatus < 2""", item, as_dict=1)
 		qty_list.sort(reverse=False)
 		for qt in qty_list:
 			col = frappe._dict({
@@ -98,4 +101,4 @@ def get_columns(qty_list):
 			"width": 90
 		})
 
-	return columns
+	return columns

erpnext/change_log/v9/v9_0_0.md

@@ -1,4 +1,4 @@
-#### POS
+- POS - Online & Offline
 - Now user has an option to enable or disable Offline POS mode from POS Settings
 - Provision to select the Item's serial number from the dropdown while adding item in the cart
 - Indicator for stock availability in Online POS Mode.
@@ -6,3 +6,25 @@
 #### Subscription
 - Setup recurring documents using **Subscription**
 - User can schedule the subscription for doctypes other than Sales Invoice, Purchase Invoice etc.
+
+#### Healthcare Domain
+- Clinic / Practice Management
+	- Patient
+	- Physician, Physician scheduling
+	- Appointment
+	- Vital Signs
+	- Consultation
+	- Medical Code Standards
+	- Patient Medical Record
+- Laboratory
+	- Sample Collection
+	- Lab Test
+- Patient Portal
+
+#### School Fees Management
+- Fee Structure
+- Fee Schedule
+- Payment against Fees
+
+#### Setup Wizard
+- Broken into 2 parts with a fresh looks

erpnext/hooks.py

@@ -81,7 +81,7 @@ website_route_rules = [
 	{"from_route": "/supplier-quotations/<path:name>", "to_route": "order",
 		"defaults": {
 			"doctype": "Supplier Quotation",
-			"parents": [{"label": _("Supplier Quotation"), "route": "quotations"}]
+			"parents": [{"label": _("Supplier Quotation"), "route": "supplier-quotations"}]
 		}
 	},
 	{"from_route": "/quotations", "to_route": "Quotation"},

erpnext/manufacturing/doctype/production_order/production_order.py

@@ -51,9 +51,9 @@ class ProductionOrder(Document):
 	def validate_sales_order(self):
 		if self.sales_order:
 			so = frappe.db.sql("""
-				select so.name, so_item.delivery_date, so.project 
+				select so.name, so_item.delivery_date, so.project
 				from `tabSales Order` so, `tabSales Order Item` so_item
-				where so.name=%s and so.name=so_item.parent 
+				where so.name=%s and so.name=so_item.parent
 					and so.docstatus = 1 and so_item.item_code=%s
 			""", (self.sales_order, self.production_item), as_dict=1)
 
@@ -112,7 +112,7 @@ class ProductionOrder(Document):
 
 		allowance_percentage = flt(frappe.db.get_single_value("Manufacturing Settings",
 			"over_production_allowance_percentage"))
-			
+
 		if total_qty > so_qty + (allowance_percentage/100 * so_qty):
 			frappe.throw(_("Cannot produce more Item {0} than Sales Order quantity {1}")
 				.format(self.production_item, so_qty), OverProductionError)
@@ -217,27 +217,27 @@ class ProductionOrder(Document):
 	def set_production_order_operations(self):
 		"""Fetch operations from BOM and set in 'Production Order'"""
 		self.set('operations', [])
-		
+
 		if not self.bom_no \
 			or cint(frappe.db.get_single_value("Manufacturing Settings", "disable_capacity_planning")):
 				return
-		
+
 		if self.use_multi_level_bom:
 			bom_list = frappe.get_doc("BOM", self.bom_no).traverse_tree()
 		else:
 			bom_list = [self.bom_no]
-		
+
 		operations = frappe.db.sql("""
-			select 
+			select
 				operation, description, workstation, idx,
-				base_hour_rate as hour_rate, time_in_mins, 
+				base_hour_rate as hour_rate, time_in_mins,
 				"Pending" as status, parent as bom
 			from
 				`tabBOM Operation`
 			where
 				 parent in (%s) order by idx
 		"""	% ", ".join(["%s"]*len(bom_list)), tuple(bom_list), as_dict=1)
-			
+
 		self.set('operations', operations)
 		self.calculate_time()
 
@@ -277,7 +277,7 @@ class ProductionOrder(Document):
 		timesheet.set('time_logs', [])
 
 		for i, d in enumerate(self.operations):
-			
+
 			if d.status != 'Completed':
 				self.set_start_end_time_for_workstation(d, i)
 
@@ -370,8 +370,8 @@ class ProductionOrder(Document):
 		self.actual_start_date = None
 		self.actual_end_date = None
 		if self.get("operations"):
-			self.actual_start_date = min([d.actual_start_time for d in self.get("operations")])
-			self.actual_end_date = max([d.actual_end_time for d in self.get("operations")])
+			self.actual_start_date = min([d.actual_start_time for d in self.get("operations") if d.actual_start_time])
+			self.actual_end_date = max([d.actual_end_time for d in self.get("operations") if d.actual_end_time])
 
 	def delete_timesheet(self):
 		for timesheet in frappe.get_all("Timesheet", ["name"], {"production_order": self.name}):
@@ -411,18 +411,18 @@ class ProductionOrder(Document):
 			if d.source_warehouse:
 				stock_bin = get_bin(d.item_code, d.source_warehouse)
 				stock_bin.update_reserved_qty_for_production()
-			
+
 	def get_items_and_operations_from_bom(self):
 		self.set_required_items()
 		self.set_production_order_operations()
-		
+
 		return check_if_scrap_warehouse_mandatory(self.bom_no)
-		
+
 	def set_available_qty(self):
 		for d in self.get("required_items"):
 			if d.source_warehouse:
 				d.available_qty_at_source_warehouse = get_latest_stock_qty(d.item_code, d.source_warehouse)
-				
+
 			if self.wip_warehouse:
 				d.available_qty_at_wip_warehouse = get_latest_stock_qty(d.item_code, self.wip_warehouse)
 
@@ -439,7 +439,7 @@ class ProductionOrder(Document):
 					'required_qty': item.qty,
 					'source_warehouse': item.source_warehouse or item.default_warehouse
 				})
-			
+
 			self.set_available_qty()
 
 	def update_transaferred_qty_for_required_items(self):
@@ -463,12 +463,12 @@ class ProductionOrder(Document):
 def get_item_details(item, project = None):
 	res = frappe.db.sql("""
 		select stock_uom, description
-		from `tabItem` 
-		where disabled=0 
+		from `tabItem`
+		where disabled=0
 			and (end_of_life is null or end_of_life='0000-00-00' or end_of_life > %s)
 			and name=%s
 	""", (nowdate(), item), as_dict=1)
-	
+
 	if not res:
 		return {}
 
@@ -611,14 +611,14 @@ def make_new_timesheet(source_name, target_doc=None):
 @frappe.whitelist()
 def stop_unstop(production_order, status):
 	""" Called from client side on Stop/Unstop event"""
-	
+
 	if not frappe.has_permission("Production Order", "write"):
 		frappe.throw(_("Not permitted"), frappe.PermissionError)
-		
+
 	pro_order = frappe.get_doc("Production Order", production_order)
 	pro_order.update_status(status)
 	pro_order.update_planned_qty()
 	frappe.msgprint(_("Production Order has been {0}").format(status))
 	pro_order.notify_update()
-	
+
 	return pro_order.status

erpnext/patches.txt

@@ -408,6 +408,8 @@ erpnext.patches.v8_0.update_stock_qty_value_in_bom_item
 erpnext.patches.v8_0.update_sales_cost_in_project
 erpnext.patches.v8_0.save_system_settings
 erpnext.patches.v8_1.delete_deprecated_reports
+erpnext.patches.v9_0.remove_subscription_module
+erpnext.patches.v8_7.make_subscription_from_recurring_data
 erpnext.patches.v8_1.setup_gst_india #2017-06-27
 execute:frappe.reload_doc('regional', 'doctype', 'gst_hsn_code')
 erpnext.patches.v8_1.removed_roles_from_gst_report_non_indian_account
@@ -432,16 +434,15 @@ erpnext.patches.v8_5.update_customer_group_in_POS_profile
 erpnext.patches.v8_6.update_timesheet_company_from_PO
 erpnext.patches.v8_6.set_write_permission_for_quotation_for_sales_manager
 erpnext.patches.v8_5.remove_project_type_property_setter
-erpnext.patches.v8_7.add_more_gst_fields
+erpnext.patches.v8_7.add_more_gst_fields #21-09-2017
 erpnext.patches.v8_7.fix_purchase_receipt_status
 erpnext.patches.v8_6.rename_bom_update_tool
 erpnext.patches.v8_7.set_offline_in_pos_settings #11-09-17
-erpnext.patches.v8_9.add_setup_progress_actions #08-09-2017
+erpnext.patches.v8_9.add_setup_progress_actions #08-09-2017 #26-09-2017
 erpnext.patches.v8_9.rename_company_sales_target_field
 erpnext.patches.v8_8.set_bom_rate_as_per_uom
-erpnext.patches.v9_0.remove_subscription_module
-erpnext.patches.v8_7.make_subscription_from_recurring_data
 erpnext.patches.v8_9.set_print_zero_amount_taxes
 erpnext.patches.v8_9.set_default_customer_group
 erpnext.patches.v8_9.remove_employee_from_salary_structure_parent
 erpnext.patches.v8_9.delete_gst_doctypes_for_outside_india_accounts
+erpnext.patches.v8_9.update_billing_gstin_for_indian_account

erpnext/patches/v8_7/make_subscription_from_recurring_data.py

@@ -8,9 +8,15 @@ from frappe.utils import today
 def execute():
 	frappe.reload_doc('accounts', 'doctype', 'subscription')
 	frappe.reload_doc('selling', 'doctype', 'sales_order')
+	frappe.reload_doc('selling', 'doctype', 'quotation')
 	frappe.reload_doc('buying', 'doctype', 'purchase_order')
+	frappe.reload_doc('buying', 'doctype', 'supplier_quotation')
 	frappe.reload_doc('accounts', 'doctype', 'sales_invoice')
 	frappe.reload_doc('accounts', 'doctype', 'purchase_invoice')
+	frappe.reload_doc('stock', 'doctype', 'purchase_receipt')
+	frappe.reload_doc('stock', 'doctype', 'delivery_note')
+	frappe.reload_doc('accounts', 'doctype', 'journal_entry')
+	frappe.reload_doc('accounts', 'doctype', 'payment_entry')
 
 	for doctype in ['Sales Order', 'Sales Invoice',
 		'Purchase Invoice', 'Purchase Invoice']:

erpnext/patches/v8_9/add_setup_progress_actions.py

@@ -9,27 +9,27 @@ def execute():
 	frappe.reload_doc("setup", "doctype", "setup_progress_action")
 
 	actions = [
-		{"action_name": _("Add Company"), "action_doctype": "Company", "min_doc_count": 1, "is_completed": 1,
+		{"action_name": "Add Company", "action_doctype": "Company", "min_doc_count": 1, "is_completed": 1,
 			"domains": '[]' },
-		{"action_name": _("Set Sales Target"), "action_doctype": "Company", "min_doc_count": 99,
+		{"action_name": "Set Sales Target", "action_doctype": "Company", "min_doc_count": 99,
 			"action_document": frappe.defaults.get_defaults().get("company") or '',
 			"action_field": "monthly_sales_target", "is_completed": 0,
 			"domains": '["Manufacturing", "Services", "Retail", "Distribution"]' },
-		{"action_name": _("Add Customers"), "action_doctype": "Customer", "min_doc_count": 1, "is_completed": 0,
+		{"action_name": "Add Customers", "action_doctype": "Customer", "min_doc_count": 1, "is_completed": 0,
 			"domains": '["Manufacturing", "Services", "Retail", "Distribution"]' },
-		{"action_name": _("Add Suppliers"), "action_doctype": "Supplier", "min_doc_count": 1, "is_completed": 0,
+		{"action_name": "Add Suppliers", "action_doctype": "Supplier", "min_doc_count": 1, "is_completed": 0,
 			"domains": '["Manufacturing", "Services", "Retail", "Distribution"]' },
-		{"action_name": _("Add Products"), "action_doctype": "Item", "min_doc_count": 1, "is_completed": 0,
+		{"action_name": "Add Products", "action_doctype": "Item", "min_doc_count": 1, "is_completed": 0,
 			"domains": '["Manufacturing", "Services", "Retail", "Distribution"]' },
-		{"action_name": _("Add Programs"), "action_doctype": "Program", "min_doc_count": 1, "is_completed": 0,
+		{"action_name": "Add Programs", "action_doctype": "Program", "min_doc_count": 1, "is_completed": 0,
 			"domains": '["Education"]' },
-		{"action_name": _("Add Instructors"), "action_doctype": "Instructor", "min_doc_count": 1, "is_completed": 0,
+		{"action_name": "Add Instructors", "action_doctype": "Instructor", "min_doc_count": 1, "is_completed": 0,
 			"domains": '["Education"]' },
-		{"action_name": _("Add Courses"), "action_doctype": "Course", "min_doc_count": 1, "is_completed": 0,
+		{"action_name": "Add Courses", "action_doctype": "Course", "min_doc_count": 1, "is_completed": 0,
 			"domains": '["Education"]' },
-		{"action_name": _("Add Rooms"), "action_doctype": "Room", "min_doc_count": 1, "is_completed": 0,
+		{"action_name": "Add Rooms", "action_doctype": "Room", "min_doc_count": 1, "is_completed": 0,
 			"domains": '["Education"]' },
-		{"action_name": _("Add Users"), "action_doctype": "User", "min_doc_count": 4, "is_completed": 0,
+		{"action_name": "Add Users", "action_doctype": "User", "min_doc_count": 4, "is_completed": 0,
 			"domains": '[]' }
 	]
 

erpnext/patches/v8_9/update_billing_gstin_for_indian_account.py

@@ -0,0 +1,15 @@
+# Copyright (c) 2017, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	company = frappe.get_all('Company', filters = {'country': 'India'})
+
+	if company:
+		for doctype in ['Sales Invoice', 'Delivery Note']:
+			frappe.db.sql(""" update `tab{0}`
+				set billing_address_gstin = (select gstin from `tabAddress` 
+					where name = customer_address) 
+			where customer_address is not null and customer_address != ''""".format(doctype))

erpnext/regional/india/setup.py

@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 
 import frappe, os, json
-from frappe.custom.doctype.custom_field.custom_field import create_custom_field
+from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
 from frappe.permissions import add_permission
 from erpnext.regional.india import states
 
@@ -12,7 +12,7 @@ def setup(company=None, patch=True):
 	make_custom_fields()
 	add_permissions()
 	add_custom_roles_for_reports()
-	add_hsn_sac_codes()
+	frappe.enqueue('erpnext.regional.india.setup.add_hsn_sac_codes')
 	add_print_formats()
 	if not patch:
 		update_address_template()
@@ -47,12 +47,14 @@ def add_hsn_sac_codes():
 
 def create_hsn_codes(data, code_field):
 	for d in data:
-		if not frappe.db.exists("GST HSN Code", d[code_field]):
-			hsn_code = frappe.new_doc('GST HSN Code')
-			hsn_code.description = d["description"]
-			hsn_code.hsn_code = d[code_field]
-			hsn_code.name = d[code_field]
+		hsn_code = frappe.new_doc('GST HSN Code')
+		hsn_code.description = d["description"]
+		hsn_code.hsn_code = d[code_field]
+		hsn_code.name = d[code_field]
+		try:
 			hsn_code.db_insert()
+		except frappe.DuplicateEntryError:
+			pass
 
 def add_custom_roles_for_reports():
 	for report_name in ('GST Sales Register', 'GST Purchase Register',
@@ -111,12 +113,15 @@ def make_custom_fields():
 		]
 
 	sales_invoice_gst_fields = [
+			dict(fieldname='billing_address_gstin', label='Billing Address GSTIN',
+				fieldtype='Data', insert_after='customer_address',
+				options='customer_address.gstin', print_hide=1),
 			dict(fieldname='customer_gstin', label='Customer GSTIN',
 				fieldtype='Data', insert_after='shipping_address',
 				options='shipping_address_name.gstin', print_hide=1),
 			dict(fieldname='place_of_supply', label='Place of Supply',
 				fieldtype='Data', insert_after='customer_gstin', print_hide=1,
-				options='shipping_address_name.gst_state_number', read_only=1),
+				options='shipping_address_name.gst_state_number', read_only=0),
 			dict(fieldname='company_gstin', label='Company GSTIN',
 				fieldtype='Data', insert_after='company_address',
 				options='company_address.gstin', print_hide=1)
@@ -148,11 +153,7 @@ def make_custom_fields():
 		'Purchase Invoice Item': [hsn_sac_field]
 	}
 
-	for dt, data in custom_fields.iteritems():
-		for df in data:
-			create_custom_field(dt, df)
-
-	# create_custom_fields(custom_fields)
+	create_custom_fields(custom_fields)
 
 def make_fixtures():
 	docs = [

erpnext/regional/report/gst_itemised_sales_register/gst_itemised_sales_register.py

@@ -8,6 +8,7 @@ from erpnext.accounts.report.item_wise_sales_register.item_wise_sales_register i
 def execute(filters=None):
 	return _execute(filters, additional_table_columns=[
 		dict(fieldtype='Data', label='Customer GSTIN', width=120),
+		dict(fieldtype='Data', label='Billing Address GSTIN', width=140),
 		dict(fieldtype='Data', label='Company GSTIN', width=120),
 		dict(fieldtype='Data', label='Place of Supply', width=120),
 		dict(fieldtype='Data', label='Reverse Charge', width=120),
@@ -17,6 +18,7 @@ def execute(filters=None):
 		dict(fieldtype='Data', label='HSN Code', width=120)
 	], additional_query_columns=[
 		'customer_gstin',
+		'billing_address_gstin',
 		'company_gstin',
 		'place_of_supply',
 		'reverse_charge',

erpnext/regional/report/gst_sales_register/gst_sales_register.py

@@ -8,6 +8,7 @@ from erpnext.accounts.report.sales_register.sales_register import _execute
 def execute(filters=None):
 	return _execute(filters, additional_table_columns=[
 		dict(fieldtype='Data', label='Customer GSTIN', width=120),
+		dict(fieldtype='Data', label='Billing Address GSTIN', width=140),
 		dict(fieldtype='Data', label='Company GSTIN', width=120),
 		dict(fieldtype='Data', label='Place of Supply', width=120),
 		dict(fieldtype='Data', label='Reverse Charge', width=120),
@@ -16,6 +17,7 @@ def execute(filters=None):
 		dict(fieldtype='Data', label='E-Commerce GSTIN', width=130)
 	], additional_query_columns=[
 		'customer_gstin',
+		'billing_address_gstin',
 		'company_gstin',
 		'place_of_supply',
 		'reverse_charge',

erpnext/selling/doctype/quotation_item/quotation_item.json

@@ -684,7 +684,7 @@
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
-   "precision": "2", 
+   "precision": "", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
@@ -1583,7 +1583,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-05-10 17:14:45.736424", 
+ "modified": "2017-09-27 08:31:37.485134", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Quotation Item", 

erpnext/selling/doctype/sales_order_item/sales_order_item.json

@@ -714,7 +714,7 @@
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
-   "precision": "2", 
+   "precision": "", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
@@ -745,7 +745,7 @@
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
-   "precision": "2", 
+   "precision": "", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
@@ -1963,7 +1963,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-07-28 14:04:04.289428", 
+ "modified": "2017-09-27 08:31:37.129537", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order Item", 

erpnext/selling/page/point_of_sale/point_of_sale.js

@@ -20,6 +20,12 @@ frappe.pages['point-of-sale'].on_page_load = function(wrapper) {
 	});
 };
 
+frappe.pages['point-of-sale'].refresh = function(wrapper) {
+	if (wrapper.pos) {
+		cur_frm = wrapper.pos.frm;
+	}
+}
+
 erpnext.pos.PointOfSale = class PointOfSale {
 	constructor(wrapper) {
 		this.wrapper = $(wrapper).find('.layout-main-section');
@@ -478,6 +484,8 @@ class POSCart {
 	}
 
 	update_taxes_and_totals() {
+		if (!this.frm.doc.taxes) { return; }
+
 		const currency = this.frm.doc.currency;
 		this.frm.refresh_field('taxes');
 
@@ -736,7 +744,7 @@ class POSCart {
 
 		this.wrapper.find('.discount_amount').on('change', (e) => {
 			frappe.model.set_value(this.frm.doctype, this.frm.docname,
-				'discount_amount', e.target.value);
+				'discount_amount', flt(e.target.value));
 			this.frm.trigger('discount_amount')
 				.then(() => {
 					let discount_wrapper = this.wrapper.find('.additional_discount_percentage');

erpnext/selling/page/point_of_sale/point_of_sale.py

@@ -3,12 +3,15 @@
 
 from __future__ import unicode_literals
 import frappe, json
+from frappe.utils.nestedset import get_root_of
 
 @frappe.whitelist()
 def get_items(start, page_length, price_list, item_group, search_value=""):
 	serial_no = ""
 	batch_no = ""
 	item_code = search_value
+	if not frappe.db.exists('Item Group', item_group):
+		item_group = get_root_of('Item Group')
 
 	if search_value:
 		# search serial no
@@ -31,7 +34,7 @@ def get_items(start, page_length, price_list, item_group, search_value=""):
 		ON
 			(item_det.item_code=i.name or item_det.item_code=i.variant_of)
 		where
-			i.disabled = 0 and i.has_variants = 0
+			i.disabled = 0 and i.has_variants = 0 and i.is_sales_item = 1
 			and i.item_group in (select name from `tabItem Group` where lft >= {lft} and rgt <= {rgt})
 			and (i.item_code like %(item_code)s
 			or i.item_name like %(item_code)s or i.barcode like %(item_code)s)

erpnext/setup/setup_wizard/healthcare.py

@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 import frappe
-from frappe.custom.doctype.custom_field.custom_field import create_custom_field
+from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
 
 from frappe import _
 
@@ -21,13 +21,11 @@ def make_custom_fields():
 		'Sales Invoice': [
 			dict(fieldname='appointment', label='Patient Appointment',
 				fieldtype='Link', options='Patient Appointment',
-				insert_after='customer',print_hide=0)
+				insert_after='customer')
 		]
 	}
 
-	for dt, data in custom_fields.iteritems():
-		for df in data:
-			create_custom_field(dt, df)
+	create_custom_fields(custom_fields)
 
 
 def create_medical_departments():

erpnext/setup/setup_wizard/install_fixtures.py

@@ -23,27 +23,27 @@ def install(country=None):
 
 		# Setup Progress
 		{'doctype': "Setup Progress", "actions": [
-			{"action_name": _("Add Company"), "action_doctype": "Company", "min_doc_count": 1, "is_completed": 1,
+			{"action_name": "Add Company", "action_doctype": "Company", "min_doc_count": 1, "is_completed": 1,
 				"domains": '[]' },
-			{"action_name": _("Set Sales Target"), "action_doctype": "Company", "min_doc_count": 99,
+			{"action_name": "Set Sales Target", "action_doctype": "Company", "min_doc_count": 99,
 				"action_document": frappe.defaults.get_defaults().get("company") or '',
 				"action_field": "monthly_sales_target", "is_completed": 0,
 				"domains": '["Manufacturing", "Services", "Retail", "Distribution"]' },
-			{"action_name": _("Add Customers"), "action_doctype": "Customer", "min_doc_count": 1, "is_completed": 0,
+			{"action_name": "Add Customers", "action_doctype": "Customer", "min_doc_count": 1, "is_completed": 0,
 				"domains": '["Manufacturing", "Services", "Retail", "Distribution"]' },
-			{"action_name": _("Add Suppliers"), "action_doctype": "Supplier", "min_doc_count": 1, "is_completed": 0,
+			{"action_name": "Add Suppliers", "action_doctype": "Supplier", "min_doc_count": 1, "is_completed": 0,
 				"domains": '["Manufacturing", "Services", "Retail", "Distribution"]' },
-			{"action_name": _("Add Products"), "action_doctype": "Item", "min_doc_count": 1, "is_completed": 0,
+			{"action_name": "Add Products", "action_doctype": "Item", "min_doc_count": 1, "is_completed": 0,
 				"domains": '["Manufacturing", "Services", "Retail", "Distribution"]' },
-			{"action_name": _("Add Programs"), "action_doctype": "Program", "min_doc_count": 1, "is_completed": 0,
+			{"action_name": "Add Programs", "action_doctype": "Program", "min_doc_count": 1, "is_completed": 0,
 				"domains": '["Education"]' },
-			{"action_name": _("Add Instructors"), "action_doctype": "Instructor", "min_doc_count": 1, "is_completed": 0,
+			{"action_name": "Add Instructors", "action_doctype": "Instructor", "min_doc_count": 1, "is_completed": 0,
 				"domains": '["Education"]' },
-			{"action_name": _("Add Courses"), "action_doctype": "Course", "min_doc_count": 1, "is_completed": 0,
+			{"action_name": "Add Courses", "action_doctype": "Course", "min_doc_count": 1, "is_completed": 0,
 				"domains": '["Education"]' },
-			{"action_name": _("Add Rooms"), "action_doctype": "Room", "min_doc_count": 1, "is_completed": 0,
+			{"action_name": "Add Rooms", "action_doctype": "Room", "min_doc_count": 1, "is_completed": 0,
 				"domains": '["Education"]' },
-			{"action_name": _("Add Users"), "action_doctype": "User", "min_doc_count": 4, "is_completed": 0,
+			{"action_name": "Add Users", "action_doctype": "User", "min_doc_count": 4, "is_completed": 0,
 				"domains": '[]' }
 		]},
 

erpnext/stock/doctype/delivery_note_item/delivery_note_item.json

@@ -713,7 +713,7 @@
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
-   "precision": "2", 
+   "precision": "", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
@@ -1956,7 +1956,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-05-10 17:14:50.456930", 
+ "modified": "2017-09-27 08:31:38.768846", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note Item", 

erpnext/templates/includes/rfq.js

@@ -85,7 +85,7 @@ rfq = Class.extend({
 					frappe.unfreeze();
 					if(r.message){
 						$('.btn-sm').hide()
-						window.location.href = "/quotations/" + encodeURIComponent(r.message);
+						window.location.href = "/supplier-quotations/" + encodeURIComponent(r.message);
 					}
 				}
 			})

erpnext/utilities/user_progress.py

@@ -20,7 +20,7 @@ def get_slide_settings():
 	# Initial state of slides
 	return [
 		frappe._dict(
-			action_name=_('Add Company'),
+			action_name='Add Company',
 			title=_("Setup Company") if domain != 'Education' else _("Setup Institution"),
 			help=_('Setup your ' + ('company' if domain != 'Education' else 'institution') + ' and brand.'),
 			# image_src="/assets/erpnext/images/illustrations/shop.jpg",
@@ -58,7 +58,7 @@ def get_slide_settings():
 			]
 		),
 		frappe._dict(
-			action_name=_('Add Customers'),
+			action_name='Add Customers',
 			domains=('Manufacturing', 'Services', 'Retail', 'Distribution'),
 			title=_("Add Customers"),
 			help=_("List a few of your customers. They could be organizations or individuals."),
@@ -82,7 +82,7 @@ def get_slide_settings():
 			]
 		),
 		frappe._dict(
-			action_name=_('Add Suppliers'),
+			action_name='Add Suppliers',
 			domains=('Manufacturing', 'Services', 'Retail', 'Distribution'),
 			icon="fa fa-group",
 			title=_("Your Suppliers"),
@@ -111,7 +111,7 @@ def get_slide_settings():
 			]
 		),
 		frappe._dict(
-			action_name=_('Add Products'),
+			action_name='Add Products',
 			domains=['Manufacturing', 'Services', 'Retail', 'Distribution'],
 			icon="fa fa-barcode",
 			title=_("Your Products or Services"),
@@ -142,7 +142,7 @@ def get_slide_settings():
 
 		# School slides begin
 		frappe._dict(
-			action_name=_('Add Programs'),
+			action_name='Add Programs',
 			domains=("Education"),
 			title=_("Program"),
 			help=_("Example: Masters in Computer Science"),
@@ -163,7 +163,7 @@ def get_slide_settings():
 
 		),
 		frappe._dict(
-			action_name=_('Add Courses'),
+			action_name='Add Courses',
 			domains=["Education"],
 			title=_("Course"),
 			help=_("Example: Basic Mathematics"),
@@ -183,7 +183,7 @@ def get_slide_settings():
 			]
 		),
 		frappe._dict(
-			action_name=_('Add Instructors'),
+			action_name='Add Instructors',
 			domains=["Education"],
 			title=_("Instructor"),
 			help=_("People who teach at your organisation"),
@@ -203,7 +203,7 @@ def get_slide_settings():
 			]
 		),
 		frappe._dict(
-			action_name=_('Add Rooms'),
+			action_name='Add Rooms',
 			domains=["Education"],
 			title=_("Room"),
 			help=_("Classrooms/ Laboratories etc where lectures can be scheduled."),
@@ -222,7 +222,7 @@ def get_slide_settings():
 		# School slides end
 
 		frappe._dict(
-			action_name=_('Add Users'),
+			action_name='Add Users',
 			title=_("Add Users"),
 			help=_("Add users to your organization, other than yourself."),
 			fields=[