[fixes]

erpnext/buying/doctype/supplier/supplier.js

@@ -42,9 +42,9 @@ cur_frm.cscript.make_dashboard = function(doc) {
 				if(r.message["company_currency"].length == 1) {
 					cur_frm.dashboard.set_headline(
 						__("Total Billing This Year: ") + "<b>"
-						+ format_currency(r.message.total_billing, company_currency[0])
+						+ format_currency(r.message.total_billing, r.message.company_currency[0])
 						+ '</b> / <span class="text-muted">' + __("Unpaid") + ": <b>"
-						+ format_currency(r.message.total_unpaid, company_currency[0])
+						+ format_currency(r.message.total_unpaid, r.message.company_currency[0])
 						+ '</b></span>');
 				}
 			}

erpnext/patches.txt

@@ -36,6 +36,7 @@ erpnext.patches.v4_0.countrywise_coa
 execute:frappe.delete_doc("DocType", "MIS Control")
 execute:frappe.delete_doc("Page", "Financial Statements")
 execute:frappe.delete_doc("DocType", "Stock Ledger")
+execute:frappe.reload_doc("accounts", "doctype", "journal_entry") # 2014-12-31
 execute:frappe.db.sql("update `tabJournal Entry` set voucher_type='Journal Entry' where ifnull(voucher_type, '')=''")
 execute:frappe.delete_doc("DocType", "Grade")
 execute:frappe.db.sql("delete from `tabWebsite Item Group` where ifnull(item_group, '')=''")

erpnext/public/js/pos/pos.js

@@ -370,14 +370,10 @@ erpnext.POS = Class.extend({
 		});
 
 		me.refresh_delete_btn();
-<<<<<<< HEAD:erpnext/accounts/doctype/sales_invoice/pos.js
-		if(me.frm.doc[this.party.toLowerCase()]) {
-=======
 		//me.focus();
 	},
 	focus: function() {
-		if(me.frm.doc[this.party]) {
->>>>>>> v5-design:erpnext/public/js/pos/pos.js
+		if(me.frm.doc[this.party].toLowerCase()) {
 			this.barcode.$input.focus();
 		} else {
 			if(!(this.frm.doctype == "Quotation" && this.frm.doc.quotation_to!="Customer"))