Merge branch 'develop'

bumped to version 5.0.9
Merge pull request #3322 from nabinhait/test_case
2015-05-25 16:32:12 +05:30 · 2015-05-25 17:02:12 +06:00 · 2015-05-25 16:19:03 +05:30 · 2015-05-25 16:16:20 +05:30 · 2015-05-25 16:15:39 +05:30 · 2015-05-25 15:27:40 +05:30
78 changed files with 1754 additions and 1679 deletions
--- a/erpnext/version.py
+++ b/erpnext/version.py
@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = 'v5.0.0'
+__version__ = '5.0.9'
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.py
+++ b/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()
--- a/erpnext/accounts/doctype/pos_profile/init.py
+++ b/erpnext/accounts/doctype/pos_profile/init.py
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.js
+++ b/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);
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.json
+++ b/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"
+}
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.py
+++ b/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:
--- a/erpnext/accounts/doctype/pos_profile/test_pos_profile.py
+++ b/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
--- a/erpnext/accounts/doctype/pos_setting/README.md
+++ b/erpnext/accounts/doctype/pos_setting/README.md
@@ -1 +0,0 @@
-Standard settings for Point of Sales (POS) type of Sales Invoice.
--- a/erpnext/accounts/doctype/pos_setting/init.py
+++ b/erpnext/accounts/doctype/pos_setting/init.py
@@ -1 +0,0 @@
-from __future__ import unicode_literals
--- a/erpnext/accounts/doctype/pos_setting/pos_setting.json
+++ b/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"
-}
--- a/erpnext/accounts/doctype/pos_setting/test_records.json
+++ b/erpnext/accounts/doctype/pos_setting/test_records.json
@@ -1 +0,0 @@
-[]
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/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", 
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -699,7 +699,7 @@
   "depends_on": "grand_total", 
   "fieldname": "column_break4", 
   "fieldtype": "Section Break", 
-   "label": "Write Off",
+   "label": "", 
   "permlevel": 0, 
   "read_only": 0, 
   "width": "50%"
@@ -759,7 +759,7 @@
  {
   "fieldname": "terms_section_break", 
   "fieldtype": "Section Break", 
-   "label": "Terms and Conditions",
+   "label": "", 
   "oldfieldtype": "Section Break", 
   "options": "icon-legal", 
   "permlevel": 0, 
@@ -790,7 +790,7 @@
   "fieldname": "contact_section", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
-   "label": "Contact Info",
+   "label": "", 
   "options": "icon-bullhorn", 
   "permlevel": 0, 
   "read_only": 0
@@ -848,7 +848,7 @@
  {
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
-   "label": "More Info",
+   "label": "", 
   "oldfieldtype": "Section Break", 
   "options": "icon-file-text", 
   "permlevel": 0, 
@@ -1016,7 +1016,7 @@
  {
   "fieldname": "sales_team_section_break", 
   "fieldtype": "Section Break", 
-   "label": "Sales Team",
+   "label": "", 
   "oldfieldtype": "Section Break", 
   "options": "icon-group", 
   "permlevel": 0, 
@@ -1243,7 +1243,7 @@
 "icon": "icon-file-text", 
 "idx": 1, 
 "is_submittable": 1, 
- "modified": "2015-04-27 20:31:51.966965",
+ "modified": "2015-05-21 05:34:21.539823", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Sales Invoice", 
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/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:
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/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()
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -71,12 +71,11 @@ def save_entries(gl_map, adv_adj, update_outstanding):
 		# check against budget
 		validate_expense_against_budget(entry)

-
 		# update total debit / credit
 		total_debit += flt(entry.debit)
 		total_credit += flt(entry.credit)

-	validate_total_debit_credit(total_debit, total_credit)
+	validate_total_debit_credit(total_debit, total_credit, gl_map)

 def make_entry(args, adv_adj, update_outstanding):
 	args.update({"doctype": "GL Entry"})
@@ -86,9 +85,9 @@ def make_entry(args, adv_adj, update_outstanding):
 	gle.run_method("on_update_with_args", adv_adj, update_outstanding)
 	gle.submit()

-def validate_total_debit_credit(total_debit, total_credit):
+def validate_total_debit_credit(total_debit, total_credit, gl_map):
 	if abs(total_debit - total_credit) > 0.005:
-		frappe.throw(_("Debit and Credit not equal for this voucher. Difference is {0}.").format(total_debit - total_credit))
+		frappe.throw(_("Debit and Credit not equal for {0} #{1}. Difference is {2}.").format(gl_map[0].voucher_type, gl_map[0].voucher_no, total_debit - total_credit))

 def validate_account_for_auto_accounting_for_stock(gl_map):
 	if gl_map[0].voucher_type=="Journal Entry":
--- a/erpnext/accounts/page/pos/pos.js
+++ b/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');
--- a/erpnext/accounts/report/balance_sheet/balance_sheet.py
+++ b/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
 		}
--- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
+++ b/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), "", "", "", ""]
--- a/erpnext/accounts/report/financial_statements.py
+++ b/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:
@@ -224,20 +224,6 @@ def sort_root_accounts(roots):

 	roots.sort(compare_roots)

-def sort_root_accounts(roots):
-	"""Sort root types as Asset, Liability, Equity, Income, Expense"""
-
-	def compare_roots(a, b):
-		if a.report_type != b.report_type and a.report_type == "Balance Sheet":
-			return -1
-		if a.root_type != b.root_type and a.root_type == "Asset":
-			return -1
-		if a.root_type == "Liability" and b.root_type == "Equity":
-			return -1
-		return 1
-
-	roots.sort(compare_roots)
-
 def get_gl_entries(company, from_date, to_date, root_lft, root_rgt, ignore_closing_entries=False):
 	"""Returns a dict like { "account": [gl entries], ... }"""
 	additional_conditions = []
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/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,
 	}
--- a/erpnext/accounts/report/gross_profit/gross_profit.py
+++ b/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,6 +174,7 @@ class GrossProfitGenerator(object):
 			return flt(row.qty) * item_rate

 		else:
+			if row.update_stock or row.dn_detail:
 				if row.dn_detail:
 					row.parenttype = "Delivery Note"
 					row.parent = row.delivery_note
@@ -182,6 +183,8 @@ class GrossProfitGenerator(object):
 				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,
--- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
+++ b/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
 		}
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -18,11 +18,11 @@ def get_fiscal_year(date=None, fiscal_year=None, label="Date", verbose=1, compan

 def get_fiscal_years(transaction_date=None, fiscal_year=None, label="Date", verbose=1, company=None):
 	# if year start date is 2012-04-01, year end date should be 2013-03-31 (hence subdate)
-	cond = ""
+	cond = " ifnull(disabled, 0) = 0"
 	if fiscal_year:
-		cond = "fy.name = %(fiscal_year)s"
+		cond += " and fy.name = %(fiscal_year)s"
 	else:
-		cond = "%(transaction_date)s >= fy.year_start_date and %(transaction_date)s <= fy.year_end_date"
+		cond += " and %(transaction_date)s >= fy.year_start_date and %(transaction_date)s <= fy.year_end_date"

 	if company:
 		cond += """ and (not exists(select name from `tabFiscal Year Company` fyc where fyc.parent = fy.name)
@@ -36,7 +36,7 @@ def get_fiscal_years(transaction_date=None, fiscal_year=None, label="Date", verb
 		})

 	if not fy:
-		error_msg = _("""{0} {1} not in any Fiscal Year. For more details check {2}.""").format(label, formatdate(transaction_date), "https://erpnext.com/kb/accounts/fiscal-year-error")
+		error_msg = _("""{0} {1} not in any active Fiscal Year. For more details check {2}.""").format(label, formatdate(transaction_date), "https://erpnext.com/kb/accounts/fiscal-year-error")
 		if verbose==1: frappe.msgprint(error_msg)
 		raise FiscalYearError, error_msg
 	return fy
@@ -421,8 +421,3 @@ def get_outstanding_invoices(amount_query, account, party_type, party):
 			})

 	return all_outstanding_vouchers
-
-@frappe.whitelist()
-def get_letter_head(company):
-	return frappe.db.get_value("Company",company,"default_letter_head")
-
--- a/erpnext/buying/doctype/purchase_order/test_purchase_order.py
+++ b/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",
--- a/erpnext/change_log/current/rename_pos_setting.md
+++ b/erpnext/change_log/current/rename_pos_setting.md
@@ -0,0 +1 @@
+- POS Setting is renamed to POS Profile
--- a/erpnext/config/accounts.py
+++ b/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")
 				},
 				{
--- a/erpnext/controllers/buying_controller.py
+++ b/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)
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -283,6 +283,9 @@ class calculate_taxes_and_totals(object):
 				last_tax.tax_amount_after_discount_amount += diff
 				last_tax.total += diff
 				
+				self._set_in_company_currency(last_tax, 
+					["total", "tax_amount", "tax_amount_after_discount_amount"])
+
 	def calculate_totals(self):
 		self.doc.grand_total = flt(self.doc.get("taxes")[-1].total
 			if self.doc.get("taxes") else self.doc.net_total)
--- a/erpnext/crm/doctype/newsletter/newsletter.py
+++ b/erpnext/crm/doctype/newsletter/newsletter.py
@@ -92,7 +92,7 @@ def unsubscribe(email, name):
 		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)
--- a/erpnext/crm/doctype/newsletter/test_newsletter.py
+++ b/erpnext/crm/doctype/newsletter/test_newsletter.py
@@ -9,6 +9,15 @@ from urllib import unquote

 class TestNewsletter(unittest.TestCase):
 	def setUp(self):
+		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):
@@ -39,6 +48,4 @@ class TestNewsletter(unittest.TestCase):

 		newsletter.send_emails()

-
-
 test_dependencies = ["Newsletter List"]
--- a/erpnext/crm/doctype/newsletter_list/test_newsletter_list.py
+++ b/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"]

--- a/erpnext/crm/doctype/newsletter_list/test_records.json
+++ b/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"
 	}
 ]
--- a/erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.py
+++ b/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"))
--- a/erpnext/hooks.py
+++ b/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 = "v5.0.0"
+app_version = "5.0.9"

 error_report_email = "support@erpnext.com"

--- a/erpnext/hr/doctype/salary_slip/test_salary_slip.py
+++ b/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')
--- a/erpnext/manufacturing/doctype/bom/bom.js
+++ b/erpnext/manufacturing/doctype/bom/bom.js
@@ -35,7 +35,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);
--- a/erpnext/manufacturing/doctype/production_order/production_order.js
+++ b/erpnext/manufacturing/doctype/production_order/production_order.js
@@ -35,6 +35,7 @@ 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];
+	if (d.workstation) {
 		frappe.call({
 			"method": "frappe.client.get",
 			args: {
@@ -47,6 +48,7 @@ frappe.ui.form.on("Production Order Operation", "workstation", function(frm, cdt
 				erpnext.production_order.calculate_total_cost(frm);
 			}
 		})
+	}
 });

 frappe.ui.form.on("Production Order Operation", "time_in_mins", function(frm, cdt, cdn) {
--- a/erpnext/manufacturing/doctype/production_order/test_production_order.py
+++ b/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):
--- a/erpnext/manufacturing/doctype/production_order_operation/production_order_operation.json
+++ b/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", 
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -155,3 +155,5 @@ 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
--- a/erpnext/patches/v4_2/party_model.py
+++ b/erpnext/patches/v4_2/party_model.py
@@ -19,6 +19,7 @@ def create_receivable_payable_account():
 	receivable_payable_accounts = frappe._dict()

 	def _create_account(args):
+		if args["parent_account"]:
 			account_id = frappe.db.get_value("Account", 
 					{"account_name": args["account_name"], "company": args["company"]})
 			if not account_id:
@@ -96,15 +97,16 @@ def set_party_in_jv_and_gl_entry(receivable_payable_accounts):
 				frappe.db.commit()

 def delete_individual_party_account():
-	frappe.db.sql("""delete from `tabAccount` acc 
-		where ifnull(acc.master_type, '') in ('Customer', 'Supplier')
-		and ifnull(acc.master_name, '') != '' 
-		and not exists(select gle.name from `tabGL Entry` gle where gle.account = acc.name)""")
+	frappe.db.sql("""delete from `tabAccount` 
+		where ifnull(master_type, '') in ('Customer', 'Supplier') 
+			and ifnull(master_name, '') != '' 
+			and not exists(select gle.name from `tabGL Entry` gle 
+				where gle.account = tabAccount.name)""")
 		
-	accounts_not_deleted = frappe.db.sql_list("""select name from `tabAccount` acc 
-		where ifnull(acc.master_type, '') in ('Customer', 'Supplier')
-		and ifnull(acc.master_name, '') != '' 
-		and exists(select gle.name from `tabGL Entry` gle where gle.account = acc.name)""")
+	accounts_not_deleted = frappe.db.sql_list("""select tabAccount.name from `tabAccount` 
+		where ifnull(master_type, '') in ('Customer', 'Supplier')
+		and ifnull(master_name, '') != '' 
+		and exists(select gle.name from `tabGL Entry` gle where gle.account = tabAccount.name)""")
 		
 	if accounts_not_deleted:
 		print "Accounts not deleted: " + "\n".join(accounts_not_deleted)
--- a/erpnext/patches/v4_2/repost_requested_qty.py
+++ b/erpnext/patches/v4_2/repost_requested_qty.py
@@ -1,21 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
-	from erpnext.utilities.repost_stock import update_bin_qty, get_indented_qty
-
-	count=0
-	for item_code, warehouse in frappe.db.sql("""select distinct item_code, warehouse 
-		from `tabMaterial Request Item` where docstatus = 1"""):
-			try:
-				count += 1
-				update_bin_qty(item_code, warehouse, {
-					"indented_qty": get_indented_qty(item_code, warehouse),
-				})
-				if count % 200 == 0:
-					frappe.db.commit()
-			except:
-				frappe.db.rollback()
--- a/erpnext/patches/v4_2/update_advance_paid.py
+++ b/erpnext/patches/v4_2/update_advance_paid.py
@@ -1,13 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
-	for dt in ("Sales Order", "Purchase Order"):
-		orders_with_advance = frappe.db.sql("""select name from `tab{0}` 
-			where docstatus < 2 and ifnull(advance_paid, 0) != 0""".format(dt), as_dict=1)
-			
-		for order in orders_with_advance:
-			frappe.get_doc(dt, order.name).set_total_advance_paid()
--- a/erpnext/patches/v5_0/rename_pos_setting.py
+++ b/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")
--- a/erpnext/patches/v5_0/update_operation_description.py
+++ b/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, '') = ''""")
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -46,6 +46,9 @@ erpnext.taxes_and_totals = erpnext.stock.StockController.extend({
 		var company_currency = this.get_company_currency();

 		if(!this.frm.doc.conversion_rate) {
+			if(this.frm.doc.currency == company_currency) {
+				this.frm.set_value("conversion_rate", 1);
+			} else {
 				frappe.throw(repl('%(conversion_rate_label)s' +
 					__(' is mandatory. Maybe Currency Exchange record is not created for ') +
 					'%(from_currency)s' + __(" to ") + '%(to_currency)s',
@@ -55,6 +58,8 @@ erpnext.taxes_and_totals = erpnext.stock.StockController.extend({
 						"to_currency": company_currency
 					}));
 			}
+			
+		}
 	},

 	calculate_item_values: function() {
@@ -314,6 +319,8 @@ erpnext.taxes_and_totals = erpnext.stock.StockController.extend({
 		tax.tax_amount_after_discount_amount = flt(tax.tax_amount_after_discount_amount +
 			discount_amount_loss, precision("tax_amount", tax));
 		tax.total = flt(tax.total + discount_amount_loss, precision("total", tax));
+		
+		this.set_in_company_currency(tax, ["total", "tax_amount_after_discount_amount"]);
 	},
 	
 	manipulate_grand_total_for_inclusive_tax: function() {
@@ -333,6 +340,9 @@ erpnext.taxes_and_totals = erpnext.stock.StockController.extend({
 					last_tax.tax_amount += diff;
 					last_tax.tax_amount_after_discount += diff;
 					last_tax.total += diff;
+					
+					this.set_in_company_currency(last_tax, 
+						["total", "tax_amount", "tax_amount_after_discount_amount"]);
 				}
 			}
 		}
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -66,19 +66,22 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({

 	apply_default_taxes: function() {
 		var me = this;
-		return frappe.call({
+		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": frappe.meta.get_docfield(me.frm.doc.doctype, "taxes_and_charges",
-					me.frm.doc.name).options
+					"master_doctype": taxes_and_charges_field.options
 				},
 				callback: function(r) {
 					if(!r.exc) {
 						me.frm.set_value("taxes", r.message);
-					me.calculate_taxes_and_totals();
 					}
 				}
 			});
+		}
 	},

 	setup_sms: function() {
@@ -194,6 +197,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 		var fn = function() {
 			if(me.frm.doc.company && me.frm.fields_dict.currency) {
 				var company_currency = me.get_company_currency();
+				var company_doc = frappe.get_doc(":Company", me.frm.doc.company);
 				if (!me.frm.doc.currency) {
 					me.frm.set_value("currency", company_currency);
 				}
@@ -204,6 +208,12 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 				if (me.frm.doc.price_list_currency == company_currency) {
 					me.frm.set_value('plc_conversion_rate', 1.0);
 				}
+				if (company_doc.default_letter_head) {
+					me.frm.set_value("letter_head", company_doc.default_letter_head);
+				}
+				if (company_doc.default_terms) {
+					me.frm.set_value("tc_name", company_doc.default_terms);
+				}

 				me.frm.script_manager.trigger("currency");
 				me.apply_pricing_rule();
@@ -213,7 +223,6 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 		if (this.frm.doc.posting_date) var date = this.frm.doc.posting_date;
 		else var date = this.frm.doc.transaction_date;
 		erpnext.get_fiscal_year(this.frm.doc.company, date, fn);
-		erpnext.get_letter_head(this.frm.doc.company);

 		if(this.frm.doc.company) {
 			erpnext.last_selected_company = this.frm.doc.company;
--- a/erpnext/public/js/feature_setup.js
+++ b/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'],
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -105,22 +105,8 @@ $.extend(erpnext, {

 			d.show();
 		});
-	},
-
-	get_letter_head: function(company) {
-		frappe.call({
-			type:"GET",
-			method: "erpnext.accounts.utils.get_letter_head",
-			args: {
-				"company": company
-			},
-			callback: function(r) {
-				if (!r.exe)	cur_frm.set_value("letter_head", r.message);
 	}
 });
-	},
-
-});


 $.extend(erpnext.utils, {
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -76,7 +76,7 @@ class Customer(TransactionBase):

 	def validate_name_with_customer_group(self):
 		if frappe.db.exists("Customer Group", self.name):
-			frappe.throw(_("A Customer Group exists with same name please change the Customer name or rename the Customer Group"))
+			frappe.throw(_("A Customer Group exists with same name please change the Customer name or rename the Customer Group"), frappe.NameError)

 	def delete_customer_address(self):
 		addresses = frappe.db.sql("""select name, lead from `tabAddress`
--- a/erpnext/selling/doctype/customer/test_customer.py
+++ b/erpnext/selling/doctype/customer/test_customer.py
@@ -34,6 +34,8 @@ 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")

--- a/erpnext/selling/doctype/quotation/quotation.js
+++ b/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,
--- a/erpnext/selling/doctype/sms_center/sms_center.json
+++ b/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", 
--- a/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
+++ b/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,33 @@ 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("'", "\'")
+	conditions = [""]
+	values = []
 	
-	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"])
+	for field in ["company", "customer", "territory", "sales_person"]:
+		if filters.get(field):
+			conditions.append("dt.{0}=%s".format(field))
+			values.append(filters[field])
 		
-	if filters.get("sales_person"): conditions += " and st.sales_person = '%s'" % \
-	 	filters["sales_person"].replace("'", "\'")
+	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"
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -52,14 +52,6 @@
   "permlevel": 0, 
   "read_only": 0
  }, 
-  {
-   "fieldname": "default_letter_head", 
-   "fieldtype": "Link", 
-   "label": "Default Letter Head", 
-   "options": "Letter Head", 
-   "permlevel": 0, 
-   "precision": ""
-  }, 
  {
   "fieldname": "domain", 
   "fieldtype": "Select", 
@@ -72,9 +64,17 @@
   "fieldname": "charts_section", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
-   "label": "Country Settings", 
+   "label": "Default Values", 
   "permlevel": 0
  }, 
+  {
+   "fieldname": "default_letter_head", 
+   "fieldtype": "Link", 
+   "label": "Default Letter Head", 
+   "options": "Letter Head", 
+   "permlevel": 0, 
+   "precision": ""
+  }, 
  {
   "fieldname": "default_holiday_list", 
   "fieldtype": "Link", 
@@ -117,10 +117,18 @@
   "options": "", 
   "permlevel": 0
  }, 
+  {
+   "fieldname": "default_terms", 
+   "fieldtype": "Link", 
+   "label": "Default Terms", 
+   "options": "Terms and Conditions", 
+   "permlevel": 0, 
+   "precision": ""
+  }, 
  {
   "fieldname": "default_settings", 
   "fieldtype": "Section Break", 
-   "label": "Default Settings", 
+   "label": "Accounts Settings", 
   "oldfieldtype": "Section Break", 
   "permlevel": 0, 
   "read_only": 0
@@ -406,7 +414,7 @@
 ], 
 "icon": "icon-building", 
 "idx": 1, 
- "modified": "2015-05-04 11:22:42.116328", 
+ "modified": "2015-05-19 02:00:41.055138", 
 "modified_by": "Administrator", 
 "module": "Setup", 
 "name": "Company", 
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -27,9 +27,13 @@ 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 \
 			self.default_currency != self.previous_default_currency and \
@@ -63,6 +67,8 @@ class Company(Document):
 		if self.default_currency:
 			frappe.db.set_value("Currency", self.default_currency, "enabled", 1)

+		frappe.clear_cache()
+
 	def install_country_fixtures(self):
 		if os.path.exists(os.path.join(os.path.dirname(__file__), "fixtures", self.country.lower())):
 			frappe.get_attr("erpnext.setup.doctype.company.fixtures.{0}.install".format(self.country.lower()))(self)
@@ -172,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
@@ -191,22 +201,42 @@ class Company(Document):

 		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)
--- a/erpnext/setup/doctype/naming_series/naming_series.py
+++ b/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:
--- a/erpnext/setup/doctype/sales_person/sales_person.py
+++ b/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))
--- a/erpnext/setup/page/setup_wizard/setup_wizard.py
+++ b/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"))
--- a/erpnext/startup/boot.py
+++ b/erpnext/startup/boot.py
@@ -29,8 +29,9 @@ def boot_session(bootinfo):
 			bootinfo.setup_complete = frappe.db.sql("""select name from
 				tabCompany limit 1""") and 'Yes' or 'No'

-		bootinfo.docs += frappe.db.sql("""select name, default_currency, cost_center
-            from `tabCompany`""", as_dict=1, update={"doctype":":Company"})
+		bootinfo.docs += frappe.db.sql("""select name, default_currency, cost_center,
+			default_terms, default_letter_head from `tabCompany`""",
+			as_dict=1, update={"doctype":":Company"})

 def load_country_and_currency(bootinfo):
 	country = frappe.db.get_default("country")
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/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
 						}
--- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py
+++ b/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))
--- a/erpnext/stock/doctype/item/item.py
+++ b/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"))

--- a/erpnext/stock/doctype/item/test_item.py
+++ b/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):
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -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){
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/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", 
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -82,16 +82,20 @@ class TestStockEntry(unittest.TestCase):
 		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)
+			qty = actual_qty + abs(projected_qty) + 10, rate=100)
 			
-		frappe.db.set_value("Stock Settings", None, "auto_indent", 1)
 		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()

--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
+++ b/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()
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/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 = []
--- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
+++ b/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",
--- a/erpnext/stock/get_item_details.py
+++ b/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):
--- a/erpnext/stock/reorder_item.py
+++ b/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():
--- a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
+++ b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
@@ -11,8 +11,6 @@ def execute(filters=None):

 	float_precision = cint(frappe.db.get_default("float_precision")) or 3
 	
-	float_precision = cint(frappe.db.get_default("float_precision")) or 3
-	
 	columns = get_columns(filters)
 	item_map = get_item_details(filters)
 	iwb_map = get_item_warehouse_batch_map(filters, float_precision)
--- a/erpnext/stock/report/stock_balance/stock_balance.json
+++ b/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", 
--- a/erpnext/support/doctype/issue/issue.json
+++ b/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", 
--- a/erpnext/utilities/transaction_base.py
+++ b/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)
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages

-version = "v5.0.0"
+version = "5.0.9"

 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()
Author	SHA1	Message	Date
Pratik Vyas	1a804e2217	Merge branch 'develop'	2015-05-25 16:32:12 +05:30
Pratik Vyas	ac9c2de8b9	bumped to version 5.0.9	2015-05-25 17:02:12 +06:00
Nabin Hait	2c6705ef83	Merge pull request #3322 from nabinhait/test_case Test case	2015-05-25 16:19:03 +05:30
Nabin Hait	5536923101	Merge pull request #3337 from nabinhait/fix1 Multiple fixes	2015-05-25 16:16:20 +05:30
Nabin Hait	63e431a219	minor fixes	2015-05-25 16:15:39 +05:30
Nabin Hait	e2787cf2ec	[fix] unique employee id validation for sales person	2015-05-25 15:27:40 +05:30
Nabin Hait	c4fa74f51d	sales partner field added in sms center	2015-05-25 15:17:29 +05:30
Nabin Hait	b62068f784	removed debug	2015-05-25 14:46:12 +05:30
Nabin Hait	43539673cc	[fix] sales person wise transaction summary	2015-05-25 14:13:03 +05:30
Nabin Hait	4809d36fbe	validate fields value with reference docs	2015-05-25 14:13:03 +05:30
Nabin Hait	f61f76ba45	[fix] gross profit report	2015-05-25 14:13:03 +05:30
Nabin Hait	8d76d14614	reset item's default accounts, warehouses on deletion of company	2015-05-25 14:13:03 +05:30
Nabin Hait	adc830b712	[fix] rename company abbr	2015-05-25 14:13:03 +05:30
Rushabh Mehta	c4d38e2183	[minor] setup wizard language fix and no submit messages for gl/sl entry	2015-05-25 11:29:37 +05:30
Nabin Hait	a5c9cff38a	Merge pull request #3323 from nabinhait/develop stock entry: get item details	2015-05-22 18:05:40 +05:30
Nabin Hait	fe8d107731	stock entry: get item details	2015-05-22 18:04:44 +05:30
Nabin Hait	e2968e9893	minor fixes in test cases	2015-05-22 17:25:55 +05:30
Nabin Hait	fd4bcd855b	test case fixes	2015-05-22 16:55:55 +05:30
Nabin Hait	2eba53f763	test case fixes	2015-05-22 16:55:55 +05:30
Pratik Vyas	866e9047b0	Merge branch 'develop'	2015-05-22 16:52:25 +05:30
Pratik Vyas	08e04ef01a	bumped to version 5.0.8	2015-05-22 17:22:25 +06:00
Nabin Hait	bf3f944bdb	Merge pull request #3318 from nabinhait/report added total row in stock balance report	2015-05-22 16:24:00 +05:30
Nabin Hait	1d08304ba5	added total row in stock balance report	2015-05-22 11:56:13 +05:30
Nabin Hait	fc79e205f0	Merge pull request #3316 from nabinhait/develop share permission and patch fix	2015-05-22 11:51:49 +05:30
Nabin Hait	3b0adc5246	[fix] ignore share permission while creating events on the background	2015-05-21 16:51:37 +05:30
Nabin Hait	4888a5dc0d	[patch][fix] party model - create debtors and creditors only if parent account exists	2015-05-21 16:51:37 +05:30
Pratik Vyas	1686876b23	Merge branch 'develop'	2015-05-21 15:34:34 +05:30
Pratik Vyas	8c6ff9ddad	bumped to version 5.0.7	2015-05-21 16:04:34 +06:00
Rushabh Mehta	3bc3384bc4	[minor] remove section headings	2015-05-21 15:06:51 +05:30
Pratik Vyas	37307215d0	Merge pull request #3315 from nabinhait/develop update operation description patch	2015-05-21 14:58:24 +05:30
Nabin Hait	61704504e6	Merge pull request #3314 from neilLasrado/item-var-validation validation added to item varients	2015-05-21 14:56:51 +05:30
Nabin Hait	9895aba42e	update operation description patch	2015-05-21 14:43:24 +05:30
Neil Trini Lasrado	753e40b4d5	fixes in validation for item varients	2015-05-21 14:38:58 +05:30
Rushabh Mehta	71b7a52990	Merge pull request #3312 from nabinhait/develop [fix] operations and bom	2015-05-21 14:29:14 +05:30
Nabin Hait	e372fb11ea	naming series fix	2015-05-21 14:27:20 +05:30
Nabin Hait	4c924bb76c	totals etc should not be clickable	2015-05-21 13:38:03 +05:30
Nabin Hait	de7b87ee3a	[fix] operations and bom	2015-05-21 13:24:49 +05:30
Nabin Hait	f3ae85cc9a	Merge pull request #3313 from rmehta/material-request-fix [fix] load taxes_and_charges only if field present	2015-05-21 13:22:21 +05:30
Nabin Hait	4a929d53bc	Merge pull request #3310 from neilLasrado/item-var-validation validation added to item varients	2015-05-21 13:21:21 +05:30
Nabin Hait	7f8d6b6252	Merge pull request #3303 from rmehta/letter-head-in-stock-entry [enhancement] letter head in stock entry #3291	2015-05-21 13:20:26 +05:30
Nabin Hait	6789680fa3	Merge pull request #3302 from rmehta/fix-report-strings [fix] totals etc should not be clickable	2015-05-21 13:18:22 +05:30
Nabin Hait	4f3f5308e3	Merge pull request #3301 from rmehta/issue-form-layout [usability] re-layout Issue Form #3218	2015-05-21 13:15:38 +05:30
Nabin Hait	9e38d29df7	Merge pull request #3300 from rmehta/pos-setting-rename [rename] POS Setting > POS Profile #3271	2015-05-21 13:14:59 +05:30
Nabin Hait	15e13c0ed4	Merge pull request #3245 from neilLasrado/opportunity fixes in quotation - from opportunity button didn't work	2015-05-21 13:03:00 +05:30
Rushabh Mehta	4984bccbc6	[fix] load taxes_and_charges only if field present	2015-05-21 12:51:07 +05:30
Neil Trini Lasrado	4258753ae8	validation added to item varients	2015-05-21 12:22:33 +05:30
Neil Trini Lasrado	68a6d61589	filter added for closed oppurtunity	2015-05-20 19:01:37 +05:30
Neil Trini Lasrado	c55edf18ad	fixes in quotation - from opportunity	2015-05-20 18:51:38 +05:30
Rushabh Mehta	a60984866c	[enhancement] letter head in stock entry #3291	2015-05-20 17:45:18 +05:30
Rushabh Mehta	555fa4fbc2	[fix] totals etc should not be clickable	2015-05-20 17:21:53 +05:30
Rushabh Mehta	43c885868f	[usability] re-layout Issue Form	2015-05-20 16:47:45 +05:30
Pratik Vyas	815cb8959a	Merge branch 'develop'	2015-05-20 16:35:40 +05:30
Pratik Vyas	38937ecd3c	bumped to version 5.0.6	2015-05-20 17:05:40 +06:00
Rushabh Mehta	a27cca97b5	[rename] POS Setting > POS Profile #3271	2015-05-20 15:43:17 +05:30
Nabin Hait	521aa2e94a	Update party_model.py	2015-05-20 14:39:39 +05:30
Nabin Hait	390df6626b	Merge pull request #3298 from nabinhait/develop party model patch fix	2015-05-20 14:34:42 +05:30
Nabin Hait	a2d8585b07	party model patch fix	2015-05-20 14:32:54 +05:30
Pratik Vyas	84e658058b	Merge branch 'develop'	2015-05-20 12:54:52 +05:30
Pratik Vyas	10e813b010	bumped to version 5.0.5	2015-05-20 13:24:52 +06:00
Nabin Hait	a7bd8ee34b	Update utils.py	2015-05-20 12:53:04 +05:30
Pratik Vyas	90a51225a4	Merge branch 'develop'	2015-05-20 12:27:47 +05:30
Pratik Vyas	8980ce6052	bumped to version 5.0.4	2015-05-20 12:57:47 +06:00
Nabin Hait	c0f56de971	Merge pull request #3297 from nabinhait/develop validate diabled fiscal year	2015-05-20 12:26:44 +05:30
Nabin Hait	8d50eb32c1	validate diabled fiscal year	2015-05-20 12:26:21 +05:30
Nabin Hait	50bbc99889	Merge pull request #3296 from nabinhait/develop validate disabled fiscal year	2015-05-20 12:21:51 +05:30
Nabin Hait	0cf9469f86	validate disabled fiscal year	2015-05-19 18:44:02 +05:30
Pratik Vyas	d13db9cd84	Merge branch 'develop'	2015-05-19 17:33:00 +05:30
Pratik Vyas	07b3bf6417	bumped to version 5.0.3	2015-05-19 18:03:00 +06:00
Nabin Hait	25ea307b9f	Merge pull request #3289 from nabinhait/develop Multiple fixes	2015-05-19 17:10:54 +05:30
Nabin Hait	8252117fe5	set tax amount also in base currency after manipulation	2015-05-19 16:30:17 +05:30
Nabin Hait	c602396366	validation message improved	2015-05-19 16:30:16 +05:30
Nabin Hait	f59d3a4e07	conversion rate fixes	2015-05-19 16:30:16 +05:30
Pratik Vyas	1a1ba38e95	Merge branch 'develop'	2015-05-19 15:45:57 +05:30
Pratik Vyas	80a116ab19	bumped to version 5.0.2	2015-05-19 16:15:57 +06:00
Nabin Hait	6684c470c5	Merge pull request #3287 from rmehta/customer-fix Customer fix	2015-05-19 15:33:06 +05:30
Pratik Vyas	b8252bca00	bumped to version 5.0.1	2015-05-19 13:47:43 +06:00
Pratik Vyas	129a0a4cae	Fix merge mistakes	2015-05-19 13:12:00 +05:30
Pratik Vyas	803e998e9d	Fix merge mistakes	2015-05-19 13:08:54 +05:30
Rushabh Mehta	476019a930	[fix] throw name error for duplicate group	2015-05-19 13:03:01 +05:30
Rushabh Mehta	5495bc54a5	[enhancement] default terms in company, fixes #3231	2015-05-19 13:03:01 +05:30
				`@@ -1 +0,0 @@`
				`Standard settings for Point of Sales (POS) type of Sales Invoice.`