Merge branch 'develop'

[fix] Clear addressed and contacts on a new form

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.7.3'
+__version__ = '6.7.6'

erpnext/accounts/doctype/pricing_rule/pricing_rule.py

@@ -168,7 +168,11 @@ def get_pricing_rules(args):
 		field = frappe.scrub(parenttype)
 		condition = ""
 		if args.get(field):
-			lft, rgt = frappe.db.get_value(parenttype, args[field], ["lft", "rgt"])
+			try:
+				lft, rgt = frappe.db.get_value(parenttype, args[field], ["lft", "rgt"])
+			except TypeError:
+				frappe.throw(_("Invalid {0}").format(args[field]))
+
 			parent_groups = frappe.db.sql_list("""select name from `tab%s`
 				where lft<=%s and rgt>=%s""" % (parenttype, '%s', '%s'), (lft, rgt))
 

erpnext/buying/doctype/supplier/supplier.js

@@ -12,6 +12,7 @@ cur_frm.cscript.refresh = function(doc, dt, dn) {
 
 	if(doc.__islocal){
     	hide_field(['address_html','contact_html']);
+		erpnext.utils.clear_address_and_contact(cur_frm);
 	}
 	else{
 	  	unhide_field(['address_html','contact_html']);

erpnext/crm/doctype/lead/lead.js

@@ -37,6 +37,8 @@ erpnext.LeadController = frappe.ui.form.Controller.extend({
 
 		if(!this.frm.doc.__islocal) {
 			erpnext.utils.render_address_and_contact(cur_frm);
+		} else {
+			erpnext.utils.clear_address_and_contact(cur_frm);
 		}
 	},
 

erpnext/hooks.py

@@ -29,7 +29,7 @@ blogs.
 """
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "6.7.3"
+app_version = "6.7.6"
 source_link = "https://github.com/frappe/erpnext"
 
 error_report_email = "support@erpnext.com"

erpnext/hr/doctype/process_payroll/process_payroll.py

@@ -196,11 +196,11 @@ class ProcessPayroll(Document):
 		journal_entry.set("accounts", [
 			{
 				"account": salary_account,
-				"debit": amount
+				"debit_in_account_currency": amount
 			},
 			{
 				"account": default_bank_account,
-				"credit": amount
+				"credit_in_account_currency": amount
 			},
 		])
 

erpnext/patches/v6_6/remove_fiscal_year_from_leave_allocation.py

@@ -2,6 +2,7 @@ from __future__ import unicode_literals
 import frappe
 
 def execute():
+	frappe.reload_doctype("Leave Allocation")
 	if frappe.db.has_column("Leave Allocation", "fiscal_year"):
 		for leave_allocation in frappe.db.sql("select name, fiscal_year from `tabLeave Allocation`", as_dict=True):
 			dates = frappe.db.get_value("Fiscal Year", leave_allocation["fiscal_year"],

erpnext/public/js/utils.js

@@ -100,6 +100,11 @@ $.extend(erpnext, {
 
 
 $.extend(erpnext.utils, {
+	clear_address_and_contact: function(frm) {
+		$(frm.fields_dict['address_html'].wrapper).html("");
+		frm.fields_dict['contact_html'] && $(frm.fields_dict['contact_html'].wrapper).html("");
+	},
+	
 	render_address_and_contact: function(frm) {
 		// render address
 		$(frm.fields_dict['address_html'].wrapper)

erpnext/selling/doctype/customer/customer.js

@@ -14,6 +14,8 @@ frappe.ui.form.on("Customer", "refresh", function(frm) {
 
 	if(!frm.doc.__islocal) {
 		erpnext.utils.render_address_and_contact(frm);
+	} else {
+		erpnext.utils.clear_address_and_contact(frm);
 	}
 
 	var grid = cur_frm.get_field("sales_team").grid;

erpnext/selling/doctype/sales_order/sales_order.js

@@ -23,12 +23,15 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
 
 				$.each(cur_frm.doc.items, function(i, item){
 					if(item.delivered_by_supplier == 1 || item.supplier){
-						if(item.qty > flt(item.ordered_qty))
+						if(item.qty > flt(item.ordered_qty)
+							&& item.qty > flt(item.delivered_qty)) {
 							is_delivered_by_supplier = true;
+						}
 					}
 					else{
-						if(item.qty > flt(item.delivered_qty))
+						if(item.qty > flt(item.delivered_qty)) {
 							is_delivery_note = true;
+						}
 					}
 				})
 

erpnext/setup/doctype/sales_partner/sales_partner.js

@@ -5,6 +5,7 @@ cur_frm.cscript.refresh = function(doc,dt,dn){
 
 	if(doc.__islocal){
 		hide_field(['address_html', 'contact_html']);
+		erpnext.utils.clear_address_and_contact(cur_frm);
 	}
 	else{
 		unhide_field(['address_html', 'contact_html']);

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "6.7.3"
+version = "6.7.6"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()