Merge branch 'develop'

[minor] add import link in item price

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '5.0.6'
+__version__ = '5.0.10'

erpnext/accounts/doctype/gl_entry/gl_entry.py

@@ -10,8 +10,8 @@ from frappe import _
 from frappe.model.document import Document
 
 class GLEntry(Document):
-
 	def validate(self):
+		self.flags.ignore_submit_comment = True
 		self.check_mandatory()
 		self.pl_must_have_cost_center()
 		self.validate_posting_date()

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -76,9 +76,9 @@ class JournalEntry(AccountsController):
 			account_type = frappe.db.get_value("Account", d.account, "account_type")
 			if account_type in ["Receivable", "Payable"]:
 				if not (d.party_type and d.party):
-					frappe.throw(_("Row{0}: Party Type and Party is required for Receivable / Payable account {1}").format(d.idx, d.account))
+					frappe.throw(_("Row {0}: Party Type and Party is required for Receivable / Payable account {1}").format(d.idx, d.account))
 			elif d.party_type and d.party:
-				frappe.throw(_("Row{0}: Party Type and Party is only applicable against Receivable / Payable account").format(d.idx))
+				frappe.throw(_("Row {0}: Party Type and Party is only applicable against Receivable / Payable account").format(d.idx))
 
 	def check_credit_limit(self):
 		customers = list(set([d.party for d in self.get("accounts") if d.party_type=="Customer" and flt(d.debit) > 0]))
@@ -438,7 +438,7 @@ class JournalEntry(AccountsController):
 		if self.stock_entry:
 			if frappe.db.get_value("Stock Entry", self.stock_entry, "docstatus") != 1:
 				frappe.throw(_("Stock Entry {0} is not submitted").format(self.stock_entry))
-				
+
 			if frappe.db.exists({"doctype": "Journal Entry", "stock_entry": self.stock_entry, "docstatus":1}):
 				frappe.msgprint(_("Warning: Another {0} # {1} exists against stock entry {2}".format(self.voucher_type, self.name, self.stock_entry)))
 

erpnext/accounts/doctype/pos_profile/pos_profile.js

@@ -1,13 +1,13 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.ui.form.on("POS Setting", "onload", function(frm) {
+frappe.ui.form.on("POS Profile", "onload", function(frm) {
 	frm.set_query("selling_price_list", function() {
 		return { filter: { selling: 1 } };
 	});
 
 	frm.call({
-		method: "erpnext.accounts.doctype.pos_setting.pos_setting.get_series",
+		method: "erpnext.accounts.doctype.pos_profile.pos_profile.get_series",
 		callback: function(r) {
 			if(!r.exc) {
 				set_field_options("naming_series", r.message);

erpnext/accounts/doctype/pos_profile/pos_profile.json

@@ -0,0 +1,263 @@
+{
+ "allow_rename": 0, 
+ "autoname": "hash", 
+ "creation": "2013-05-24 12:15:51", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "user", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "User", 
+   "oldfieldname": "user", 
+   "oldfieldtype": "Link", 
+   "options": "User", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
+  {
+   "description": "", 
+   "fieldname": "territory", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Territory", 
+   "oldfieldname": "territory", 
+   "oldfieldtype": "Link", 
+   "options": "Territory", 
+   "permlevel": 0, 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "in_list_view": 1, 
+   "label": "Series", 
+   "no_copy": 1, 
+   "oldfieldname": "naming_series", 
+   "oldfieldtype": "Select", 
+   "options": "[Select]", 
+   "permlevel": 0, 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "currency", 
+   "fieldtype": "Link", 
+   "in_list_view": 0, 
+   "label": "Currency", 
+   "oldfieldname": "currency", 
+   "oldfieldtype": "Select", 
+   "options": "Currency", 
+   "permlevel": 0, 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "selling_price_list", 
+   "fieldtype": "Link", 
+   "label": "Price List", 
+   "oldfieldname": "price_list_name", 
+   "oldfieldtype": "Select", 
+   "options": "Price List", 
+   "permlevel": 0, 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Company", 
+   "oldfieldname": "company", 
+   "oldfieldtype": "Link", 
+   "options": "Company", 
+   "permlevel": 0, 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "column_break0", 
+   "fieldtype": "Column Break", 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
+  {
+   "default": "1", 
+   "description": "Create Stock Ledger Entries when you submit a Sales Invoice", 
+   "fieldname": "update_stock", 
+   "fieldtype": "Check", 
+   "label": "Update Stock", 
+   "permlevel": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "customer", 
+   "fieldtype": "Link", 
+   "in_list_view": 0, 
+   "label": "Customer", 
+   "oldfieldname": "customer_account", 
+   "oldfieldtype": "Link", 
+   "options": "Customer", 
+   "permlevel": 0, 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "cash_bank_account", 
+   "fieldtype": "Link", 
+   "label": "Cash/Bank Account", 
+   "oldfieldname": "cash_bank_account", 
+   "oldfieldtype": "Link", 
+   "options": "Account", 
+   "permlevel": 0, 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "income_account", 
+   "fieldtype": "Link", 
+   "label": "Income Account", 
+   "oldfieldname": "income_account", 
+   "oldfieldtype": "Link", 
+   "options": "Account", 
+   "permlevel": 0, 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)", 
+   "fieldname": "expense_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "label": "Expense Account", 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "warehouse", 
+   "fieldtype": "Link", 
+   "label": "Warehouse", 
+   "oldfieldname": "warehouse", 
+   "oldfieldtype": "Link", 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "cost_center", 
+   "fieldtype": "Link", 
+   "label": "Cost Center", 
+   "oldfieldname": "cost_center", 
+   "oldfieldtype": "Link", 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "taxes_and_charges", 
+   "fieldtype": "Link", 
+   "label": "Taxes and Charges", 
+   "oldfieldname": "charge", 
+   "oldfieldtype": "Link", 
+   "options": "Sales Taxes and Charges Template", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
+  {
+   "fieldname": "write_off_account", 
+   "fieldtype": "Link", 
+   "label": "Write Off Account", 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "write_off_cost_center", 
+   "fieldtype": "Link", 
+   "label": "Write Off Cost Center", 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "precision": "", 
+   "reqd": 1
+  }, 
+  {
+   "allow_on_submit": 1, 
+   "fieldname": "letter_head", 
+   "fieldtype": "Link", 
+   "label": "Letter Head", 
+   "oldfieldname": "letter_head", 
+   "oldfieldtype": "Select", 
+   "options": "Letter Head", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 0
+  }, 
+  {
+   "fieldname": "tc_name", 
+   "fieldtype": "Link", 
+   "label": "Terms and Conditions", 
+   "oldfieldname": "tc_name", 
+   "oldfieldtype": "Link", 
+   "options": "Terms and Conditions", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
+  {
+   "allow_on_submit": 1, 
+   "fieldname": "select_print_heading", 
+   "fieldtype": "Link", 
+   "in_filter": 0, 
+   "label": "Print Heading", 
+   "oldfieldname": "select_print_heading", 
+   "oldfieldtype": "Select", 
+   "options": "Print Heading", 
+   "permlevel": 0, 
+   "read_only": 0
+  }
+ ], 
+ "icon": "icon-cog", 
+ "idx": 1, 
+ "modified": "2015-05-20 05:38:44.482696", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "POS Profile", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "apply_user_permissions": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts User", 
+   "submit": 0
+  }
+ ], 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "user"
+}

erpnext/accounts/doctype/pos_profile/pos_profile.py

@@ -8,22 +8,22 @@ from frappe.utils import cint
 
 from frappe.model.document import Document
 
-class POSSetting(Document):
+class POSProfile(Document):
 	def validate(self):
 		self.check_for_duplicate()
 		self.validate_expense_account()
 		self.validate_all_link_fields()
 
 	def check_for_duplicate(self):
-		res = frappe.db.sql("""select name, user from `tabPOS Setting`
+		res = frappe.db.sql("""select name, user from `tabPOS Profile`
 			where ifnull(user, '') = %s and name != %s and company = %s""",
 			(self.user, self.name, self.company))
 		if res:
 			if res[0][1]:
-				msgprint(_("POS Setting {0} already created for user: {1} and company {2}").format(res[0][0],
+				msgprint(_("POS Profile {0} already created for user: {1} and company {2}").format(res[0][0],
 					res[0][1], self.company), raise_exception=1)
 			else:
-				msgprint(_("Global POS Setting {0} already created for company {1}").format(res[0][0],
+				msgprint(_("Global POS Profile {0} already created for company {1}").format(res[0][0],
 					self.company), raise_exception=1)
 
 	def validate_expense_account(self):
@@ -57,7 +57,7 @@ class POSSetting(Document):
 			condition = ""
 
 		pos_view_users = frappe.db.sql_list("""select user
-			from `tabPOS Setting` {0}""".format(condition))
+			from `tabPOS Profile` {0}""".format(condition))
 
 		for user in pos_view_users:
 			if user:

erpnext/accounts/doctype/pos_profile/test_pos_profile.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and Contributors
 # See license.txt
 from __future__ import unicode_literals
@@ -5,7 +6,7 @@ from __future__ import unicode_literals
 import frappe
 import unittest
 
-test_records = frappe.get_test_records('POS Setting')
+# test_records = frappe.get_test_records('POS Profile')
 
-class TestPOSSetting(unittest.TestCase):
+class TestPOSProfile(unittest.TestCase):
 	pass

erpnext/accounts/doctype/pos_setting/README.md

@@ -1 +0,0 @@
-Standard settings for Point of Sales (POS) type of Sales Invoice.

erpnext/accounts/doctype/pos_setting/__init__.py

@@ -1 +0,0 @@
-from __future__ import unicode_literals

erpnext/accounts/doctype/pos_setting/pos_setting.json

@@ -1,263 +0,0 @@
-{
- "allow_rename": 0,
- "autoname": "hash",
- "creation": "2013-05-24 12:15:51",
- "docstatus": 0,
- "doctype": "DocType",
- "fields": [
-  {
-   "fieldname": "user",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "User",
-   "oldfieldname": "user",
-   "oldfieldtype": "Link",
-   "options": "User",
-   "permlevel": 0,
-   "read_only": 0
-  },
-  {
-   "description": "",
-   "fieldname": "territory",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Territory",
-   "oldfieldname": "territory",
-   "oldfieldtype": "Link",
-   "options": "Territory",
-   "permlevel": 0,
-   "read_only": 0,
-   "reqd": 1
-  },
-  {
-   "fieldname": "naming_series",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "label": "Series",
-   "no_copy": 1,
-   "oldfieldname": "naming_series",
-   "oldfieldtype": "Select",
-   "options": "[Select]",
-   "permlevel": 0,
-   "read_only": 0,
-   "reqd": 1
-  },
-  {
-   "fieldname": "currency",
-   "fieldtype": "Link",
-   "in_list_view": 0,
-   "label": "Currency",
-   "oldfieldname": "currency",
-   "oldfieldtype": "Select",
-   "options": "Currency",
-   "permlevel": 0,
-   "read_only": 0,
-   "reqd": 1
-  },
-  {
-   "fieldname": "selling_price_list",
-   "fieldtype": "Link",
-   "label": "Price List",
-   "oldfieldname": "price_list_name",
-   "oldfieldtype": "Select",
-   "options": "Price List",
-   "permlevel": 0,
-   "read_only": 0,
-   "reqd": 0
-  },
-  {
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Company",
-   "oldfieldname": "company",
-   "oldfieldtype": "Link",
-   "options": "Company",
-   "permlevel": 0,
-   "read_only": 0,
-   "reqd": 1
-  },
-  {
-   "fieldname": "column_break0",
-   "fieldtype": "Column Break",
-   "oldfieldtype": "Column Break",
-   "permlevel": 0,
-   "read_only": 0
-  },
-  {
-   "default": "1",
-   "description": "Create Stock Ledger Entries when you submit a Sales Invoice",
-   "fieldname": "update_stock",
-   "fieldtype": "Check",
-   "label": "Update Stock",
-   "permlevel": 0,
-   "reqd": 0
-  },
-  {
-   "fieldname": "customer",
-   "fieldtype": "Link",
-   "in_list_view": 0,
-   "label": "Customer",
-   "oldfieldname": "customer_account",
-   "oldfieldtype": "Link",
-   "options": "Customer",
-   "permlevel": 0,
-   "read_only": 0,
-   "reqd": 0
-  },
-  {
-   "fieldname": "cash_bank_account",
-   "fieldtype": "Link",
-   "label": "Cash/Bank Account",
-   "oldfieldname": "cash_bank_account",
-   "oldfieldtype": "Link",
-   "options": "Account",
-   "permlevel": 0,
-   "read_only": 0,
-   "reqd": 1
-  },
-  {
-   "fieldname": "income_account",
-   "fieldtype": "Link",
-   "label": "Income Account",
-   "oldfieldname": "income_account",
-   "oldfieldtype": "Link",
-   "options": "Account",
-   "permlevel": 0,
-   "read_only": 0,
-   "reqd": 1
-  },
-  {
-   "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)",
-   "fieldname": "expense_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "label": "Expense Account",
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 0,
-   "reqd": 0
-  },
-  {
-   "fieldname": "warehouse",
-   "fieldtype": "Link",
-   "label": "Warehouse",
-   "oldfieldname": "warehouse",
-   "oldfieldtype": "Link",
-   "options": "Warehouse",
-   "permlevel": 0,
-   "read_only": 0,
-   "reqd": 0
-  },
-  {
-   "fieldname": "cost_center",
-   "fieldtype": "Link",
-   "label": "Cost Center",
-   "oldfieldname": "cost_center",
-   "oldfieldtype": "Link",
-   "options": "Cost Center",
-   "permlevel": 0,
-   "read_only": 0,
-   "reqd": 1
-  },
-  {
-   "fieldname": "taxes_and_charges",
-   "fieldtype": "Link",
-   "label": "Taxes and Charges",
-   "oldfieldname": "charge",
-   "oldfieldtype": "Link",
-   "options": "Sales Taxes and Charges Template",
-   "permlevel": 0,
-   "read_only": 0
-  },
-  {
-   "fieldname": "write_off_account",
-   "fieldtype": "Link",
-   "label": "Write Off Account",
-   "options": "Account",
-   "permlevel": 0,
-   "precision": "",
-   "reqd": 1
-  },
-  {
-   "fieldname": "write_off_cost_center",
-   "fieldtype": "Link",
-   "label": "Write Off Cost Center",
-   "options": "Cost Center",
-   "permlevel": 0,
-   "precision": "",
-   "reqd": 1
-  },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "letter_head",
-   "fieldtype": "Link",
-   "label": "Letter Head",
-   "oldfieldname": "letter_head",
-   "oldfieldtype": "Select",
-   "options": "Letter Head",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 0
-  },
-  {
-   "fieldname": "tc_name",
-   "fieldtype": "Link",
-   "label": "Terms and Conditions",
-   "oldfieldname": "tc_name",
-   "oldfieldtype": "Link",
-   "options": "Terms and Conditions",
-   "permlevel": 0,
-   "read_only": 0
-  },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "select_print_heading",
-   "fieldtype": "Link",
-   "in_filter": 0,
-   "label": "Print Heading",
-   "oldfieldname": "select_print_heading",
-   "oldfieldtype": "Select",
-   "options": "Print Heading",
-   "permlevel": 0,
-   "read_only": 0
-  }
- ],
- "icon": "icon-cog",
- "idx": 1,
- "modified": "2015-02-05 05:11:42.344181",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "POS Setting",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts Manager",
-   "share": 1,
-   "submit": 0,
-   "write": 1
-  },
-  {
-   "apply_user_permissions": 1,
-   "delete": 0,
-   "email": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts User",
-   "submit": 0
-  }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "title_field": "user"
-}

erpnext/accounts/doctype/pos_setting/test_records.json

@@ -1 +0,0 @@
-[]

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json

@@ -611,7 +611,7 @@
   {
    "fieldname": "advances_section", 
    "fieldtype": "Section Break", 
-   "label": "Advances", 
+   "label": "", 
    "oldfieldtype": "Section Break", 
    "options": "icon-money", 
    "permlevel": 0, 
@@ -665,7 +665,7 @@
    "depends_on": "supplier", 
    "fieldname": "contact_section", 
    "fieldtype": "Section Break", 
-   "label": "Contact Info", 
+   "label": "", 
    "options": "icon-bullhorn", 
    "permlevel": 0, 
    "read_only": 0
@@ -939,7 +939,7 @@
  "icon": "icon-file-text", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-05-15 14:20:47.718194", 
+ "modified": "2015-05-21 05:34:42.436924", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice", 

erpnext/accounts/doctype/sales_invoice/sales_invoice.py

@@ -160,12 +160,12 @@ class SalesInvoice(SellingController):
 					frappe.throw(_("Time Log Batch {0} must be 'Submitted'").format(d.time_log_batch))
 
 	def set_pos_fields(self, for_validate=False):
-		"""Set retail related fields from pos settings"""
+		"""Set retail related fields from POS Profiles"""
 		if cint(self.is_pos) != 1:
 			return
 
-		from erpnext.stock.get_item_details import get_pos_settings_item_details, get_pos_settings
-		pos = get_pos_settings(self.company)
+		from erpnext.stock.get_item_details import get_pos_profiles_item_details, get_pos_profiles
+		pos = get_pos_profiles(self.company)
 
 		if pos:
 			if not for_validate and not self.customer:
@@ -184,7 +184,7 @@ class SalesInvoice(SellingController):
 			# set pos values in items
 			for item in self.get("items"):
 				if item.get('item_code'):
-					for fname, val in get_pos_settings_item_details(pos,
+					for fname, val in get_pos_profiles_item_details(pos,
 						frappe._dict(item.as_dict()), pos).items():
 
 						if (not for_validate) or (for_validate and not item.get(fname)):
@@ -371,24 +371,24 @@ class SalesInvoice(SellingController):
 
 
 	def get_warehouse(self):
-		user_pos_setting = frappe.db.sql("""select name, warehouse from `tabPOS Setting`
+		user_pos_profile = frappe.db.sql("""select name, warehouse from `tabPOS Profile`
 			where ifnull(user,'') = %s and company = %s""", (frappe.session['user'], self.company))
-		warehouse = user_pos_setting[0][1] if user_pos_setting else None
+		warehouse = user_pos_profile[0][1] if user_pos_profile else None
 
 		if not warehouse:
-			global_pos_setting = frappe.db.sql("""select name, warehouse from `tabPOS Setting`
+			global_pos_profile = frappe.db.sql("""select name, warehouse from `tabPOS Profile`
 				where ifnull(user,'') = '' and company = %s""", self.company)
 
-			if global_pos_setting:
-				warehouse = global_pos_setting[0][1]
-			elif not user_pos_setting:
-				msgprint(_("POS Setting required to make POS Entry"), raise_exception=True)
+			if global_pos_profile:
+				warehouse = global_pos_profile[0][1]
+			elif not user_pos_profile:
+				msgprint(_("POS Profile required to make POS Entry"), raise_exception=True)
 
 		return warehouse
 
 	def on_update(self):
 		if cint(self.update_stock) == 1:
-			# Set default warehouse from pos setting
+			# Set default warehouse from POS Profile
 			if cint(self.is_pos) == 1:
 				w = self.get_warehouse()
 				if w:

erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py

@@ -462,7 +462,7 @@ class TestSalesInvoice(unittest.TestCase):
 
 	def test_pos_gl_entry_with_aii(self):
 		set_perpetual_inventory()
-		self.make_pos_setting()
+		self.make_pos_profile()
 
 		self._insert_purchase_receipt()
 
@@ -517,19 +517,19 @@ class TestSalesInvoice(unittest.TestCase):
 
 		set_perpetual_inventory(0)
 
-		frappe.db.sql("delete from `tabPOS Setting`")
+		frappe.db.sql("delete from `tabPOS Profile`")
 
-	def make_pos_setting(self):
-		pos_setting = frappe.get_doc({
+	def make_pos_profile(self):
+		pos_profile = frappe.get_doc({
 			"cash_bank_account": "_Test Account Bank Account - _TC",
 			"company": "_Test Company",
 			"cost_center": "_Test Cost Center - _TC",
 			"currency": "INR",
-			"doctype": "POS Setting",
+			"doctype": "POS Profile",
 			"expense_account": "_Test Account Cost for Goods Sold - _TC",
 			"income_account": "Sales - _TC",
-			"name": "_Test POS Setting",
-			"naming_series": "_T-POS Setting-",
+			"name": "_Test POS Profile",
+			"naming_series": "_T-POS Profile-",
 			"selling_price_list": "_Test Price List",
 			"territory": "_Test Territory",
 			"warehouse": "_Test Warehouse - _TC",
@@ -537,8 +537,8 @@ class TestSalesInvoice(unittest.TestCase):
 			"write_off_cost_center": "_Test Write Off Cost Center - _TC"
 		})
 
-		if not frappe.db.exists("POS Setting", "_Test POS Setting"):
-			pos_setting.insert()
+		if not frappe.db.exists("POS Profile", "_Test POS Profile"):
+			pos_profile.insert()
 
 	def test_si_gl_entry_with_aii_and_update_stock_with_warehouse_but_no_account(self):
 		set_perpetual_inventory()

erpnext/accounts/page/pos/pos.js

@@ -35,7 +35,7 @@ frappe.pages['pos'].on_page_load = function(wrapper) {
 	});
 
 	$.ajax({
-		url: "/api/resource/POS Setting",
+		url: "/api/resource/POS Profile",
 		success: function(data) {
 			if(!data.data.length) {
 				page.main.find(".pos-setting-message").removeClass('hide');

erpnext/accounts/report/balance_sheet/balance_sheet.py

@@ -29,7 +29,7 @@ def execute(filters=None):
 def get_provisional_profit_loss(asset, liability, equity, period_list):
 	if asset and (liability or equity):
 		provisional_profit_loss = {
-			"account_name": _("Provisional Profit / Loss (Credit)"),
+			"account_name": "'" + _("Provisional Profit / Loss (Credit)") + "'",
 			"account": None,
 			"warn_if_negative": True
 		}

erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py

@@ -38,7 +38,7 @@ def execute(filters=None):
 	data += [
 		get_balance_row(_("System Balance"), balance_as_per_system),
 		[""]*len(columns),
-		["", _("Amounts not reflected in bank"), total_debit, total_credit, "", "", "", ""],
+		["", '"' + _("Amounts not reflected in bank") + '"', total_debit, total_credit, "", "", "", ""],
 		get_balance_row(_("Amounts not reflected in system"), amounts_not_reflected_in_system),
 		[""]*len(columns),
 		get_balance_row(_("Expected balance as per bank"), bank_bal)
@@ -68,6 +68,6 @@ def get_entries(filters):
 
 def get_balance_row(label, amount):
 	if amount > 0:
-		return ["", label, amount, 0, "", "", "", ""]
+		return ["", '"' + label + '"', amount, 0, "", "", "", ""]
 	else:
-		return ["", label, 0, abs(amount), "", "", "", ""]
+		return ["", '"' + label + '"', 0, abs(amount), "", "", "", ""]

erpnext/accounts/report/financial_statements.py

@@ -146,7 +146,7 @@ def prepare_data(accounts, balance_must_be, period_list):
 
 def add_total_row(out, balance_must_be, period_list):
 	row = {
-		"account_name": _("Total ({0})").format(balance_must_be),
+		"account_name": "'" + _("Total ({0})").format(balance_must_be) + "'",
 		"account": None
 	}
 	for period in period_list:
@@ -207,7 +207,7 @@ def filter_accounts(accounts, depth=10):
 	add_to_list(None, 0)
 
 	return filtered_accounts, accounts_by_name
-	
+
 def sort_root_accounts(roots):
 	"""Sort root types as Asset, Liability, Equity, Income, Expense"""
 

erpnext/accounts/report/general_ledger/general_ledger.py

@@ -108,30 +108,30 @@ def get_data_with_opening_closing(filters, account_details, gl_entries):
 
 	# Opening for filtered account
 	if filters.get("account"):
-		data += [get_balance_row("Opening", opening), {}]
+		data += [get_balance_row(_("Opening"), opening), {}]
 
 	for acc, acc_dict in gle_map.items():
 		if acc_dict.entries:
 			# Opening for individual ledger, if grouped by account
 			if filters.get("group_by_account"):
-				data.append(get_balance_row("Opening", acc_dict.opening))
+				data.append(get_balance_row(_("Opening"), acc_dict.opening))
 
 			data += acc_dict.entries
 
 			# Totals and closing for individual ledger, if grouped by account
 			if filters.get("group_by_account"):
-				data += [{"account": "Totals", "debit": acc_dict.total_debit,
+				data += [{"account": "'" + _("Totals") + "'", "debit": acc_dict.total_debit,
 					"credit": acc_dict.total_credit},
-					get_balance_row("Closing (Opening + Totals)",
+					get_balance_row(_("Closing (Opening + Totals)"),
 						(acc_dict.opening + acc_dict.total_debit - acc_dict.total_credit)), {}]
 
 	# Total debit and credit between from and to date
 	if total_debit or total_credit:
-		data.append({"account": "Totals", "debit": total_debit, "credit": total_credit})
+		data.append({"account": "'" + _("Totals") + "'", "debit": total_debit, "credit": total_credit})
 
 	# Closing for filtered account
 	if filters.get("account"):
-		data.append(get_balance_row("Closing (Opening + Totals)",
+		data.append(get_balance_row(_("Closing (Opening + Totals)"),
 			(opening + total_debit - total_credit)))
 
 	return data
@@ -168,7 +168,7 @@ def get_accountwise_gle(filters, gl_entries, gle_map):
 
 def get_balance_row(label, balance):
 	return {
-		"account": label,
+		"account": "'" + label + "'",
 		"debit": balance if balance > 0 else 0,
 		"credit": -1*balance if balance < 0 else 0,
 	}

erpnext/accounts/report/gross_profit/gross_profit.py

@@ -98,7 +98,7 @@ class GrossProfitGenerator(object):
 
 			row.base_amount = flt(row.base_net_amount)
 
-			sales_boms = self.sales_boms.get(row.parenttype, {}).get(row.name, frappe._dict())
+			sales_boms = self.sales_boms.get(row.parenttype, {}).get(row.parent, frappe._dict())
 
 			# get buying amount
 			if row.item_code in sales_boms:
@@ -158,7 +158,7 @@ class GrossProfitGenerator(object):
 
 	def get_buying_amount_from_sales_bom(self, row, sales_bom):
 		buying_amount = 0.0
-		for bom_item in sales_bom[row.item_code]:
+		for bom_item in sales_bom:
 			if bom_item.get("parent_detail_docname")==row.item_row:
 				buying_amount += self.get_buying_amount(row, bom_item.item_code)
 
@@ -174,14 +174,17 @@ class GrossProfitGenerator(object):
 			return flt(row.qty) * item_rate
 
 		else:
-			if row.dn_detail:
-				row.parenttype = "Delivery Note"
-				row.parent = row.delivery_note
-				row.item_row = row.dn_detail
+			if row.update_stock or row.dn_detail:
+				if row.dn_detail:
+					row.parenttype = "Delivery Note"
+					row.parent = row.delivery_note
+					row.item_row = row.dn_detail
 
 				my_sle = self.sle.get((item_code, row.warehouse))
 				for i, sle in enumerate(my_sle):
 					# find the stock valution rate from stock ledger entry
+					print sle.voucher_type, row.parenttype, sle.voucher_no, row.parent, \
+						sle.voucher_detail_no, row.item_row
 					if sle.voucher_type == row.parenttype and row.parent == sle.voucher_no and \
 						sle.voucher_detail_no == row.item_row:
 							previous_stock_value = len(my_sle) > i+1 and \
@@ -215,7 +218,7 @@ class GrossProfitGenerator(object):
 		if self.filters.to_date:
 			conditions += " and posting_date <= %(to_date)s"
 
-		self.si_list = frappe.db.sql("""select item.parenttype, si.name,
+		self.si_list = frappe.db.sql("""select item.parenttype, item.parent, 
 				si.posting_date, si.posting_time, si.project_name, si.update_stock,
 				si.customer, si.customer_group, si.territory,
 				item.item_code, item.item_name, item.description, item.warehouse,

erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py

@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe import msgprint, _
+from frappe import _
 from frappe.utils import flt
 
 def execute(filters=None):
@@ -23,7 +23,7 @@ def execute(filters=None):
 			purchase_receipt = d.purchase_receipt
 		elif d.po_detail:
 			purchase_receipt = ", ".join(frappe.db.sql_list("""select distinct parent
-			from `tabPurchase Receipt Item` where docstatus=1 and po_detail=%s""", d.po_detail))
+			from `tabPurchase Receipt Item` where docstatus=1 and prevdoc_detail_docname=%s""", d.po_detail))
 
 		expense_account = d.expense_account or aii_account_map.get(d.company)
 		row = [d.item_code, d.item_name, d.item_group, d.parent, d.posting_date, d.supplier,

erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py

@@ -27,7 +27,7 @@ def execute(filters=None):
 def get_net_profit_loss(income, expense, period_list):
 	if income and expense:
 		net_profit_loss = {
-			"account_name": _("Net Profit / Loss"),
+			"account_name": "'" + _("Net Profit / Loss") + "'",
 			"account": None,
 			"warn_if_negative": True
 		}

erpnext/accounts/report/purchase_register/purchase_register.py

@@ -144,7 +144,7 @@ def get_invoice_tax_map(invoice_list, invoice_expense_map, expense_accounts):
 	return invoice_expense_map, invoice_tax_map
 
 def get_invoice_po_pr_map(invoice_list):
-	pi_items = frappe.db.sql("""select parent, purchase_order, purchase_receipt, po_detail
+	pi_items = frappe.db.sql("""select parent, purchase_order, purchase_receipt, po_detail, 
 		project_name from `tabPurchase Invoice Item` where parent in (%s)
 		and (ifnull(purchase_order, '') != '' or ifnull(purchase_receipt, '') != '')""" %
 		', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1)
@@ -160,7 +160,7 @@ def get_invoice_po_pr_map(invoice_list):
 			pr_list = [d.purchase_receipt]
 		elif d.po_detail:
 			pr_list = frappe.db.sql_list("""select distinct parent from `tabPurchase Receipt Item`
-				where docstatus=1 and po_detail=%s""", d.pr_detail)
+				where docstatus=1 and prevdoc_detail_docname=%s""", d.po_detail)
 
 		if pr_list:
 			invoice_po_pr_map.setdefault(d.parent, frappe._dict()).setdefault("purchase_receipt", pr_list)

erpnext/buying/doctype/purchase_order/test_purchase_order.py

@@ -80,6 +80,8 @@ def create_purchase_order(**args):
 	po.company = args.company or "_Test Company"
 	po.supplier = args.customer or "_Test Supplier"
 	po.is_subcontracted = args.is_subcontracted or "No"
+	po.currency = args.currency or frappe.db.get_value("Company", po.company, "default_currency")
+	po.conversion_factor = args.conversion_factor or 1
 
 	po.append("items", {
 		"item_code": args.item or args.item_code or "_Test Item",

erpnext/change_log/current/rename_pos_setting.md

@@ -0,0 +1 @@
+- POS Setting is renamed to POS Profile

erpnext/config/accounts.py

@@ -113,8 +113,8 @@ def get_data():
 				},
 				{
 					"type": "doctype",
-					"name": "POS Setting",
-					"label": _("Point-of-Sale Setting"),
+					"name": "POS Profile",
+					"label": _("Point-of-Sale Profile"),
 					"description": _("Rules to calculate shipping amount for a sale")
 				},
 				{

erpnext/config/manufacturing.py

@@ -55,6 +55,14 @@ def get_data():
 					"name": "BOM Replace Tool",
 					"description": _("Replace Item / BOM in all BOMs"),
 				},
+				{
+					"type": "page",
+					"name": "bom-browser",
+					"icon": "icon-sitemap",
+					"label": _("BOM Browser"),
+					"description": _("Tree of Bill of Materials"),
+					"doctype": "BOM"
+				}
 			]
 		},
 		{

erpnext/controllers/buying_controller.py

@@ -279,7 +279,7 @@ class BuyingController(StockController):
 
 	def set_qty_as_per_stock_uom(self):
 		for d in self.get("items"):
-			if d.meta.get_field("stock_qty") and not d.stock_qty:
+			if d.meta.get_field("stock_qty"):
 				if not d.conversion_factor:
 					frappe.throw(_("Row {0}: Conversion Factor is mandatory").format(d.idx))
 				d.stock_qty = flt(d.qty) * flt(d.conversion_factor)

erpnext/crm/doctype/newsletter/newsletter.py

@@ -8,7 +8,9 @@ import frappe.utils
 from frappe import throw, _
 from frappe.model.document import Document
 from frappe.email.bulk import check_bulk_limit
+from frappe.utils.verified_command import get_signed_params, verify_request
 import erpnext.tasks
+from erpnext.crm.doctype.newsletter_list.newsletter_list import add_subscribers
 
 class Newsletter(Document):
 	def onload(self):
@@ -87,12 +89,11 @@ def get_lead_options():
 
 @frappe.whitelist(allow_guest=True)
 def unsubscribe(email, name):
-	from frappe.utils.verified_command import verify_request
 	if not verify_request():
 		return
 
 	subs_id = frappe.db.get_value("Newsletter List Subscriber", {"email": email, "newsletter_list": name})
-	if name:
+	if subs_id:
 		subscriber = frappe.get_doc("Newsletter List Subscriber", subs_id)
 		subscriber.unsubscribed = 1
 		subscriber.save(ignore_permissions=True)
@@ -123,3 +124,47 @@ def create_lead(email_id):
 		"source": "Email"
 	})
 	lead.insert()
+
+
+@frappe.whitelist(allow_guest=True)
+def subscribe(email):
+	url = frappe.utils.get_url("/api/method/erpnext.crm.doctype.newsletter.newsletter.confirm_subscription") +\
+		"?" + get_signed_params({"email": email})
+
+	messages = (
+		_("Thank you for your interest in subscribing to our updates"),
+		_("Please verify your email id"),
+		url,
+		_("Click here to verify")
+	)
+
+	print url
+
+	content = """
+	<p>{0}. {1}.</p>
+	<p><a href="{2}">{3}</a></p>
+	"""
+
+	frappe.sendmail(email, subject=_("Confirm Your Email"), content=content.format(*messages), bulk=True)
+
+@frappe.whitelist(allow_guest=True)
+def confirm_subscription(email):
+	if not verify_request():
+		return
+
+	if not frappe.db.exists("Newsletter List", _("Website")):
+		frappe.get_doc({
+			"doctype": "Newsletter List",
+			"title": _("Website")
+		}).insert(ignore_permissions=True)
+
+
+	frappe.flags.ignore_permissions = True
+
+	add_subscribers(_("Website"), email)
+	frappe.db.commit()
+
+	frappe.respond_as_web_page(_("Confirmed"), _("{0} has been successfully added to our Newsletter list.").format(email))
+
+
+

erpnext/crm/doctype/newsletter/test_newsletter.py

@@ -9,7 +9,16 @@ from urllib import unquote
 
 class TestNewsletter(unittest.TestCase):
 	def setUp(self):
-		frappe.db.sql("update `tabNewsletter List Subscriber` set unsubscribed = 0")
+		if not frappe.get_all("Newsletter List Subscriber"):
+			for email in ["test_subscriber1@example.com", "test_subscriber2@example.com", 
+				"test_subscriber3@example.com"]:
+					frappe.get_doc({
+						"doctype": "Newsletter List Subscriber",
+						"email": email,
+						"newsletter_list": "_Test Newsletter List"
+					}).insert()
+		else:
+			frappe.db.sql("update `tabNewsletter List Subscriber` set unsubscribed = 0")
 
 	def test_send(self):
 		self.send_newsletter()
@@ -39,6 +48,4 @@ class TestNewsletter(unittest.TestCase):
 
 		newsletter.send_emails()
 
-
-
 test_dependencies = ["Newsletter List"]

erpnext/crm/doctype/newsletter_list/newsletter_list.py

@@ -5,7 +5,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
-from frappe.utils import validate_email_add, strip
+from frappe.utils import validate_email_add
 from frappe import _
 from email.utils import parseaddr
 
@@ -75,7 +75,7 @@ def add_subscribers(name, email_list):
 					"doctype": "Newsletter List Subscriber",
 					"newsletter_list": name,
 					"email": email
-				}).insert()
+				}).insert(ignore_permissions = frappe.flags.ignore_permissions)
 
 				count += 1
 			else:

erpnext/crm/doctype/newsletter_list/test_newsletter_list.py

@@ -6,8 +6,6 @@ from __future__ import unicode_literals
 import frappe
 import unittest
 
-# test_records = frappe.get_test_records('Newletter List')
-
 class TestNewletterList(unittest.TestCase):
 	def test_import(self):
 		new_list = frappe.get_doc({
@@ -15,13 +13,13 @@ class TestNewletterList(unittest.TestCase):
 			"title": "_Test Newsletter List 1"
 		}).insert()
 
-		n_leads = frappe.db.count("Lead")
-
+		n_leads = frappe.db.sql("select count(distinct email_id) from `tabLead`")[0][0]
+		
 		added = new_list.import_from("Lead")
-
 		self.assertEquals(added, n_leads)
 
-		frappe.delete_doc("Newsletter List", new_list.name)
+	def tearDown(self):
+		frappe.delete_doc("Newsletter List", "_Test Newsletter List 1")
 
 test_dependencies = ["Lead"]
 

erpnext/crm/doctype/newsletter_list/test_records.json

@@ -2,20 +2,5 @@
 	{
 		"doctype": "Newsletter List",
 		"title": "_Test Newsletter List"
-	},
-	{
-		"doctype": "Newsletter List Subscriber",
-		"email": "test_subscriber1@example.com",
-		"newsletter_list": "_Test Newsletter List"
-	},
-	{
-		"doctype": "Newsletter List Subscriber",
-		"email": "test_subscriber2@example.com",
-		"newsletter_list": "_Test Newsletter List"
-	},
-	{
-		"doctype": "Newsletter List Subscriber",
-		"email": "test_subscriber3@example.com",
-		"newsletter_list": "_Test Newsletter List"
 	}
 ]

erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.py

@@ -10,4 +10,4 @@ class NewsletterListSubscriber(Document):
 	pass
 
 def after_doctype_insert():
-	frappe.db.add_unique("Newsletter List Subscriber", ("name", "email"))
+	frappe.db.add_unique("Newsletter List Subscriber", ("newsletter_list", "email"))

erpnext/hooks.py

@@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd. and Contributors"
 app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "5.0.6"
+app_version = "5.0.10"
 
 error_report_email = "support@erpnext.com"
 
@@ -96,8 +96,8 @@ scheduler_events = {
 	]
 }
 
-default_mail_footer = """<div style="padding: 7px; margin-top: 7px;">
-	<a style="color: #8D99A6; font-size: 85%; text-decoration: none;" href="https://erpnext.com" target="_blank">
+default_mail_footer = """<div style="padding: 15px; text-align: center;">
+	<a href="https://erpnext.com?source=via_email_footer" target="_blank" style="color: #8d99a6;">
 		Sent via ERPNext
 	</a>
 </div>"""

erpnext/hr/doctype/salary_slip/test_salary_slip.py

@@ -12,6 +12,9 @@ class TestSalarySlip(unittest.TestCase):
 	def setUp(self):
 		frappe.db.sql("""delete from `tabLeave Application`""")
 		frappe.db.sql("""delete from `tabSalary Slip`""")
+		
+		frappe.db.set_value("Holiday List", "_Test Holiday List", "is_default", 1)
+		
 		from erpnext.hr.doctype.leave_application.test_leave_application import _test_records as leave_applications
 		la = frappe.copy_doc(leave_applications[2])
 		la.insert()
@@ -26,6 +29,7 @@ class TestSalarySlip(unittest.TestCase):
 		frappe.db.set_value("HR Settings", "HR Settings", "include_holidays_in_total_working_days", 1)
 		ss = frappe.copy_doc(test_records[0])
 		ss.insert()
+		
 		self.assertEquals(ss.total_days_in_month, 31)
 		self.assertEquals(ss.payment_days, 30)
 		self.assertEquals(ss.earnings[0].e_modified_amount, 14516.13)
@@ -36,8 +40,10 @@ class TestSalarySlip(unittest.TestCase):
 		self.assertEquals(ss.net_pay, 14867.74)
 
 	def test_salary_slip_with_holidays_excluded(self):
+		frappe.db.set_value("HR Settings", "HR Settings", "include_holidays_in_total_working_days", 0)
 		ss = frappe.copy_doc(test_records[0])
 		ss.insert()
+		
 		self.assertEquals(ss.total_days_in_month, 30)
 		self.assertEquals(ss.payment_days, 29)
 		self.assertEquals(ss.earnings[0].e_modified_amount, 14500)
@@ -102,6 +108,6 @@ class TestSalarySlip(unittest.TestCase):
 
 		return salary_slip
 
-test_dependencies = ["Leave Application"]
+test_dependencies = ["Leave Application", "Holiday List"]
 
 test_records = frappe.get_test_records('Salary Slip')

erpnext/manufacturing/doctype/bom/bom.js

@@ -1,27 +1,36 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-// On REFRESH
 frappe.provide("erpnext.bom");
-cur_frm.cscript.refresh = function(doc,dt,dn){
-	cur_frm.toggle_enable("item", doc.__islocal);
-	toggle_operations(cur_frm);
 
-	if (!doc.__islocal && doc.docstatus<2) {
-		cur_frm.add_custom_button(__("Update Cost"), cur_frm.cscript.update_cost);
-	}
-}
+frappe.ui.form.on("BOM", {
+	onload_post_render: function(frm) {
+		frm.get_field("items").grid.set_multiple_add("item_code", "qty");
+	},
+	refresh: function(frm) {
+		frm.toggle_enable("item", frm.doc.__islocal);
+		toggle_operations(frm);
 
-cur_frm.cscript.update_cost = function() {
-	return frappe.call({
-		doc: cur_frm.doc,
-		method: "update_cost",
-		freeze: true,
-		callback: function(r) {
-			if(!r.exc) cur_frm.refresh_fields();
+		if (!frm.doc.__islocal && frm.doc.docstatus<2) {
+			frm.add_custom_button(__("Update Cost"), function() {
+				frm.events.update_cost(frm);
+			});
+			frm.add_custom_button(__("Browse BOM"), function() {
+				frappe.set_route("bom-browser", frm.doc.name);
+			});
 		}
-	})
-}
+	},
+	update_cost: function(frm) {
+		return frappe.call({
+			doc: frm.doc,
+			method: "update_cost",
+			freeze: true,
+			callback: function(r) {
+				if(!r.exc) frm.refresh_fields();
+			}
+		})
+	}
+});
 
 cur_frm.add_fetch("item", "description", "description");
 cur_frm.add_fetch("item", "image", "image");
@@ -35,7 +44,6 @@ cur_frm.cscript.hour_rate = function(doc, dt, dn) {
 }
 
 cur_frm.cscript.time_in_mins = cur_frm.cscript.hour_rate;
-cur_frm.cscript.fixed_cycle_cost = cur_frm.cscript.hour_rate;
 
 cur_frm.cscript.item_code = function(doc, cdt, cdn) {
 	get_bom_material_detail(doc, cdt, cdn);

erpnext/manufacturing/doctype/production_order/production_order.js

@@ -35,18 +35,20 @@ frappe.ui.form.on("Production Order", "additional_operating_cost", function(frm)
 
 frappe.ui.form.on("Production Order Operation", "workstation", function(frm, cdt, cdn) {
 	var d = locals[cdt][cdn];
-	frappe.call({
-		"method": "frappe.client.get",
-		args: {
-			doctype: "Workstation",
-			name: d.workstation
-		},
-		callback: function (data) {
-			frappe.model.set_value(d.doctype, d.name, "hour_rate", data.message.hour_rate);
-			erpnext.production_order.calculate_cost(frm.doc);
-			erpnext.production_order.calculate_total_cost(frm);
-		}
-	})
+	if (d.workstation) {
+		frappe.call({
+			"method": "frappe.client.get",
+			args: {
+				doctype: "Workstation",
+				name: d.workstation
+			},
+			callback: function (data) {
+				frappe.model.set_value(d.doctype, d.name, "hour_rate", data.message.hour_rate);
+				erpnext.production_order.calculate_cost(frm.doc);
+				erpnext.production_order.calculate_total_cost(frm);
+			}
+		})
+	}
 });
 
 frappe.ui.form.on("Production Order Operation", "time_in_mins", function(frm, cdt, cdn) {

erpnext/manufacturing/doctype/production_order/test_production_order.py

@@ -130,10 +130,9 @@ class TestProductionOrder(unittest.TestCase):
 		prod_order = make_prod_order_test_record(item="_Test FG Item 2",
 			planned_start_date="2014-11-25 00:00:00", qty=1, do_not_save=True)
 		prod_order.set_production_order_operations()
-		prod_order.save()
 		cost = prod_order.planned_operating_cost
 		prod_order.qty = 2
-		prod_order.save()
+		prod_order.set_production_order_operations()
 		self.assertEqual(prod_order.planned_operating_cost, cost*2)
 		
 def make_prod_order_test_record(**args):

erpnext/manufacturing/doctype/production_order_operation/production_order_operation.json

@@ -33,7 +33,7 @@
    "print_hide": 0, 
    "read_only": 1, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -293,7 +293,7 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-04-22 03:25:18.542350", 
+ "modified": "2015-05-21 13:46:27.730392", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Production Order Operation", 

erpnext/manufacturing/page/bom_browser/bom_browser.js

@@ -0,0 +1,90 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+frappe.pages['bom-browser'].on_page_load = function(wrapper) {
+	var page = frappe.ui.make_app_page({
+		parent: wrapper,
+		title: 'BOM Browser',
+		single_column: true
+	});
+
+	page.main.css({
+		"min-height": "300px",
+		"padding-bottom": "25px"
+	});
+
+	page.tree_area = $('<div class="padding"><p class="text-muted">'+
+		__("Select BOM to start")
+		+'</p></div>').appendTo(page.main);
+
+	frappe.breadcrumbs.add(frappe.breadcrumbs.last_module || "Manufacturing");
+
+	var make_tree = function() {
+		erpnext.bom_tree = new erpnext.BOMTree(page.$bom_select.val(), page, page.tree_area);
+	}
+
+	page.$bom_select = wrapper.page.add_field({fieldname: "bom",
+		fieldtype:"Link", options: "BOM", label: __("BOM")}).$input
+		.change(function() {
+			make_tree();
+		});
+
+	page.set_secondary_action(__('Refresh'), function() {
+		make_tree();
+	});
+}
+
+
+frappe.pages['bom-browser'].on_page_show = function(wrapper){
+	// set from route
+	var bom = null;
+	if(frappe.get_route()[1]) {
+		var bom = frappe.get_route().splice(1).join("/");
+	}
+	if(frappe.route_options && frappe.route_options.bom) {
+		var bom = frappe.route_options.bom;
+	}
+	if(bom) {
+		wrapper.page.$bom_select.val(bom).trigger("change");
+	}
+};
+
+erpnext.BOMTree = Class.extend({
+	init: function(root, page, parent) {
+		$(parent).empty();
+		var me = this;
+		me.page = page;
+		me.bom = page.$bom_select.val();
+		me.can_read = frappe.model.can_read("BOM");
+		me.can_create = frappe.boot.user.can_create.indexOf("BOM") !== -1 ||
+					frappe.boot.user.in_create.indexOf("BOM") !== -1;
+		me.can_write = frappe.model.can_write("BOM");
+		me.can_delete = frappe.model.can_delete("BOM");
+
+		this.tree = new frappe.ui.Tree({
+			parent: $(parent),
+			label: me.bom,
+			args: {parent: me.bom},
+			method: 'erpnext.manufacturing.page.bom_browser.bom_browser.get_children',
+			toolbar: [
+				{toggle_btn: true},
+				{
+					label:__("Edit"),
+					condition: function(node) {
+						return node.expandable;
+					},
+					click: function(node) {
+						frappe.set_route("Form", "BOM", node.data.parent);
+					}
+				}
+			],
+			get_label: function(node) {
+				if(node.data.qty) {
+					return node.data.qty + " x " + node.data.value;
+				} else {
+					return node.data.value;
+				}
+			}
+		});
+	}
+});

erpnext/manufacturing/page/bom_browser/bom_browser.json

@@ -0,0 +1,21 @@
+{
+ "content": null, 
+ "creation": "2015-05-25 02:57:33.472044", 
+ "docstatus": 0, 
+ "doctype": "Page", 
+ "modified": "2015-05-25 02:57:33.472044", 
+ "modified_by": "Administrator", 
+ "module": "Manufacturing", 
+ "name": "bom-browser", 
+ "owner": "Administrator", 
+ "page_name": "bom-browser", 
+ "roles": [
+  {
+   "role": "Manufacturing User"
+  }
+ ], 
+ "script": null, 
+ "standard": "Yes", 
+ "style": null, 
+ "title": "BOM Browser"
+}

erpnext/manufacturing/page/bom_browser/bom_browser.py

@@ -0,0 +1,15 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+@frappe.whitelist()
+def get_children(parent):
+	return frappe.db.sql("""select item_code as value,
+		bom_no as parent, qty,
+		if(ifnull(bom_no, "")!="", 1, 0) as expandable
+		from `tabBOM Item`
+		where parent=%s
+		order by idx
+		""", parent, as_dict=True)

erpnext/patches.txt

@@ -155,3 +155,6 @@ erpnext.patches.v5_0.reclculate_planned_operating_cost_in_production_order
 erpnext.patches.v5_0.repost_requested_qty
 erpnext.patches.v5_0.fix_taxes_and_totals_in_party_currency
 erpnext.patches.v5_0.update_tax_amount_after_discount_in_purchase_cycle
+erpnext.patches.v5_0.rename_pos_setting
+erpnext.patches.v5_0.update_operation_description
+erpnext.patches.v5_0.set_footer_address

erpnext/patches/v4_2/party_model.py

@@ -19,20 +19,21 @@ def create_receivable_payable_account():
 	receivable_payable_accounts = frappe._dict()
 
 	def _create_account(args):
-		account_id = frappe.db.get_value("Account", 
-				{"account_name": args["account_name"], "company": args["company"]})
-		if not account_id:
-			account = frappe.new_doc("Account")
-			account.is_group = 0
-			account.update(args)
-			account.insert()
+		if args["parent_account"]:
+			account_id = frappe.db.get_value("Account", 
+					{"account_name": args["account_name"], "company": args["company"]})
+			if not account_id:
+				account = frappe.new_doc("Account")
+				account.is_group = 0
+				account.update(args)
+				account.insert()
 			
-			account_id = account.name
+				account_id = account.name
 			
-			frappe.db.set_value("Company", args["company"], ("default_receivable_account"
-				if args["account_type"]=="Receivable" else "default_payable_account"), account_id)
+				frappe.db.set_value("Company", args["company"], ("default_receivable_account"
+					if args["account_type"]=="Receivable" else "default_payable_account"), account_id)
 
-		receivable_payable_accounts.setdefault(args["company"], {}).setdefault(args["account_type"], account_id)
+			receivable_payable_accounts.setdefault(args["company"], {}).setdefault(args["account_type"], account_id)
 
 	for company in frappe.db.sql_list("select name from tabCompany"):
 		_create_account({

erpnext/patches/v5_0/rename_pos_setting.py

@@ -0,0 +1,5 @@
+import frappe
+
+def execute():
+	if frappe.db.table_exists("POS Setting"):
+		frappe.rename_doc("DocType", "POS Setting", "POS Profile")

erpnext/patches/v5_0/set_footer_address.py

@@ -0,0 +1,7 @@
+import frappe
+
+def execute():
+	frappe.reload_doctype("System Settings")
+	ss = frappe.get_doc("System Settings", "System Settings")
+	ss.email_footer_address = frappe.db.get_default("company")
+	ss.save()

erpnext/patches/v5_0/update_operation_description.py

@@ -0,0 +1,10 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+import frappe
+import frappe.permissions
+
+def execute():
+	if "opn_description" in frappe.db.get_table_columns("BOM Operation"):
+		frappe.db.sql("""update `tabBOM Operation` set description = opn_description 
+			where ifnull(description, '') = ''""")

erpnext/patches/v5_0/update_projects.py

@@ -10,13 +10,15 @@ def execute():
 	for m in frappe.get_all("Project Milestone", "*"):
 		if (m.milestone and m.milestone_date
 			and frappe.db.exists("Project", m.parent)):
-			frappe.get_doc({
+			task = frappe.get_doc({
 				"doctype": "Task",
 				"subject": m.milestone,
 				"expected_start_date": m.milestone_date,
 				"status": "Open" if m.status=="Pending" else "Closed",
 				"project": m.parent,
-			}).insert(ignore_permissions=True)
+			})
+			task.flags.ignore_mandatory = True
+			task.insert(ignore_permissions=True)
 
 	# remove project milestone
 	frappe.delete_doc("DocType", "Project Milestone")

erpnext/public/images/erpnext-logo-white.svg

@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg2"
-   version="1.1"
-   viewBox="0 0 680 820"
-   preserveAspectRatio="xMidyMid meet"
-   width="100%"
-   height="100%">
-  <defs
-     id="defs4" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     style="display:inline">
-    <rect
-       style="fill:#fff"
-       id="rect3800"
-       width="150"
-       height="150"
-       x="60.000008"
-       y="-472.36218"
-       rx="20"
-       ry="20"
-       transform="scale(1,-1)" />
-  </g>
-  <g
-     id="layer2">
-    <path
-       transform="scale(1,-1)"
-       style="display:inline;fill:#fff"
-       d="m 180,-372.36218 110,0 20,0 0,20 0,110 c 0,11.08 -8.92,20 -20,20 l -110,0 c -11.08,0 -20,-8.92 -20,-20 l 0,-110 c 0,-11.08 8.92,-20 20,-20 z"
-       id="rect3051"/>
-  </g>
-  <g
-     id="layer3">
-    <rect
-       style="display:inline;fill:#fff"
-       id="rect3840"
-       width="150"
-       height="150"
-       x="260"
-       y="-272.36218"
-       rx="20"
-       ry="20"
-       transform="scale(1,-1)" />
-  </g>
-  <g
-     id="layer4">
-    <path
-       id="path3054"
-       d="m 490,372.36218 -110,0 -20,0 0,-20 0,-110 c 0,-11.08 8.92,-20 20,-20 l 110,0 c 11.08,0 20,8.92 20,20 l 0,110 c 0,11.08 -8.92,20 -20,20 z"
-       style="display:inline;fill:#fff" />
-  </g>
-  <g
-     id="layer5">
-    <rect
-       style="display:inline;fill:#fff"
-       id="rect3844"
-       width="150"
-       height="150"
-       x="460"
-       y="-472.36218"
-       rx="20"
-       ry="20"
-       transform="scale(1,-1)" />
-  </g>
-  <g
-     id="layer6">
-    <path
-       style="display:inline;fill:#fff"
-       d="m 490,422.36218 -110,0 -20,0 0,20 0,110 c 0,11.08 8.92,20 20,20 l 110,0 c 11.08,0 20,-8.92 20,-20 l 0,-110 c 0,-11.08 -8.92,-20 -20,-20 z"
-       id="path3058" />
-  </g>
-  <g
-     id="layer7">
-    <rect
-       style="display:inline;fill:#fff"
-       id="rect3848"
-       width="150"
-       height="150"
-       x="260"
-       y="-672.36218"
-       rx="20"
-       ry="20"
-       transform="scale(1,-1)" />
-  </g>
-  <g
-     id="layer8">
-    <path
-       id="path3056"
-       d="m 180,422.36218 110,0 20,0 0,20 0,110 c 0,11.08 -8.92,20 -20,20 l -110,0 c -11.08,0 -20,-8.92 -20,-20 l 0,-110 c 0,-11.08 8.92,-20 20,-20 z"
-       style="display:inline;fill:#fff" />
-  </g>
-</svg>

erpnext/public/js/controllers/transaction.js

@@ -66,18 +66,22 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 
 	apply_default_taxes: function() {
 		var me = this;
-		return frappe.call({
-			method: "erpnext.controllers.accounts_controller.get_default_taxes_and_charges",
-			args: {
-				"master_doctype": frappe.meta.get_docfield(me.frm.doc.doctype, "taxes_and_charges",
-					me.frm.doc.name).options
-			},
-			callback: function(r) {
-				if(!r.exc) {
-					me.frm.set_value("taxes", r.message);
+		var taxes_and_charges_field = frappe.meta.get_docfield(me.frm.doc.doctype, "taxes_and_charges",
+			me.frm.doc.name);
+
+		if(taxes_and_charges_field) {
+			frappe.call({
+				method: "erpnext.controllers.accounts_controller.get_default_taxes_and_charges",
+				args: {
+					"master_doctype": taxes_and_charges_field.options
+				},
+				callback: function(r) {
+					if(!r.exc) {
+						me.frm.set_value("taxes", r.message);
+					}
 				}
-			}
-		});
+			});
+		}
 	},
 
 	setup_sms: function() {
@@ -94,7 +98,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 	},
 
 	hide_currency_and_price_list: function() {
-		if(this.frm.doc.docstatus > 0) {
+		if(this.frm.doc.conversion_rate == 1 && this.frm.doc.docstatus > 0) {
 			hide_field("currency_and_price_list");
 		} else {
 			unhide_field("currency_and_price_list");

erpnext/public/js/feature_setup.js

@@ -117,7 +117,7 @@ erpnext.feature_setup.feature_dict = {
 				'base_total', 'base_net_total', 'base_discount_amount', 'base_total_taxes_and_charges'],
 			'items': ['base_price_list_rate','base_amount','base_rate', 'base_net_rate', 'base_net_amount']
 		},
-		'POS Setting': {'fields':['conversion_rate','currency']},
+		'POS Profile': {'fields':['conversion_rate','currency']},
 		'Quotation': {
 			'fields': ['conversion_rate','currency','base_grand_total','base_in_words','base_rounded_total',
 				'base_total', 'base_net_total', 'base_discount_amount', 'base_total_taxes_and_charges'],

erpnext/public/js/website_utils.js

@@ -15,5 +15,15 @@ frappe.send_message = function(opts, btn) {
 	});
 };
 
+erpnext.subscribe_to_newsletter = function(opts, btn) {
+	return frappe.call({
+		type: "POST",
+		method: "erpnext.crm.doctype.newsletter.newsletter.subscribe",
+		btn: btn,
+		args: {"email": opts.email},
+		callback: opts.callback
+	});
+}
+
 // for backward compatibility
-erpnext.send_message = frappe.send_message;
+erpnext.send_message = frappe.send_message;

erpnext/selling/doctype/customer/test_customer.py

@@ -34,7 +34,9 @@ class TestCustomer(unittest.TestCase):
 
 		make_test_records("Address")
 		make_test_records("Contact")
-
+		frappe.db.set_value("Contact", "_Test Contact For _Test Customer-_Test Customer", 
+			"is_primary_contact", 1)
+		
 		details = get_party_details("_Test Customer")
 
 		for key, value in to_check.iteritems():

erpnext/selling/doctype/quotation/quotation.js

@@ -34,8 +34,7 @@ erpnext.selling.QuotationController = erpnext.selling.SellingController.extend({
 						method: "erpnext.crm.doctype.opportunity.opportunity.make_quotation",
 						source_doctype: "Opportunity",
 						get_query_filters: {
-							docstatus: 1,
-							status: "Submitted",
+							status: ["not in", ["Lost", "Closed"]],
 							enquiry_type: cur_frm.doc.order_type,
 							customer: cur_frm.doc.customer || undefined,
 							lead: cur_frm.doc.lead || undefined,

erpnext/selling/doctype/sms_center/sms_center.json

@@ -36,6 +36,15 @@
    "options": "Supplier", 
    "permlevel": 0
   }, 
+  {
+   "depends_on": "eval:doc.send_to=='All Sales Partner Contact'", 
+   "fieldname": "sales_partner", 
+   "fieldtype": "Link", 
+   "label": "Sales Partner", 
+   "options": "Sales Partner", 
+   "permlevel": 0, 
+   "precision": ""
+  }, 
   {
    "depends_on": "eval:doc.send_to=='All Employee (Active)'", 
    "fieldname": "department", 
@@ -108,7 +117,7 @@
  "idx": 1, 
  "in_create": 0, 
  "issingle": 1, 
- "modified": "2015-02-05 05:11:46.773913", 
+ "modified": "2015-05-25 17:46:37.555503", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "SMS Center", 

erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py

@@ -34,7 +34,7 @@ def get_columns(filters):
 
 def get_entries(filters):
 	date_field = filters["doc_type"] == "Sales Order" and "transaction_date" or "posting_date"
-	conditions, items = get_conditions(filters, date_field)
+	conditions, values = get_conditions(filters, date_field)
 	entries = frappe.db.sql("""select dt.name, dt.customer, dt.territory, dt.%s as posting_date,
 		dt_item.item_code, dt_item.qty, dt_item.base_net_amount, st.sales_person,
 		st.allocated_percentage, dt_item.base_net_amount*st.allocated_percentage/100 as contribution_amt
@@ -42,31 +42,37 @@ def get_entries(filters):
 		where st.parent = dt.name and dt.name = dt_item.parent and st.parenttype = %s
 		and dt.docstatus = 1 %s order by st.sales_person, dt.name desc""" %
 		(date_field, filters["doc_type"], filters["doc_type"], '%s', conditions),
-		tuple([filters["doc_type"]] + items), as_dict=1)
+		tuple([filters["doc_type"]] + values), as_dict=1)
 
 	return entries
 
 def get_conditions(filters, date_field):
-	conditions = ""
-	if filters.get("company"): conditions += " and dt.company = '%s'" % \
-		filters["company"].replace("'", "\'")
-	if filters.get("customer"): conditions += " and dt.customer = '%s'" % \
-		filters["customer"].replace("'", "\'")
-	if filters.get("territory"): conditions += " and dt.territory = '%s'" % \
-		filters["territory"].replace("'", "\'")
-
-	if filters.get("from_date"): conditions += " and dt.%s >= '%s'" % \
-		(date_field, filters["from_date"])
-	if filters.get("to_date"): conditions += " and dt.%s <= '%s'" % (date_field, filters["to_date"])
-
-	if filters.get("sales_person"): conditions += " and st.sales_person = '%s'" % \
-	 	filters["sales_person"].replace("'", "\'")
+	conditions = [""]
+	values = []
+	
+	for field in ["company", "customer", "territory"]:
+		if filters.get(field):
+			conditions.append("dt.{0}=%s".format(field))
+			values.append(filters[field])
+			
+	if filters.get("sales_person"):
+		conditions.append("st.sales_person=%s")
+		values.append(filters["sales_person"])
+		
+	if filters.get("from_date"):
+		conditions.append("dt.{0}>=%s".format(date_field))
+		values.append(filters["from_date"])
+		
+	if filters.get("to_date"):
+		conditions.append("dt.{0}<=%s".format(date_field))
+		values.append(filters["to_date"])
 
 	items = get_items(filters)
 	if items:
-		conditions += " and dt_item.item_code in (%s)" % ', '.join(['%s']*len(items))
+		conditions.append("dt_item.item_code in (%s)" % ', '.join(['%s']*len(items)))
+		values += items
 
-	return conditions, items
+	return " and ".join(conditions), values
 
 def get_items(filters):
 	if filters.get("item_group"): key = "item_group"

erpnext/setup/doctype/company/company.js

@@ -11,31 +11,37 @@ frappe.ui.form.on("Company", {
 		erpnext.company.set_chart_of_accounts_options(frm.doc);
 	},
 	delete_company_transactions: function(frm) {
-		var d = frappe.prompt({
-			fieldtype:"Data",
-			fieldname: "company_name",
-			label: __("Please re-type company name to confirm"),
-			reqd: 1,
-			description: __("Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.")},
-				function(data) {
-					if(data.company_name !== frm.doc.name) {
-						frappe.msgprint("Company name not same");
-						return;
-					}
-					frappe.call({
-						method: "erpnext.setup.doctype.company.delete_company_transactions.delete_company_transactions",
-						args: {
-							company_name: data.company_name
-						},
-						freeze: true,
-						callback: function(r, rt) {
-							if(!r.exc) 
-								frappe.msgprint(__("Successfully deleted all transactions related to this company!"));
+		frappe.verify_password(function() {
+			var d = frappe.prompt({
+				fieldtype:"Data",
+				fieldname: "company_name",
+				label: __("Please re-type company name to confirm"),
+				reqd: 1,
+				description: __("Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.")},
+					function(data) {
+						if(data.company_name !== frm.doc.name) {
+							frappe.msgprint("Company name not same");
+							return;
 						}
-					});
-				}, __("Delete all the Transactions for this Company"), __("Delete"));
-
-			d.get_primary_btn().addClass("btn-danger");
+						frappe.call({
+							method: "erpnext.setup.doctype.company.delete_company_transactions.delete_company_transactions",
+							args: {
+								company_name: data.company_name
+							},
+							freeze: true,
+							callback: function(r, rt) {
+								if(!r.exc)
+									frappe.msgprint(__("Successfully deleted all transactions related to this company!"));
+							},
+							onerror: function() {
+								frappe.msgprint(__("Wrong Password"));
+							}
+						});
+					}, __("Delete all the Transactions for this Company"), __("Delete")
+				);
+				d.get_primary_btn().addClass("btn-danger");
+			}
+		);
 	}
 });
 

erpnext/setup/doctype/company/company.py

@@ -27,8 +27,12 @@ class Company(Document):
 		return exists
 
 	def validate(self):
+		self.abbr = self.abbr.strip()
 		if self.get('__islocal') and len(self.abbr) > 5:
 			frappe.throw(_("Abbreviation cannot have more than 5 characters"))
+			
+		if not self.abbr.strip():
+			frappe.throw(_("Abbr can not be blank or space"))
 
 		self.previous_default_currency = frappe.db.get_value("Company", self.name, "default_currency")
 		if self.default_currency and self.previous_default_currency and \
@@ -174,6 +178,10 @@ class Company(Document):
 		"""
 			Trash accounts and cost centers for this company if no gl entry exists
 		"""
+		accounts = frappe.db.sql_list("select name from tabAccount where company=%s", self.name)
+		cost_centers = frappe.db.sql_list("select name from `tabCost Center` where company=%s", self.name)
+		warehouses = frappe.db.sql_list("select name from tabWarehouse where company=%s", self.name)
+		
 		rec = frappe.db.sql("SELECT name from `tabGL Entry` where company = %s", self.name)
 		if not rec:
 			# delete Account
@@ -192,23 +200,43 @@ class Company(Document):
 			frappe.db.sql("""delete from `tabWarehouse` where company=%s""", self.name)
 
 		frappe.defaults.clear_default("company", value=self.name)
+		
+		# clear default accounts, warehouses from item
+		for f in ["default_warehouse", "website_warehouse"]:
+			frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)""" 
+				% (f, f, ', '.join(['%s']*len(warehouses))), tuple(warehouses))
+				
+		frappe.db.sql("""delete from `tabItem Reorder` where warehouse in (%s)""" 
+			% ', '.join(['%s']*len(warehouses)), tuple(warehouses))
+				
+		for f in ["income_account", "expense_account"]:
+			frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)""" 
+				% (f, f, ', '.join(['%s']*len(accounts))), tuple(accounts))
+				
+		for f in ["selling_cost_center", "buying_cost_center"]:
+			frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)""" 
+				% (f, f, ', '.join(['%s']*len(cost_centers))), tuple(cost_centers))
 
+		# reset default company
 		frappe.db.sql("""update `tabSingles` set value=""
 			where doctype='Global Defaults' and field='default_company'
 			and value=%s""", self.name)
 
 @frappe.whitelist()
 def replace_abbr(company, old, new):
+	new = new.strip()
+	if not new:
+		frappe.throw(_("Abbr can not be blank or space"))
+		
 	frappe.only_for("System Manager")
 
 	frappe.db.set_value("Company", company, "abbr", new)
 
 	def _rename_record(dt):
 		for d in frappe.db.sql("select name from `tab%s` where company=%s" % (dt, '%s'), company):
-			parts = d[0].split(" - ")
-			if parts[-1].lower() == old.lower():
-				name_without_abbr = " - ".join(parts[:-1])
-				frappe.rename_doc(dt, d[0], name_without_abbr + " - " + new)
+			parts = d[0].rsplit(" - ", 1)
+			if len(parts) == 1 or parts[1].lower() == old.lower():
+				frappe.rename_doc(dt, d[0], parts[0] + " - " + new)
 
 	for dt in ["Account", "Cost Center", "Warehouse"]:
 		_rename_record(dt)

erpnext/setup/doctype/naming_series/naming_series.py

@@ -21,6 +21,7 @@ class NamingSeries(Document):
 
 		prefixes = ""
 		for d in doctypes:
+			options = ""
 			try:
 				options = self.get_options(d)
 			except frappe.DoesNotExistError:

erpnext/setup/doctype/sales_person/sales_person.py

@@ -29,5 +29,7 @@ class SalesPerson(NestedSet):
 				return frappe.db.get_value("User", user, "email") or user
 
 	def validate_employee_id(self):
-		if frappe.db.exists({"doctype": "Sales Person","employee": self.employee}):
-			frappe.throw("Another sales person with the same employee id exists.", frappe.DuplicateEntryError)
+		sales_person = frappe.db.get_value("Sales Person", {"employee": self.employee})
+		
+		if sales_person and sales_person != self.name:
+			frappe.throw(_("Another Sales Person {0} exists with the same Employee id").format(sales_person))

erpnext/setup/page/setup_wizard/setup_wizard.py

@@ -28,7 +28,7 @@ def setup_account(args=None):
 
 		args = frappe._dict(args)
 
-		if args.language != "english":
+		if args.language and args.language != "english":
 			set_default_language(args.language)
 
 		install_fixtures.install(args.get("country"))
@@ -197,6 +197,7 @@ def set_defaults(args):
 		"language": args.get("language"),
 		"time_zone": args.get("timezone"),
 		"float_precision": 3,
+		"email_footer_address": args.get("company"),
 		'date_format': frappe.db.get_value("Country", args.get("country"), "date_format"),
 		'number_format': number_format,
 		'enable_scheduler': 1 if not frappe.flags.in_test else 0

erpnext/stock/doctype/delivery_note/delivery_note.py

@@ -110,7 +110,8 @@ class DeliveryNote(SellingController):
 	def validate_with_previous_doc(self):
 		items = self.get("items")
 
-		for fn in (("Sales Order", "against_sales_order"), ("Sales Invoice", "against_sales_invoice")):
+		for fn in (("Sales Order", "against_sales_order", "so_detail"), 
+				("Sales Invoice", "against_sales_invoice", "si_detail")):
 			if filter(None, [getattr(d, fn[1], None) for d in items]):
 				super(DeliveryNote, self).validate_with_previous_doc({
 					fn[0]: {
@@ -123,7 +124,7 @@ class DeliveryNote(SellingController):
 				if cint(frappe.defaults.get_global_default('maintain_same_sales_rate')):
 					super(DeliveryNote, self).validate_with_previous_doc({
 						fn[0] + " Item": {
-							"ref_dn_field": "so_detail",
+							"ref_dn_field": fn[2],
 							"compare_fields": [["rate", "="]],
 							"is_child_table": True
 						}

erpnext/stock/doctype/delivery_note/test_delivery_note.py

@@ -7,7 +7,7 @@ import unittest
 import frappe
 import json
 import frappe.defaults
-from frappe.utils import cint, nowdate, nowtime, cstr, add_days
+from frappe.utils import cint, nowdate, nowtime, cstr, add_days, flt
 from erpnext.stock.stock_ledger import get_previous_sle
 from erpnext.accounts.utils import get_balance_on
 from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt \
@@ -136,7 +136,7 @@ class TestDeliveryNote(unittest.TestCase):
 
 		# check stock in hand balance
 		bal = get_balance_on(stock_in_hand_account)
-		self.assertEquals(bal, prev_bal - stock_value_diff)
+		self.assertEquals(flt(bal, 2), flt(prev_bal - stock_value_diff, 2))
 
 		dn.cancel()
 		self.assertFalse(get_gl_entries("Delivery Note", dn.name))

erpnext/stock/doctype/item/item.json

@@ -575,6 +575,7 @@
    "description": "Publish Item to hub.erpnext.com", 
    "fieldname": "publish_in_hub", 
    "fieldtype": "Check", 
+   "hidden": 1, 
    "label": "Publish in Hub", 
    "permlevel": 0, 
    "precision": ""
@@ -878,7 +879,7 @@
  "icon": "icon-tag", 
  "idx": 1, 
  "max_attachments": 1, 
- "modified": "2015-05-04 18:44:46.090445", 
+ "modified": "2015-05-22 02:16:57.435105", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item", 

erpnext/stock/doctype/item/item.py

@@ -154,13 +154,19 @@ class Item(WebsiteGenerator):
 			if self.variant_of:
 				frappe.throw(_("Item cannot be a variant of a variant"))
 	
-			variants = []
+			variants, attributes = [], {}
 			for d in self.variants:
 				key = (d.item_attribute, d.item_attribute_value)
 				if key in variants:
 					frappe.throw(_("{0} {1} is entered more than once in Item Variants table")
 						.format(d.item_attribute, d.item_attribute_value), DuplicateVariant)
 				variants.append(key)
+
+				attributes.setdefault(d.item_attribute, [t.attribute_value for t in frappe.db.get_all("Item Attribute Value",
+					fields=["attribute_value"],	filters={"parent": d.item_attribute })])
+				
+				if d.item_attribute_value not in attributes.get(d.item_attribute):
+					frappe.throw(_("Attribute value {0} does not exist in Item Attribute Master.").format(d.item_attribute_value))
 		else:
 			frappe.throw(_("Please enter atleast one attribute row in Item Variants table"))
 

erpnext/stock/doctype/item/test_item.py

@@ -34,6 +34,8 @@ class TestItem(unittest.TestCase):
 		se = make_stock_entry(item_code=item.name, target="Stores - _TC", qty=1, incoming_rate=1)
 
 		item.has_variants = 1
+		item.append("variants", {"item_attribute": "Test Size", "item_attribute_value": "Small"})
+		
 		self.assertRaises(ItemTemplateCannotHaveStock, item.save)
 
 	def test_variant_item_codes(self):

erpnext/stock/doctype/item_price/item_price.js

@@ -1,15 +1,18 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-$.extend(cur_frm.cscript, {
-	onload: function () {
+frappe.ui.form.on("Item Price", {
+	onload: function (frm) {
 		// Fetch price list details
-		cur_frm.add_fetch("price_list", "buying", "buying");
-		cur_frm.add_fetch("price_list", "selling", "selling");
-		cur_frm.add_fetch("price_list", "currency", "currency");
+		frm.add_fetch("price_list", "buying", "buying");
+		frm.add_fetch("price_list", "selling", "selling");
+		frm.add_fetch("price_list", "currency", "currency");
 
 		// Fetch item details
-		cur_frm.add_fetch("item_code", "item_name", "item_name");
-		cur_frm.add_fetch("item_code", "description", "item_description");
+		frm.add_fetch("item_code", "item_name", "item_name");
+		frm.add_fetch("item_code", "description", "item_description");
+
+		frm.set_df_property("bulk_import_help", "options",
+			'<a href="#data-import-tool/Item Price">' + __("Import in Bulk") + '</a>');
 	}
-});
+});

erpnext/stock/doctype/item_price/item_price.json

@@ -100,13 +100,26 @@
    "label": "Item Description", 
    "permlevel": 0, 
    "read_only": 1
+  }, 
+  {
+   "fieldname": "section_break_12", 
+   "fieldtype": "Section Break", 
+   "permlevel": 0, 
+   "precision": ""
+  }, 
+  {
+   "fieldname": "bulk_import_help", 
+   "fieldtype": "HTML", 
+   "label": "Bulk Import Help", 
+   "permlevel": 0, 
+   "precision": ""
   }
  ], 
  "icon": "icon-flag", 
  "idx": 1, 
  "in_create": 0, 
  "istable": 0, 
- "modified": "2015-03-03 01:05:09.876025", 
+ "modified": "2015-05-26 03:15:02.324161", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Price", 

erpnext/stock/doctype/stock_entry/stock_entry.js

@@ -43,7 +43,7 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
 				return erpnext.queries.item({is_stock_item: "Yes"});
 			}
 		};
-		
+
 		this.frm.set_query("purchase_order", function() {
 			return {
 				"filters": {
@@ -68,8 +68,13 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
 	},
 
 	onload_post_render: function() {
+		var me = this;
 		cur_frm.get_field("items").grid.set_multiple_add("item_code", "qty");
-		this.set_default_account();
+		this.set_default_account(function() {
+			if(me.frm.doc.__islocal && me.frm.doc.company && !me.frm.doc.amended_from) {
+				cur_frm.script_manager.trigger("company");
+			}
+		});
 	},
 
 	refresh: function() {
@@ -102,7 +107,7 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
 		this.clean_up();
 	},
 
-	set_default_account: function() {
+	set_default_account: function(callback) {
 		var me = this;
 
 		if(cint(frappe.defaults.get_default("auto_accounting_for_stock")) && this.frm.doc.company) {
@@ -122,6 +127,7 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
 						$.each(me.frm.doc.items || [], function(i, d) {
 							if(!d.expense_account) d.expense_account = r.message;
 						});
+						if(callback) callback();
 					}
 				}
 			});
@@ -439,10 +445,11 @@ cur_frm.cscript.item_code = function(doc, cdt, cdn) {
 			args: args,
 			callback: function(r) {
 				if(r.message) {
+					var d = locals[cdt][cdn];
 					$.each(r.message, function(k, v) {
-						frappe.model.set_value(cdt, cdn, k, v);
+						d[k] = v;
 					});
-				refresh_field('image_view', d.name, 'items');
+					refresh_field("items");
 				}
 			}
 		});
@@ -521,7 +528,14 @@ cur_frm.fields_dict.supplier.get_query = function(doc, cdt, cdn) {
 }
 
 cur_frm.cscript.company = function(doc, cdt, cdn) {
-	erpnext.get_fiscal_year(doc.company, doc.posting_date);
+	if(doc.company) {
+		erpnext.get_fiscal_year(doc.company, doc.posting_date, function() {
+			var company_doc = frappe.get_doc(":Company", doc.company);
+			if(company_doc.default_letter_head) {
+				cur_frm.set_value("letter_head", company_doc.default_letter_head);
+			}
+		});
+	}
 }
 
 cur_frm.cscript.posting_date = function(doc, cdt, cdn){

erpnext/stock/doctype/stock_entry/stock_entry.json

@@ -632,6 +632,14 @@
    "reqd": 0, 
    "search_index": 0
   }, 
+  {
+   "fieldname": "letter_head", 
+   "fieldtype": "Link", 
+   "label": "Letter Head", 
+   "options": "Letter Head", 
+   "permlevel": 0, 
+   "precision": ""
+  }, 
   {
    "allow_on_submit": 0, 
    "fieldname": "amended_from", 
@@ -670,7 +678,7 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "max_attachments": 0, 
- "modified": "2015-03-03 18:09:12.035606", 
+ "modified": "2015-05-20 07:58:59.025553", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Entry", 

erpnext/stock/doctype/stock_entry/test_stock_entry.py

@@ -81,17 +81,21 @@ class TestStockEntry(unittest.TestCase):
 			template = frappe.get_doc("Item", item.variant_of)
 		else:
 			template = item
+			
+		projected_qty, actual_qty = frappe.db.get_value("Bin", {"item_code": item_code,
+			"warehouse": "_Test Warehouse - _TC"}, ["projected_qty", "actual_qty"]) or [0, 0]
 
 		# stock entry reqd for auto-reorder
 		create_stock_reconciliation(item_code=item_code, warehouse="_Test Warehouse - _TC",
-			qty=10, rate=100)
-
-		frappe.db.set_value("Stock Settings", None, "auto_indent", 1)
+			qty = actual_qty + abs(projected_qty) + 10, rate=100)
+			
 		projected_qty = frappe.db.get_value("Bin", {"item_code": item_code,
 			"warehouse": "_Test Warehouse - _TC"}, "projected_qty") or 0
-
+		
+		frappe.db.set_value("Stock Settings", None, "auto_indent", 1)
+		
 		# update re-level qty so that it is more than projected_qty
-		if projected_qty > template.reorder_levels[0].warehouse_reorder_level:
+		if projected_qty >= template.reorder_levels[0].warehouse_reorder_level:
 			template.reorder_levels[0].warehouse_reorder_level += projected_qty
 			template.save()
 

erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py

@@ -14,6 +14,7 @@ class StockFreezeError(frappe.ValidationError): pass
 
 class StockLedgerEntry(Document):
 	def validate(self):
+		self.flags.ignore_submit_comment = True
 		from erpnext.stock.utils import validate_warehouse_company
 		self.validate_mandatory()
 		self.validate_item()

erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py

@@ -227,7 +227,7 @@ class StockReconciliation(StockController):
 			msgprint(_("Please enter Expense Account"), raise_exception=1)
 		elif not frappe.db.sql("""select name from `tabStock Ledger Entry` limit 1"""):
 			if frappe.db.get_value("Account", self.expense_account, "report_type") == "Profit and Loss":
-				frappe.throw(_("Difference Account must be a 'Liability' type account, since this Stock Reconciliation is an Opening Entry"), OpeningEntryAccountError)
+				frappe.throw(_("Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry"), OpeningEntryAccountError)
 
 	def get_items_for(self, warehouse):
 		self.items = []

erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py

@@ -97,7 +97,8 @@ def create_stock_reconciliation(**args):
 	sr.posting_time = args.posting_time or nowtime()
 	sr.company = args.company or "_Test Company"
 	sr.fiscal_year = get_fiscal_year(sr.posting_date)[0]
-	sr.expense_account = args.expense_account or "Stock Adjustment - _TC"
+	sr.expense_account = args.expense_account or \
+		("Stock Adjustment - _TC" if frappe.get_all("Stock Ledger Entry") else "Temporary Opening - _TC")
 	sr.cost_center = args.cost_center or "_Test Cost Center - _TC"
 	sr.append("items", {
 		"item_code": args.item_code or "_Test Item",

erpnext/stock/get_item_details.py

@@ -51,7 +51,7 @@ def get_item_details(args):
 	get_price_list_rate(args, item_doc, out)
 
 	if args.transaction_type == "selling" and cint(args.is_pos):
-		out.update(get_pos_settings_item_details(args.company, args))
+		out.update(get_pos_profiles_item_details(args.company, args))
 
 	# update args with out, if key or value not exists
 	for key, value in out.iteritems():
@@ -267,16 +267,16 @@ def get_party_item_code(args, item_doc, out):
 		item_supplier = item_doc.get("supplier_items", {"supplier": args.supplier})
 		out.supplier_part_no = item_supplier[0].supplier_part_no if item_supplier else None
 
-def get_pos_settings_item_details(company, args, pos_settings=None):
+def get_pos_profiles_item_details(company, args, pos_profiles=None):
 	res = frappe._dict()
 
-	if not pos_settings:
-		pos_settings = get_pos_settings(company)
+	if not pos_profiles:
+		pos_profiles = get_pos_profiles(company)
 
-	if pos_settings:
+	if pos_profiles:
 		for fieldname in ("income_account", "cost_center", "warehouse", "expense_account"):
-			if not args.get(fieldname) and pos_settings.get(fieldname):
-				res[fieldname] = pos_settings.get(fieldname)
+			if not args.get(fieldname) and pos_profiles.get(fieldname):
+				res[fieldname] = pos_profiles.get(fieldname)
 
 		if res.get("warehouse"):
 			res.actual_qty = get_available_qty(args.item_code,
@@ -284,15 +284,15 @@ def get_pos_settings_item_details(company, args, pos_settings=None):
 
 	return res
 
-def get_pos_settings(company):
-	pos_settings = frappe.db.sql("""select * from `tabPOS Setting` where user = %s
+def get_pos_profiles(company):
+	pos_profiles = frappe.db.sql("""select * from `tabPOS Profile` where user = %s
 		and company = %s""", (frappe.session['user'], company), as_dict=1)
 
-	if not pos_settings:
-		pos_settings = frappe.db.sql("""select * from `tabPOS Setting`
+	if not pos_profiles:
+		pos_profiles = frappe.db.sql("""select * from `tabPOS Profile`
 			where ifnull(user,'') = '' and company = %s""", company, as_dict=1)
 
-	return pos_settings and pos_settings[0] or None
+	return pos_profiles and pos_profiles[0] or None
 
 
 def get_serial_nos_by_fifo(args, item_doc):

erpnext/stock/reorder_item.py

@@ -11,10 +11,7 @@ def reorder_item():
 	if not frappe.db.sql("select name from `tabFiscal Year` limit 1"):
 		return
 
-	if getattr(frappe.local, "auto_indent", None) is None:
-		frappe.local.auto_indent = cint(frappe.db.get_value('Stock Settings', None, 'auto_indent'))
-
-	if frappe.local.auto_indent:
+	if cint(frappe.db.get_value('Stock Settings', None, 'auto_indent')):
 		return _reorder_item()
 
 def _reorder_item():

erpnext/stock/report/stock_balance/stock_balance.json

@@ -1,12 +1,12 @@
 {
- "add_total_row": 0, 
+ "add_total_row": 1, 
  "apply_user_permissions": 1, 
  "creation": "2014-10-10 17:58:11.577901", 
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
  "is_standard": "Yes", 
- "modified": "2014-10-10 17:58:11.577901", 
+ "modified": "2015-05-22 02:16:24.614986", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Balance", 

erpnext/support/doctype/issue/issue.json

@@ -69,7 +69,18 @@
    "reqd": 1
   }, 
   {
-   "depends_on": "eval:doc.__islocal", 
+   "fieldname": "fold", 
+   "fieldtype": "Fold", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "section_break_7", 
+   "fieldtype": "Section Break", 
+   "permlevel": 0, 
+   "precision": ""
+  }, 
+  {
+   "depends_on": "", 
    "fieldname": "description", 
    "fieldtype": "Text", 
    "label": "Description", 
@@ -79,27 +90,38 @@
    "reqd": 0
   }, 
   {
-   "fieldname": "fold", 
-   "fieldtype": "Fold", 
+   "fieldname": "column_break_9", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
+   "precision": ""
+  }, 
+  {
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "resolution_date", 
+   "fieldtype": "Datetime", 
+   "in_filter": 0, 
+   "label": "Resolution Date", 
+   "no_copy": 1, 
+   "oldfieldname": "resolution_date", 
+   "oldfieldtype": "Date", 
+   "permlevel": 0, 
+   "read_only": 1, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "first_responded_on", 
+   "fieldtype": "Datetime", 
+   "label": "First Responded On", 
    "permlevel": 0
   }, 
   {
    "fieldname": "additional_info", 
    "fieldtype": "Section Break", 
-   "label": "Reference", 
+   "label": "", 
    "options": "icon-pushpin", 
    "permlevel": 0, 
    "read_only": 1
   }, 
-  {
-   "depends_on": "eval:!doc.__islocal", 
-   "fieldname": "column_break0", 
-   "fieldtype": "Column Break", 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "read_only": 1, 
-   "width": "50%"
-  }, 
   {
    "fieldname": "lead", 
    "fieldtype": "Link", 
@@ -114,6 +136,12 @@
    "options": "Contact", 
    "permlevel": 0
   }, 
+  {
+   "fieldname": "column_break_16", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
+   "precision": ""
+  }, 
   {
    "fieldname": "customer", 
    "fieldtype": "Link", 
@@ -140,6 +168,31 @@
    "reqd": 0, 
    "search_index": 0
   }, 
+  {
+   "fieldname": "section_break_19", 
+   "fieldtype": "Section Break", 
+   "permlevel": 0, 
+   "precision": ""
+  }, 
+  {
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "resolution_details", 
+   "fieldtype": "Small Text", 
+   "label": "Resolution Details", 
+   "no_copy": 1, 
+   "oldfieldname": "resolution_details", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
+  {
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
   {
    "default": "Today", 
    "fieldname": "opening_date", 
@@ -170,44 +223,6 @@
    "print_hide": 1, 
    "reqd": 0
   }, 
-  {
-   "depends_on": "eval:!doc.__islocal", 
-   "fieldname": "column_break1", 
-   "fieldtype": "Column Break", 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "read_only": 1
-  }, 
-  {
-   "fieldname": "first_responded_on", 
-   "fieldtype": "Datetime", 
-   "label": "First Responded On", 
-   "permlevel": 0
-  }, 
-  {
-   "depends_on": "eval:!doc.__islocal", 
-   "fieldname": "resolution_date", 
-   "fieldtype": "Datetime", 
-   "in_filter": 0, 
-   "label": "Resolution Date", 
-   "no_copy": 1, 
-   "oldfieldname": "resolution_date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
-   "read_only": 1, 
-   "search_index": 0
-  }, 
-  {
-   "depends_on": "eval:!doc.__islocal", 
-   "fieldname": "resolution_details", 
-   "fieldtype": "Small Text", 
-   "label": "Resolution Details", 
-   "no_copy": 1, 
-   "oldfieldname": "resolution_details", 
-   "oldfieldtype": "Text", 
-   "permlevel": 0, 
-   "read_only": 0
-  }, 
   {
    "fieldname": "content_type", 
    "fieldtype": "Data", 
@@ -218,7 +233,7 @@
  ], 
  "icon": "icon-ticket", 
  "idx": 1, 
- "modified": "2015-04-02 22:06:02.684820", 
+ "modified": "2015-05-20 07:16:53.673114", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Issue", 

erpnext/templates/includes/footer/footer_extension.html

@@ -0,0 +1,42 @@
+{% if not hide_footer_signup %}
+<div class="container">
+	<div class="row">
+		<div class="col-sm-6 col-sm-offset-3 text-center" style="margin-top: 15px;">
+				<input class="form-control" type="text" id="footer-subscribe-email"
+                    style="display: inline-block; max-width: 50%; margin-right: 10px;"
+					placeholder="{{ _('Your email address') }}...">
+				<button class="btn btn-default btn-sm" type="button"
+					id="footer-subscribe-button">{{ _("Get Updates") }}</button>
+		</div>
+	</div>
+    <div class="text-center text-muted small" style="padding: 30px;">
+        <a href="https://erpnext.com?source=website_footer" target="_blank" class="text-extra-muted">
+            Powered by ERPNext</a>
+    </div>
+</div>
+<script>
+	$("#footer-subscribe-button").click(function() {
+
+		if($("#footer-subscribe-email").val()) {
+			$("#footer-subscribe-email").attr('disabled', true);
+			$("#footer-subscribe-button").html("Sending...")
+				.attr("disabled", true);
+			erpnext.subscribe_to_newsletter({
+				email: $("#footer-subscribe-email").val(),
+				callback: function(r) {
+					if(!r.exc) {
+						$("#footer-subscribe-button").html(__("Added"))
+							.attr("disabled", true);
+					} else {
+						$("#footer-subscribe-button").html(__("Error: Not a valid id?"))
+							.addClass("btn-danger").attr("disabled", false);
+						$("#footer-subscribe-email").val("").attr('disabled', false);
+					}
+				}
+			});
+		}
+		else
+			frappe.msgprint(frappe._("Please enter email address"))
+	});
+</script>
+{% endif %}

erpnext/templates/includes/footer/footer_powered.html

@@ -0,0 +1 @@
+<!-- blank -->

erpnext/templates/includes/footer_extension.html

@@ -1,41 +0,0 @@
-<div class="container">
-	<div class="row">
-		<div class="col-sm-6 col-sm-offset-3" style="margin-top: 7px;">
-			<div class="input-group">
-				<input class="form-control" type="text" id="footer-subscribe-email"
-					placeholder="{{ _('Your email address') }}...">
-				<span class="input-group-btn">
-					<button class="btn btn-default" type="button"
-						id="footer-subscribe-button">{{ _("Stay Updated") }}</button>
-				</span>
-			</div>
-		</div>
-	</div>
-</div>
-<script>
-	$("#footer-subscribe-button").click(function() {
-
-		if($("#footer-subscribe-email").val()) {
-			$("#footer-subscribe-email").attr('disabled', true);
-			$("#footer-subscribe-button").html("Sending...")
-				.attr("disabled", true);
-			erpnext.send_message({
-				subject:"Subscribe me",
-				sender: $("#footer-subscribe-email").val(),
-				message: "Subscribe to newsletter (via website footer).",
-				callback: function(r) {
-					if(!r.exc) {
-						$("#footer-subscribe-button").html("Thank You :)")
-							.addClass("btn-success").attr("disabled", true);
-					} else {
-						$("#footer-subscribe-button").html("Error :( Not a valid id?")
-							.addClass("btn-danger").attr("disabled", false);
-						$("#footer-subscribe-email").val("").attr('disabled', false);
-					}
-				}
-			});
-		}
-		else
-			frappe.msgprint(frappe._("Please enter email address"))
-	});
-</script>

erpnext/templates/includes/footer_powered.html

@@ -1 +0,0 @@
-<a href="http://erpnext.com" style="color: #aaa; font-size: 11px;">ERPNext Powered</a>

erpnext/templates/print_formats/includes/item_table_description.html

@@ -4,11 +4,12 @@
 </div>
 {%- endif %}
 <div>
-    {% if doc.in_format_data("item_code") -%}
+    {% if doc.in_format_data("item_code") and not doc.is_print_hide("item_code") -%}
     	<div class="primary">{{ doc.item_code }}</div>
     {%- endif %}
     {% if (doc.in_format_data("item_name") and
-    	(not doc.in_format_data("item_code") or doc.item_code != doc.item_name)) -%}
+    	(not doc.in_format_data("item_code") or doc.is_print_hide("item_code") 
+			or doc.item_code != doc.item_name)) -%}
     	<div class="primary">{{ doc.get_formatted("item_name") }}</div>
     {%- endif %}
     {% if (doc.in_format_data("description") and doc.description and

erpnext/utilities/transaction_base.py

@@ -51,7 +51,8 @@ class TransactionBase(StatusUpdater):
 			event.insert(ignore_permissions=True)
 
 			if frappe.db.exists("User", self.contact_by):
-				frappe.share.add("Event", event.name, self.contact_by)
+				frappe.share.add("Event", event.name, self.contact_by, 
+					flags={"ignore_share_permission": True})
 
 	def validate_uom_is_integer(self, uom_field, qty_fields):
 		validate_uom_is_integer(self, uom_field, qty_fields)

setup.py

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