Merge pull request #1654 from nabinhait/v4-hotfix

fixes and patches

erpnext/hr/report/employee_leave_balance/employee_leave_balance.py

@@ -3,6 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe
+from frappe import _
 from frappe.widgets.reportview import execute as runreport
 
 def execute(filters=None):
@@ -12,6 +13,10 @@ def execute(filters=None):
 		[["Employee", "company", "=", filters.get("company")]] or None
 	employees = runreport(doctype="Employee", fields=["name", "employee_name", "department"],
 		filters=employee_filters)
+
+	if not employees:
+		frappe.throw(_("No employee found!"))
+
 	leave_types = frappe.db.sql_list("select name from `tabLeave Type`")
 
 	if filters.get("fiscal_year"):

erpnext/patches.txt

@@ -4,6 +4,7 @@ erpnext.patches.v4_0.validate_v3_patch
 erpnext.patches.v4_0.update_user_properties
 erpnext.patches.v4_0.move_warehouse_user_to_restrictions
 erpnext.patches.v4_0.new_permissions
+erpnext.patches.v4_0.global_defaults_to_system_settings
 erpnext.patches.v4_0.update_incharge_name_to_sales_person_in_maintenance_schedule
 execute:frappe.reload_doc('accounts', 'doctype', 'sales_invoice') # 2014-01-29
 execute:frappe.reload_doc('selling', 'doctype', 'sales_order') # 2014-01-29
@@ -42,3 +43,4 @@ execute:frappe.delete_doc_if_exists("DocType", "Warehouse User")
 execute:frappe.db.sql("delete from `tabWebsite Item Group` where ifnull(item_group, '')=''")
 execute:frappe.delete_doc("Print Format", "SalesInvoice")
 execute:import frappe.defaults;frappe.defaults.clear_default("price_list_currency")
+

erpnext/patches/v4_0/global_defaults_to_system_settings.py

@@ -0,0 +1,33 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# MIT License. See license.txt
+
+from __future__ import unicode_literals
+
+import frappe
+from collections import Counter
+from frappe.core.doctype.user.user import STANDARD_USERS
+
+def execute():
+	system_settings = frappe.get_doc("System Settings")
+
+	# set values from global_defauls
+	global_defauls = frappe.db.get_value("Global Defaults", None,
+		["time_zone", "date_format", "number_format", "float_precision", "session_expiry"])
+
+	if global_defauls:
+		for key, val in global_defauls.items():
+			if not system_settings.get(key):
+				system_settings[key] = val
+
+	# language
+	if not system_settings.get("language"):
+		# find most common language
+		lang = frappe.db.sql_list("""select language from `tabUser`
+			where ifnull(language, '')!='' and language not like "Loading%%" and name not in ({standard_users})""".format(
+			standard_users=", ".join(["%s"]*len(STANDARD_USERS))), tuple(STANDARD_USERS))
+		lang = Counter(lang).most_common(1)
+		lang = (len(lang) > 0) and lang[0][0] or "english"
+
+		system_settings.language = lang
+
+	system_settings.save()

erpnext/stock/report/stock_ledger/stock_ledger.py

@@ -18,22 +18,22 @@ def execute(filters=None):
 
 		data.append([sle.date, sle.item_code, item_detail.item_name, item_detail.item_group,
 			item_detail.brand, item_detail.description, sle.warehouse, item_detail.stock_uom,
-			sle.actual_qty, sle.qty_after_transaction, sle.stock_value, sle.voucher_type, 
-			sle.voucher_no, voucher_link_icon, sle.batch_no, sle.serial_no, sle.company])
+			sle.actual_qty, sle.qty_after_transaction, sle.valuation_rate, sle.stock_value,
+			sle.voucher_type, sle.voucher_no, voucher_link_icon, sle.batch_no, sle.serial_no, sle.company])
 
 	return columns, data
 
 def get_columns():
-	return ["Date:Datetime:95", "Item:Link/Item:100", "Item Name::100", 
+	return ["Date:Datetime:95", "Item:Link/Item:130", "Item Name::100",
 		"Item Group:Link/Item Group:100", "Brand:Link/Brand:100",
 		"Description::200", "Warehouse:Link/Warehouse:100",
-		"Stock UOM:Link/UOM:100", "Qty:Float:50", "Balance Qty:Float:80", 
-		"Balance Value:Currency:100", "Voucher Type::100", "Voucher #::100", "Link::30", 
+		"Stock UOM:Link/UOM:100", "Qty:Float:50", "Balance Qty:Float:100", "Valuation Rate:Currency:110",
+		"Balance Value:Currency:110", "Voucher Type::110", "Voucher #::100", "Link::30",
 		"Batch:Link/Batch:100", "Serial #:Link/Serial No:100", "Company:Link/Company:100"]
 
 def get_stock_ledger_entries(filters):
 	return frappe.db.sql("""select concat_ws(" ", posting_date, posting_time) as date,
-			item_code, warehouse, actual_qty, qty_after_transaction, 
+			item_code, warehouse, actual_qty, qty_after_transaction, valuation_rate,
 			stock_value, voucher_type, voucher_no, batch_no, serial_no, company
 		from `tabStock Ledger Entry`
 		where company = %(company)s and