Merge branch 'develop'

Performance upgrade in reports and indexing

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '5.0.13'
+__version__ = '5.0.23'

erpnext/accounts/doctype/account/account.json

@@ -35,7 +35,7 @@
    "permlevel": 0, 
    "read_only": 1, 
    "reqd": 1, 
-   "search_index": 1
+   "search_index": 0
   }, 
   {
    "default": "0", 
@@ -44,7 +44,7 @@
    "label": "Is Group", 
    "permlevel": 0, 
    "precision": "", 
-   "search_index": 1
+   "search_index": 0
   }, 
   {
    "fieldname": "company", 
@@ -57,7 +57,7 @@
    "permlevel": 0, 
    "read_only": 1, 
    "reqd": 1, 
-   "search_index": 1
+   "search_index": 0
   }, 
   {
    "fieldname": "root_type", 
@@ -147,7 +147,8 @@
    "label": "Lft", 
    "permlevel": 0, 
    "print_hide": 1, 
-   "read_only": 1
+   "read_only": 1, 
+   "search_index": 1
   }, 
   {
    "fieldname": "rgt", 
@@ -156,7 +157,8 @@
    "label": "Rgt", 
    "permlevel": 0, 
    "print_hide": 1, 
-   "read_only": 1
+   "read_only": 1, 
+   "search_index": 1
   }, 
   {
    "fieldname": "old_parent", 
@@ -171,7 +173,7 @@
  "icon": "icon-money", 
  "idx": 1, 
  "in_create": 0, 
- "modified": "2015-05-28 14:10:40.606010", 
+ "modified": "2015-06-14 20:57:55.471334", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Account", 

erpnext/accounts/doctype/account/chart_of_accounts/verified/ni_ni_chart_template.json

@@ -1,6 +1,6 @@
 {
 	"country_code": "ni",
-	"name": "Catalogo de Cuentas",
+	"name": "Catalogo de Cuentas Nicaragua",
 	"is_active": "Yes",
 	"tree": {
 		"Activo": {
@@ -72,7 +72,7 @@
 						"IVA Acreditable por Importaciones": {
 							"account_type": "Tax"
 						},
-						"IVA Acreditable por Prestacion de Servicios": {
+						"IVA Acreditable por Prestacion de Servicios y Uso y Goce de Bienes": {
 							"account_type": "Tax"
 						},
 						"Acreditacion Proporcional": {}
@@ -229,11 +229,19 @@
 					"Impuesto al Valor Agregado por Pagar": {
 						"account_type": "Tax"
 					},
-					"Impuesto sobre la Renta": {
+					"Impuesto sobre la Renta por Actividades Economicas": {
 						"account_type": "Tax"
 					},
 					"Impuestos Municipales": {
+						"Impuesto Municipal Sobre Ingresos": {
 							"account_type": "Tax"
+						},
+						"Recoleccion Basura": {
+							"account_type": "Tax"
+						},
+						"Matricula Municipal": {
+							"account_type": "Tax"
+						}
 					}
 				},
 				"Retenciones por Pagar": {
@@ -241,7 +249,13 @@
 						"Retencion Rentas del Trabajo Tarifa Progresiva": {
 							"account_type": "Tax"
 						},
-						"Retencion Definitiva por Rentas del Trabajo": {
+						"Retencion Definitiva 10% por Rentas del Trabajo - Indemnizacion Adicional": {
+							"account_type": "Tax"
+						},
+						"Retencion Definitiva 12.5% por Rentas del Trabajo - Dietas": {
+							"account_type": "Tax"
+						},
+						"Retencion Definitiva 15% por Rentas del Trabajo - No Residentes": {
 							"account_type": "Tax"
 						}
 					},
@@ -258,11 +272,26 @@
 						"Retencion 5% compra Madera en Rollo": {
 							"account_type": "Tax"
 						},
+						"Retencion Definitiva 1.5% Actividades Economicas No Residentes": {
+							"account_type": "Tax"
+						},
+						"Retencion Definitiva 3% Actividades Economicas No Residentes": {
+							"account_type": "Tax"
+						},
+						"Retencion Definitiva 10% Actividades Economicas No Residentes": {
+							"account_type": "Tax"
+						},
+						"Retencion Definitiva 15% Actividades Economicas No Residentes": {
+							"account_type": "Tax"
+						},									
 						"Otras Retenciones 10%": {
 							"account_type": "Tax"
 						}
 					},
 					"Rentas y Ganancias de Capital": {
+						"Retencion Defintiva 15% por Rentas de Capital": {
+							"account_type": "Tax"
+						},			
 						"Retencion Defintiva 10% por Rentas de Capital": {
 							"account_type": "Tax"
 						},
@@ -272,10 +301,16 @@
 						"Retencion Definitiva 10% por Ganancia de Capital": {
 							"account_type": "Tax"
 						},
-						"Retencion Definitiva Actividades Economicas No Residentes": {
+						"Retencion Definitiva 0.25% Transacciones Bursatiles": {
 							"account_type": "Tax"
 						},
-						"Retencion Definitiva Transacciones Bursatiles": {
+						"Retencion Definitiva 1% Transacciones Bursatiles": {
+							"account_type": "Tax"
+						},
+						"Retencion Definitiva 1.5% Transacciones Bursatiles": {
+							"account_type": "Tax"
+						},
+						"Retencion Definitiva 2% Transacciones Bursatiles": {
 							"account_type": "Tax"
 						},
 						"Retenciones Defintiva 5% Fondos de Inversion": {

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -4,6 +4,13 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "fields": [
+  {
+   "fieldname": "check_supplier_invoice_uniqueness", 
+   "fieldtype": "Check", 
+   "label": "Check Supplier Invoice Number Uniqueness", 
+   "permlevel": 0, 
+   "precision": ""
+  }, 
   {
    "default": "1", 
    "description": "If enabled, the system will post accounting entries for inventory automatically.", 
@@ -43,7 +50,7 @@
  "icon": "icon-cog", 
  "idx": 1, 
  "issingle": 1, 
- "modified": "2015-02-05 05:11:34.163902", 
+ "modified": "2015-06-11 06:06:34.047890", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Accounts Settings", 

erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js

@@ -2,6 +2,10 @@
 // License: GNU General Public License v3. See license.txt
 
 frappe.ui.form.on("Bank Reconciliation", {
+	refresh: function(frm) {
+		frm.disable_save();
+	},
+	
 	update_clearance_date: function(frm) {
 		return frappe.call({
 			method: "update_details",
@@ -34,4 +38,3 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
 	cur_frm.set_value("from_date", frappe.datetime.month_start());
 	cur_frm.set_value("to_date", frappe.datetime.month_end());
 }
-

erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py

@@ -25,7 +25,8 @@ class BankReconciliation(Document):
 			where
 				t2.parent = t1.name and t2.account = %s
 				and t1.posting_date >= %s and t1.posting_date <= %s and t1.docstatus=1
-				and ifnull(t1.is_opening, 'No') = 'No' %s""" %
+				and ifnull(t1.is_opening, 'No') = 'No' %s
+				order by t1.posting_date""" %
 				('%s', '%s', '%s', condition), (self.bank_account, self.from_date, self.to_date), as_dict=1)
 
 		self.set('journal_entries', [])

erpnext/accounts/doctype/c_form/c_form.py

@@ -54,7 +54,7 @@ class CForm(Document):
 			frappe.throw(_("Please enter atleast 1 invoice in the table"))
 
 	def set_total_invoiced_amount(self):
-		total = sum([flt(d.base_grand_total) for d in self.get('invoices')])
+		total = sum([flt(d.grand_total) for d in self.get('invoices')])
 		frappe.db.set(self, 'total_invoiced_amount', total)
 
 	def get_invoice_details(self, invoice_no):

erpnext/accounts/doctype/gl_entry/gl_entry.json

@@ -48,7 +48,8 @@
    "fieldtype": "Dynamic Link", 
    "label": "Party", 
    "options": "party_type", 
-   "permlevel": 0
+   "permlevel": 0, 
+   "search_index": 1
   }, 
   {
    "fieldname": "cost_center", 
@@ -192,7 +193,7 @@
  "icon": "icon-list", 
  "idx": 1, 
  "in_create": 1, 
- "modified": "2015-04-27 20:32:48.246818", 
+ "modified": "2015-06-14 20:57:19.800276", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "GL Entry", 

erpnext/accounts/doctype/journal_entry/journal_entry.js

@@ -4,7 +4,7 @@
 frappe.provide("erpnext.accounts");
 frappe.require("assets/erpnext/js/utils.js");
 
-erpnext.accounts.JournalVoucher = frappe.ui.form.Controller.extend({
+erpnext.accounts.JournalEntry = frappe.ui.form.Controller.extend({
 	onload: function() {
 		this.load_defaults();
 		this.setup_queries();
@@ -130,10 +130,31 @@ erpnext.accounts.JournalVoucher = frappe.ui.form.Controller.extend({
 				cur_frm.cscript.update_totals(me.frm.doc);
 			}
 		});
+	},
+
+	accounts_add: function(doc, cdt, cdn) {
+		var row = frappe.get_doc(cdt, cdn);
+		$.each(doc.accounts, function(i, d) {
+			if(d.account && d.party && d.party_type) {
+				row.account = d.account;
+				row.party = d.party;
+				row.party_type = d.party_type;
 			}
+		});
+
+		// set difference
+		if(doc.difference) {
+			if(doc.difference > 0) {
+				row.credit = doc.difference;
+			} else {
+				row.debit = -doc.difference;
+			}
+		}
+	},
+
 });
 
-cur_frm.script_manager.make(erpnext.accounts.JournalVoucher);
+cur_frm.script_manager.make(erpnext.accounts.JournalEntry);
 
 cur_frm.cscript.refresh = function(doc) {
 	erpnext.toggle_naming_series();

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.utils import cstr, flt, fmt_money, formatdate, getdate, cint
+from frappe.utils import cstr, flt, fmt_money, formatdate, getdate
 from frappe import msgprint, _, scrub
 from erpnext.setup.utils import get_company_currency
 from erpnext.controllers.accounts_controller import AccountsController
@@ -81,7 +81,8 @@ class JournalEntry(AccountsController):
 				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]))
+		customers = list(set([d.party for d in self.get("accounts") 
+			if d.party_type=="Customer" and d.party and flt(d.debit) > 0]))
 		if customers:
 			from erpnext.selling.doctype.customer.customer import check_credit_limit
 			for customer in customers:
@@ -427,12 +428,11 @@ class JournalEntry(AccountsController):
 	def validate_expense_claim(self):
 		for d in self.accounts:
 			if d.against_expense_claim:
-				sanctioned_amount, reimbursed_amount = frappe.db.get_value("Expense Claim", d.against_expense_claim,
+				sanctioned_amount, reimbursed_amount = frappe.db.get_value("Expense Claim", 
-					("total_sanctioned_amount", "total_amount_reimbursed"))
+					d.against_expense_claim, ("total_sanctioned_amount", "total_amount_reimbursed"))
-				pending_amount = cint(sanctioned_amount) - cint(reimbursed_amount)
+				pending_amount = flt(sanctioned_amount) - flt(reimbursed_amount)
 				if d.debit > pending_amount:
-					frappe.throw(_("Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. \
+					frappe.throw(_("Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2}".format(d.idx, d.against_expense_claim, pending_amount)))
-						Pending Amount is {2}".format(d.idx, d.against_expense_claim, pending_amount)))
 
 	def validate_credit_debit_note(self):
 		if self.stock_entry:
@@ -458,11 +458,11 @@ def get_default_bank_cash_account(company, voucher_type, mode_of_payment=None):
 	if voucher_type=="Bank Entry":
 		account = frappe.db.get_value("Company", company, "default_bank_account")
 		if not account:
-			account = frappe.db.get_value("Account", {"company": company, "account_type": "Bank"})
+			account = frappe.db.get_value("Account", {"company": company, "account_type": "Bank", "is_group": 0})
 	elif voucher_type=="Cash Entry":
 		account = frappe.db.get_value("Company", company, "default_cash_account")
 		if not account:
-			account = frappe.db.get_value("Account", {"company": company, "account_type": "Cash"})
+			account = frappe.db.get_value("Account", {"company": company, "account_type": "Cash", "is_group": 0})
 
 	if account:
 		return {
@@ -538,15 +538,13 @@ def get_opening_accounts(company):
 
 
 def get_against_jv(doctype, txt, searchfield, start, page_len, filters):
-	if not filters.get("party"):
-		return []
 	return frappe.db.sql("""select jv.name, jv.posting_date, jv.user_remark
 		from `tabJournal Entry` jv, `tabJournal Entry Account` jv_detail
-		where jv_detail.parent = jv.name and jv_detail.account = %s and jv_detail.party = %s
+		where jv_detail.parent = jv.name and jv_detail.account = %s and ifnull(jv_detail.party, '') = %s
 		and (ifnull(jv_detail.against_invoice, '') = '' and ifnull(jv_detail.against_voucher, '') = ''
 		and ifnull(jv_detail.against_jv, '') = '' )
 		and jv.docstatus = 1 and jv.{0} like %s order by jv.name desc limit %s, %s""".format(searchfield),
-		(filters["account"], filters["party"], "%{0}%".format(txt), start, page_len))
+		(filters.get("account"), cstr(filters.get("party")), "%{0}%".format(txt), start, page_len))
 
 @frappe.whitelist()
 def get_outstanding(args):

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js

@@ -45,6 +45,10 @@ erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.ext
 		});
 	},
 	
+	refresh: function() {
+		this.frm.disable_save();
+	},
+
 	party: function() {
 		var me = this
 		if(!me.frm.doc.receivable_payable_account && me.frm.doc.party_type && me.frm.doc.party) {

erpnext/accounts/doctype/payment_tool/payment_tool.js

@@ -32,6 +32,7 @@ frappe.ui.form.on("Payment Tool", "onload", function(frm) {
 });
 
 frappe.ui.form.on("Payment Tool", "refresh", function(frm) {
+	frm.disable_save();
 	frappe.ui.form.trigger("Payment Tool", "party_type");
 });
 

erpnext/accounts/doctype/payment_tool/payment_tool.json

@@ -312,7 +312,7 @@
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
- "modified": "2015-02-21 03:59:08.154966", 
+ "modified": "2015-06-05 11:17:33.843334", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Tool", 

erpnext/accounts/doctype/pricing_rule/pricing_rule.py

@@ -205,9 +205,9 @@ def get_pricing_rules(args):
 
 def filter_pricing_rules(args, pricing_rules):
 	# filter for qty
-	if pricing_rules and args.get("qty"):
+	if pricing_rules:
-		pricing_rules = filter(lambda x: (args.qty>=flt(x.min_qty)
+		pricing_rules = filter(lambda x: (flt(args.get("qty"))>=flt(x.min_qty)
-			and (args.qty<=x.max_qty if x.max_qty else True)), pricing_rules)
+			and (flt(args.get("qty"))<=x.max_qty if x.max_qty else True)), pricing_rules)
 
 	# find pricing rule with highest priority
 	if pricing_rules:

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

@@ -39,6 +39,7 @@ class PurchaseInvoice(BuyingController):
 
 		self.po_required()
 		self.pr_required()
+		self.validate_supplier_invoice()
 		self.check_active_purchase_items()
 		self.check_conversion_rate()
 		self.validate_credit_to_acc()
@@ -386,6 +387,16 @@ class PurchaseInvoice(BuyingController):
 				project.save()
 				project_list.append(d.project_name)
 				
+	def validate_supplier_invoice(self):
+		if self.bill_date:
+			if self.bill_date > self.posting_date:
+				frappe.throw("Supplier Invoice Date cannot be greater than Posting Date")
+		if self.bill_no:
+			if cint(frappe.db.get_single_value("Accounts Settings", "check_supplier_invoice_uniqueness")):
+				pi = frappe.db.exists("Purchase Invoice", {"bill_no": self.bill_no, "fiscal_year": self.fiscal_year})
+				if pi:
+					frappe.throw("Supplier Invoice No exists in Purchase Invoice {0}".format(pi))
+
 @frappe.whitelist()
 def get_expense_account(doctype, txt, searchfield, start, page_len, filters):
 	from erpnext.controllers.queries import get_match_cond

erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json

@@ -40,7 +40,7 @@
   {
    "fieldname": "description", 
    "fieldtype": "Text", 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "label": "Description", 
    "oldfieldname": "description", 
    "oldfieldtype": "Text", 
@@ -452,7 +452,7 @@
  ], 
  "idx": 1, 
  "istable": 1, 
- "modified": "2015-05-27 02:47:16.341373", 
+ "modified": "2015-06-02 14:18:56.294949", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice Item", 

erpnext/accounts/doctype/sales_invoice/pos.py

@@ -7,6 +7,7 @@ import frappe
 @frappe.whitelist()
 def get_items(price_list, sales_or_purchase, item=None):
 	condition = ""
+	order_by = ""
 	args = {"price_list": price_list}
 
 	if sales_or_purchase == "Sales":
@@ -30,16 +31,25 @@ def get_items(price_list, sales_or_purchase, item=None):
 			item_code[0]["barcode"] = item
 			return item_code
 
-		condition += " and (CONCAT(i.name, i.item_name) like %(name)s or (i.variant_of like %(name)s))"
+		condition += " and ((CONCAT(i.name, i.item_name) like %(name)s) or (i.variant_of like %(name)s) or (i.item_group like %(name)s))"
+		order_by = """if(locate(%(_name)s, i.name), locate(%(_name)s, i.name), 99999),
+			if(locate(%(_name)s, i.item_name), locate(%(_name)s, i.item_name), 99999),
+			if(locate(%(_name)s, i.variant_of), locate(%(_name)s, i.variant_of), 99999),
+			if(locate(%(_name)s, i.item_group), locate(%(_name)s, i.item_group), 99999),"""
 		args["name"] = "%%%s%%" % item
+		args["_name"] = item.replace("%", "")
 
+	# locate function is used to sort by closest match from the beginning of the value
 	return frappe.db.sql("""select i.name, i.item_name, i.image,
 		item_det.price_list_rate, item_det.currency
 		from `tabItem` i LEFT JOIN
 			(select item_code, price_list_rate, currency from
-				`tabItem Price`	where price_list=%s) item_det
+				`tabItem Price`	where price_list=%(price_list)s) item_det
 		ON
 			(item_det.item_code=i.name or item_det.item_code=i.variant_of)
 		where
 			ifnull(i.has_variants, 0) = 0 and
-			%s""" % ('%(price_list)s', condition), args, as_dict=1)
+			{condition}
+		order by
+			{order_by}
+			i.name""".format(condition=condition, order_by=order_by), args, as_dict=1)

erpnext/accounts/doctype/sales_invoice/sales_invoice.js

@@ -65,7 +65,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
 					});
 
 				if(!from_delivery_note) {
-					cur_frm.page.add_menu_item(__('Make Delivery'), cur_frm.cscript['Make Delivery Note'], "icon-truck")
+					cur_frm.add_custom_button(__('Make Delivery'), cur_frm.cscript['Make Delivery Note'], "icon-truck")
 				}
 			}
 
@@ -75,14 +75,14 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
 		}
 
 		// Show buttons only when pos view is active
-		if (doc.docstatus===0 && !cur_frm.page.current_view_name!=="pos") {
+		if (cint(doc.docstatus==0) && cur_frm.page.current_view_name!=="pos") {
 			cur_frm.cscript.sales_order_btn();
 			cur_frm.cscript.delivery_note_btn();
 		}
 	},
 
 	sales_order_btn: function() {
-		this.$sales_order_btn = cur_frm.page.add_menu_item(__('From Sales Order'),
+		this.$sales_order_btn = cur_frm.add_custom_button(__('From Sales Order'),
 			function() {
 				frappe.model.map_current_doc({
 					method: "erpnext.selling.doctype.sales_order.sales_order.make_sales_invoice",
@@ -99,7 +99,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
 	},
 
 	delivery_note_btn: function() {
-		this.$delivery_note_btn = cur_frm.page.add_menu_item(__('From Delivery Note'),
+		this.$delivery_note_btn = cur_frm.add_custom_button(__('From Delivery Note'),
 			function() {
 				frappe.model.map_current_doc({
 					method: "erpnext.stock.doctype.delivery_note.delivery_note.make_sales_invoice",

erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json

@@ -58,7 +58,7 @@
   {
    "fieldname": "description", 
    "fieldtype": "Text", 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "label": "Description", 
    "oldfieldname": "description", 
    "oldfieldtype": "Text", 
@@ -505,7 +505,7 @@
  ], 
  "idx": 1, 
  "istable": 1, 
- "modified": "2015-05-27 02:47:15.645114", 
+ "modified": "2015-06-02 14:18:45.176726", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice Item", 

erpnext/accounts/general_ledger.py

@@ -56,10 +56,11 @@ def merge_similar_entries(gl_map):
 
 def check_if_in_list(gle, gl_map):
 	for e in gl_map:
-		if e.account == gle.account and \
+		if e.account == gle.account \
-				cstr(e.get('against_voucher'))==cstr(gle.get('against_voucher')) \
+			and cstr(e.get('party_type'))==cstr(gle.get('party_type')) \
-				and cstr(e.get('against_voucher_type')) == \
+			and cstr(e.get('party'))==cstr(gle.get('party')) \
-					cstr(gle.get('against_voucher_type')) \
+			and cstr(e.get('against_voucher'))==cstr(gle.get('against_voucher')) \
+			and cstr(e.get('against_voucher_type')) == cstr(gle.get('against_voucher_type')) \
 			and cstr(e.get('cost_center')) == cstr(gle.get('cost_center')):
 				return e
 
@@ -101,8 +102,7 @@ def round_off_debit_credit(gl_map):
 		debit_credit_diff += entry.debit - entry.credit
 	
 	debit_credit_diff = flt(debit_credit_diff, precision)
-	print debit_credit_diff, 1.0 / (10**precision)
+	if abs(debit_credit_diff) >= (5.0 / (10**precision)):
-	if abs(debit_credit_diff) >= (2.0 / (10**precision)):
 		frappe.throw(_("Debit and Credit not equal for {0} #{1}. Difference is {2}.")
 			.format(gl_map[0].voucher_type, gl_map[0].voucher_no, debit_credit_diff))
 		

erpnext/accounts/page/pos/pos_page.html

@@ -9,7 +9,7 @@
         <button class="btn btn-primary btn-lg">{%=  __("Start") %}</button>
     </p>
 	<p class="pos-setting-message hide">
-        <a class="btn btn-default btn-sm" href="#Form/POS Setting/New POS Setting">
+        <a class="btn btn-default btn-sm" href="#Form/POS Profile/New POS Profile">
-		{%=  __("Make new POS Setting") %}</a>
+		{%=  __("Make new POS Profile") %}</a>
     </p>
 </div>

erpnext/accounts/party.py

@@ -17,11 +17,15 @@ def get_party_details(party=None, account=None, party_type="Customer", company=N
 	if not party:
 		return {}
 		
+	if not frappe.db.exists(party_type, party):
+		frappe.throw(_("{0}: {1} does not exists").format(party_type, party))
+
 	return _get_party_details(party, account, party_type,
 		company, posting_date, price_list, currency, doctype)
 
 def _get_party_details(party=None, account=None, party_type="Customer", company=None,
 	posting_date=None, price_list=None, currency=None, doctype=None, ignore_permissions=False):
+	
 	out = frappe._dict(set_account_and_due_date(party, account, party_type, company, posting_date, doctype))
 
 	party = out[party_type.lower()]

erpnext/accounts/report/accounts_receivable/accounts_receivable.py

@@ -51,7 +51,7 @@ class ReceivablePayableReport(object):
 		currency_precision = get_currency_precision() or 2
 		dr_or_cr = "debit" if args.get("party_type") == "Customer" else "credit"
 
-		voucher_details = self.get_voucher_details()
+		voucher_details = self.get_voucher_details(args.get("party_type"))
 
 		future_vouchers = self.get_entries_after(self.filters.report_date, args.get("party_type"))
 
@@ -153,13 +153,15 @@ class ReceivablePayableReport(object):
 
 		return self.party_map
 
-	def get_voucher_details(self):
+	def get_voucher_details(self, party_type):
 		voucher_details = frappe._dict()
 		
+		if party_type == "Customer":
 			for si in frappe.db.sql("""select name, due_date
 				from `tabSales Invoice` where docstatus=1""", as_dict=1):
 					voucher_details.setdefault(si.name, si)
 
+		if party_type == "Supplier":
 			for pi in frappe.db.sql("""select name, due_date, bill_no, bill_date
 				from `tabPurchase Invoice` where docstatus=1""", as_dict=1):
 					voucher_details.setdefault(pi.name, pi)
@@ -169,7 +171,8 @@ class ReceivablePayableReport(object):
 	def get_gl_entries(self, party_type):
 		if not hasattr(self, "gl_entries"):
 			conditions, values = self.prepare_conditions(party_type)
-			self.gl_entries = frappe.db.sql("""select * from `tabGL Entry`
+			self.gl_entries = frappe.db.sql("""select posting_date, account, party_type, party, debit, credit,
+				voucher_type, voucher_no, against_voucher_type, against_voucher from `tabGL Entry`
 				where docstatus < 2 and party_type=%s {0} order by posting_date, party"""
 				.format(conditions), values, as_dict=True)
 

erpnext/accounts/report/financial_statements.py

@@ -83,7 +83,7 @@ def get_data(company, root_type, balance_must_be, period_list, ignore_closing_en
 	gl_entries_by_account = get_gl_entries(company, period_list[0]["from_date"], period_list[-1]["to_date"],
 		accounts[0].lft, accounts[0].rgt, ignore_closing_entries=ignore_closing_entries)
 
-	calculate_values(accounts, gl_entries_by_account, period_list)
+	calculate_values(accounts_by_name, gl_entries_by_account, period_list)
 	accumulate_values_into_parents(accounts, accounts_by_name, period_list)
 	out = prepare_data(accounts, balance_must_be, period_list)
 
@@ -92,13 +92,11 @@ def get_data(company, root_type, balance_must_be, period_list, ignore_closing_en
 
 	return out
 
-def calculate_values(accounts, gl_entries_by_account, period_list):
+def calculate_values(accounts_by_name, gl_entries_by_account, period_list):
-	for d in accounts:
+	for entries in gl_entries_by_account.values():
-		for name in ([d.name] + (d.collapsed_children or [])):
+		for entry in entries:
-			for entry in gl_entries_by_account.get(name, []):
+			d = accounts_by_name.get(entry.account)
 			for period in period_list:
-					entry.posting_date = getdate(entry.posting_date)
-
 				# check if posting date is within the period
 				if entry.posting_date <= period.to_date:
 					d[period.key] = d.get(period.key, 0.0) + flt(entry.debit) - flt(entry.credit)
@@ -159,22 +157,8 @@ def add_total_row(out, balance_must_be, period_list):
 	out.append({})
 
 def get_accounts(company, root_type):
-	# root lft, rgt
+	return frappe.db.sql("""select name, parent_account, lft, rgt, root_type, report_type, account_name from `tabAccount`
-	root_account = frappe.db.sql("""select lft, rgt from `tabAccount`
+		where company=%s and root_type=%s order by lft""", (company, root_type), as_dict=True)
-		where company=%s and root_type=%s and ifnull(parent_account, '') = ''
-		order by lft limit 1""",
-		(company, root_type), as_dict=True)
-
-	if not root_account:
-		return None
-
-	lft, rgt = root_account[0].lft, root_account[0].rgt
-
-	accounts = frappe.db.sql("""select * from `tabAccount`
-		where company=%(company)s and lft >= %(lft)s and rgt <= %(rgt)s order by lft""",
-		{ "company": company, "lft": lft, "rgt": rgt }, as_dict=True)
-
-	return accounts
 
 def filter_accounts(accounts, depth=10):
 	parent_children_map = {}
@@ -196,14 +180,6 @@ def filter_accounts(accounts, depth=10):
 				filtered_accounts.append(child)
 				add_to_list(child.name, level + 1)
 
-		else:
-			# include all children at level lower than the depth
-			parent_account = accounts_by_name[parent]
-			parent_account["collapsed_children"] = []
-			for d in accounts:
-				if d.lft > parent_account.lft and d.rgt < parent_account.rgt:
-					parent_account["collapsed_children"].append(d.name)
-
 	add_to_list(None, 0)
 
 	return filtered_accounts, accounts_by_name
@@ -234,7 +210,7 @@ def get_gl_entries(company, from_date, to_date, root_lft, root_rgt, ignore_closi
 	if from_date:
 		additional_conditions.append("and posting_date >= %(from_date)s")
 
-	gl_entries = frappe.db.sql("""select * from `tabGL Entry`
+	gl_entries = frappe.db.sql("""select posting_date, account, debit, credit from `tabGL Entry`
 		where company=%(company)s
 		{additional_conditions}
 		and posting_date <= %(to_date)s

erpnext/accounts/report/general_ledger/general_ledger.py

@@ -66,7 +66,7 @@ def get_gl_entries(filters):
 
 	gl_entries = frappe.db.sql("""select posting_date, account, party_type, party,
 			sum(ifnull(debit, 0)) as debit, sum(ifnull(credit, 0)) as credit,
-			voucher_type, voucher_no, cost_center, remarks, is_opening, against
+			voucher_type, voucher_no, cost_center, remarks, against
 		from `tabGL Entry`
 		where company=%(company)s {conditions}
 		{group_by_condition}
@@ -92,6 +92,9 @@ def get_conditions(filters):
 	if filters.get("party"):
 		conditions.append("party=%(party)s")
 		
+	if not (filters.get("account") or filters.get("party") or filters.get("group_by_account")):
+		conditions.append("posting_date >=%(from_date)s")
+
 	from frappe.desk.reportview import build_match_conditions
 	match_conditions = build_match_conditions("GL Entry")
 	if match_conditions: conditions.append(match_conditions)
@@ -148,14 +151,15 @@ def initialize_gle_map(gl_entries):
 
 def get_accountwise_gle(filters, gl_entries, gle_map):
 	opening, total_debit, total_credit = 0, 0, 0
-
+	from_date, to_date = getdate(filters.from_date), getdate(filters.to_date)
 	for gle in gl_entries:
 		amount = flt(gle.debit, 3) - flt(gle.credit, 3)
-		if gle.posting_date < getdate(filters.from_date):
+		if (filters.get("account") or filters.get("party") or filters.get("group_by_account")) \
+				and gle.posting_date < from_date:
 			gle_map[gle.account].opening += amount
 			if filters.get("account") or filters.get("party"):
 				opening += amount
-		elif gle.posting_date <= getdate(filters.to_date):
+		elif gle.posting_date <= to_date:
 			gle_map[gle.account].entries.append(gle)
 			gle_map[gle.account].total_debit += flt(gle.debit, 3)
 			gle_map[gle.account].total_credit += flt(gle.credit, 3)

erpnext/accounts/report/gross_profit/gross_profit.py

@@ -14,7 +14,7 @@ def execute(filters=None):
 	source = gross_profit_data.grouped_data if filters.get("group_by") != "Invoice" else gross_profit_data.data
 
 	group_wise_columns = frappe._dict({
-		"invoice": ["parent", "posting_date", "posting_time", "item_code", "item_name", "brand", "description", \
+		"invoice": ["parent", "customer", "posting_date", "posting_time", "item_code", "item_name", "brand", "description", \
 			"warehouse", "qty", "base_rate", "buying_rate", "base_amount",
 			"buying_amount", "gross_profit", "gross_profit_percent", "project"],
 		"item_code": ["item_code", "item_name", "brand", "description", "warehouse", "qty", "base_rate",
@@ -183,8 +183,6 @@ 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 \

erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js

@@ -3,6 +3,14 @@
 
 frappe.query_reports["Payment Period Based On Invoice Date"] = {
 	"filters": [
+		{
+			fieldname:"company",
+			label: __("Company"),
+			fieldtype: "Link",
+			options: "Company",
+			reqd: 1,
+			default: frappe.defaults.get_user_default("company")
+		},
 		{
 			fieldname: "from_date",
 			label: __("From Date"),
@@ -23,27 +31,28 @@ frappe.query_reports["Payment Period Based On Invoice Date"] = {
 			default: "Incoming"
 		},
 		{
-			fieldname:"account",
+			"fieldname":"party_type",
-			label: __("Account"),
+			"label": __("Party Type"),
-			fieldtype: "Link",
+			"fieldtype": "Link",
-			options: "Account",
+			"options": "DocType",
-			get_query: function() {
+			"get_query": function() {
 				return {
-					query: "erpnext.controllers.queries.get_account_list",
+					filters: {"name": ["in", ["Customer", "Supplier"]]}
-					filters: {
-						"report_type": "Balance Sheet",
-						company: frappe.query_report.filters_by_name.company.get_value()
-					}
 				}
 			}
 		},
 		{
-			fieldname:"company",
+			"fieldname":"party",
-			label: __("Company"),
+			"label": __("Party"),
-			fieldtype: "Link",
+			"fieldtype": "Dynamic Link",
-			options: "Company",
+			"get_options": function() {
-			reqd: 1,
+				var party_type = frappe.query_report.filters_by_name.party_type.get_value();
-			default: frappe.defaults.get_user_default("company")
+				var party = frappe.query_report.filters_by_name.party.get_value();
+				if(party && !party_type) {
+					frappe.throw(__("Please select Party Type first"));
+				}
+				return party_type;
+			}
 		},
 	]
 }

erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py

@@ -20,16 +20,16 @@ def execute(filters=None):
 	for d in entries:
 		if d.against_voucher:
 			against_date = d.against_voucher and invoice_posting_date_map[d.against_voucher] or ""
-			outstanding_amount = flt(d.debit) or -1 * flt(d.credit)
+			payment_amount = flt(d.debit) or -1 * flt(d.credit)
 		else:
 			against_date = d.against_invoice and invoice_posting_date_map[d.against_invoice] or ""
-			outstanding_amount = flt(d.credit) or -1 * flt(d.debit)
+			payment_amount = flt(d.credit) or -1 * flt(d.debit)
 
-		row = [d.name, d.account, d.posting_date, d.against_voucher or d.against_invoice,
+		row = [d.name, d.party_type, d.party, d.posting_date, d.against_voucher or d.against_invoice,
 			against_date, d.debit, d.credit, d.cheque_no, d.cheque_date, d.remark]
 
 		if d.against_voucher or d.against_invoice:
-			row += get_ageing_data(30, 60, 90, d.posting_date, against_date, outstanding_amount)
+			row += get_ageing_data(30, 60, 90, d.posting_date, against_date, payment_amount)
 		else:
 			row += ["", "", "", "", ""]
 
@@ -38,7 +38,8 @@ def execute(filters=None):
 	return columns, data
 
 def get_columns():
-	return [_("Journal Entry") + ":Link/Journal Entry:140", _("Account") + ":Link/Account:140",
+	return [_("Journal Entry") + ":Link/Journal Entry:140", 
+		_("Party Type") + ":Link/DocType:100", _("Party") + ":Dynamic Link/party_type:140",
 		_("Posting Date") + ":Date:100", _("Against Invoice") + ":Link/Purchase Invoice:130",
 		_("Against Invoice Posting Date") + ":Date:130", _("Debit") + ":Currency:120", _("Credit") + ":Currency:120",
 		_("Reference No") + "::100", _("Reference Date") + ":Date:100", _("Remarks") + "::150", _("Age") +":Int:40",
@@ -46,41 +47,38 @@ def get_columns():
 	]
 
 def get_conditions(filters):
-	conditions = ""
+	conditions = []
-	party = None
 
-	if filters.get("account"):
+	if not filters.get("party_type"):
-		party = filters["account"]
+		if filters.get("payment_type") == "Outgoing":
+			filters["party_type"] = "Supplier"
 		else:
-		conditions += " and company = '%s'" % frappe.db.escape(filters["company"])
+			filters["party_type"] = "Customer"
 	
-		account_type = "Receivable" if filters.get("payment_type") == "Incoming" else "Payable"
+	if filters.get("party_type"):
+		conditions.append("jvd.party_type=%(party_type)s")
 
-		conditions += """ and account in
+	if filters.get("party"):
-			(select name from tabAccount
+		conditions.append("jvd.party=%(party)s")
-				where account_type = '{0}'
-				and company='{1}')""".format(account_type, frappe.db.escape(filters["company"]))
 
-	if party:
+	if filters.get("company"):
-		conditions += " and jvd.party = '%s'" % frappe.db.escape(party)
+		conditions.append("jv.company=%(company)s")
-	else:
-		conditions += " and ifnull(jvd.party, '') != ''"
 
 	if filters.get("from_date"):
-		conditions += " and jv.posting_date >= '%s'" % filters["from_date"]
+		conditions.append("jv.posting_date >= %(from_date)s")
 	if filters.get("to_date"):
-		conditions += " and jv.posting_date <= '%s'" % filters["to_date"]
+		conditions.append("jv.posting_date <= %(to_date)s")
 
-	return conditions
+	return "and {}".format(" and ".join(conditions)) if conditions else ""
 
 def get_entries(filters):
 	conditions = get_conditions(filters)
-	entries =  frappe.db.sql("""select jv.name, jvd.account, jv.posting_date,
+	entries =  frappe.db.sql("""select jv.name, jvd.party_type, jvd.party, jv.posting_date,
 		jvd.against_voucher, jvd.against_invoice, jvd.debit, jvd.credit,
 		jv.cheque_no, jv.cheque_date, jv.remark
 		from `tabJournal Entry Account` jvd, `tabJournal Entry` jv
 		where jvd.parent = jv.name and jv.docstatus=1 %s order by jv.name DESC""" %
-		conditions, as_dict=1, debug=1)
+		conditions, filters, as_dict=1)
 
 	return entries
 

erpnext/accounts/report/purchase_register/purchase_register.py

@@ -12,7 +12,6 @@ def execute(filters=None):
 	invoice_list = get_invoices(filters)
 	columns, expense_accounts, tax_accounts = get_columns(invoice_list)
 
-
 	if not invoice_list:
 		msgprint(_("No record found"))
 		return columns, invoice_list
@@ -30,7 +29,8 @@ def execute(filters=None):
 		purchase_receipt = list(set(invoice_po_pr_map.get(inv.name, {}).get("purchase_receipt", [])))
 		project_name = list(set(invoice_po_pr_map.get(inv.name, {}).get("project_name", [])))
 
-		row = [inv.name, inv.posting_date, inv.supplier, inv.supplier_name, supplier_details.get(inv.supplier),
+		row = [inv.name, inv.posting_date, inv.supplier, inv.supplier_name, 
+			supplier_details.get(inv.supplier),
 			inv.credit_to, ", ".join(project_name), inv.bill_no, inv.bill_date, inv.remarks,
 			", ".join(purchase_order), ", ".join(purchase_receipt)]
 
@@ -55,7 +55,6 @@ def execute(filters=None):
 		# total tax, grand total, outstanding amount & rounded total
 		row += [total_tax, inv.base_grand_total, flt(inv.base_grand_total, 2), inv.outstanding_amount]
 		data.append(row)		
-		# raise Exception
 
 	return columns, data
 
@@ -107,7 +106,7 @@ def get_conditions(filters):
 
 def get_invoices(filters):
 	conditions = get_conditions(filters)
-	return frappe.db.sql("""select name, posting_date, credit_to, supplier, supplier_name
+	return frappe.db.sql("""select name, posting_date, credit_to, supplier, supplier_name,
 		bill_no, bill_date, remarks, base_net_total, base_grand_total, outstanding_amount
 		from `tabPurchase Invoice` where docstatus = 1 %s
 		order by posting_date desc, name desc""" % conditions, filters, as_dict=1)

erpnext/accounts/report/sales_register/sales_register.py

@@ -30,7 +30,8 @@ def execute(filters=None):
 		delivery_note = list(set(invoice_so_dn_map.get(inv.name, {}).get("delivery_note", [])))
 
 		row = [inv.name, inv.posting_date, inv.customer, inv.customer_name,
-		customer_map.get(inv.customer)["customer_group"], customer_map.get(inv.customer)["territory"],
+		customer_map.get(inv.customer, {}).get("customer_group"), 
+		customer_map.get(inv.customer, {}).get("territory"),
 		inv.debit_to, inv.project_name, inv.remarks, ", ".join(sales_order), ", ".join(delivery_note)]
 
 		# map income values

erpnext/accounts/report/trial_balance/trial_balance.py

@@ -9,7 +9,7 @@ from erpnext.accounts.report.financial_statements import filter_accounts, get_gl
 
 value_fields = ("opening_debit", "opening_credit", "debit", "credit", "closing_debit", "closing_credit")
 
-def execute(filters):
+def execute(filters=None):
 	validate_filters(filters)
 	data = get_data(filters)
 	columns = get_columns()
@@ -45,8 +45,8 @@ def validate_filters(filters):
 		filters.to_date = filters.year_end_date
 
 def get_data(filters):
-	accounts = frappe.db.sql("""select * from `tabAccount` where company=%s order by lft""",
+	accounts = frappe.db.sql("""select name, parent_account, account_name, root_type, report_type, lft, rgt 
-		filters.company, as_dict=True)
+		from `tabAccount` where company=%s order by lft""", filters.company, as_dict=True)
 
 	if not accounts:
 		return None
@@ -56,17 +56,58 @@ def get_data(filters):
 	min_lft, max_rgt = frappe.db.sql("""select min(lft), max(rgt) from `tabAccount`
 		where company=%s""", (filters.company,))[0]
 
-	gl_entries_by_account = get_gl_entries(filters.company, None, filters.to_date, min_lft, max_rgt,
+	gl_entries_by_account = get_gl_entries(filters.company, filters.from_date, filters.to_date, min_lft, max_rgt,
 		ignore_closing_entries=not flt(filters.with_period_closing_entry))
 
-	total_row = calculate_values(accounts, gl_entries_by_account, filters)
+	opening_balances = get_opening_balances(filters)
+
+	total_row = calculate_values(accounts, gl_entries_by_account, opening_balances, filters)
 	accumulate_values_into_parents(accounts, accounts_by_name)
 
 	data = prepare_data(accounts, filters, total_row)
 
 	return data
 	
-def calculate_values(accounts, gl_entries_by_account, filters):
+def get_opening_balances(filters):
+	balance_sheet_opening = get_rootwise_opening_balances(filters, "Balance Sheet")
+	pl_opening = get_rootwise_opening_balances(filters, "Profit and Loss")
+	
+	balance_sheet_opening.update(pl_opening)
+	return balance_sheet_opening
+	
+	
+def get_rootwise_opening_balances(filters, report_type):
+	additional_conditions = " and posting_date >= %(year_start_date)s" \
+		if report_type == "Profit and Loss" else ""
+		
+	if not flt(filters.with_period_closing_entry):
+		additional_conditions += " and ifnull(voucher_type, '')!='Period Closing Voucher'"
+		
+	gle = frappe.db.sql("""
+		select 
+			account, sum(ifnull(debit, 0)) as opening_debit, sum(ifnull(credit, 0)) as opening_credit 
+		from `tabGL Entry`
+		where 
+			company=%(company)s
+			{additional_conditions}
+			and posting_date < %(from_date)s
+			and account in (select name from `tabAccount` where report_type=%(report_type)s)
+		group by account""".format(additional_conditions=additional_conditions),
+		{
+			"company": filters.company,
+			"from_date": filters.from_date,
+			"report_type": report_type,
+			"year_start_date": filters.year_start_date
+		},
+		as_dict=True)
+		
+	opening = frappe._dict()
+	for d in gle:
+		opening.setdefault(d.account, d)
+		
+	return opening
+
+def calculate_values(accounts, gl_entries_by_account, opening_balances, filters):
 	init = {
 		"opening_debit": 0.0,
 		"opening_credit": 0.0,
@@ -88,30 +129,16 @@ def calculate_values(accounts, gl_entries_by_account, filters):
 		d.update(init.copy())
 
 		for entry in gl_entries_by_account.get(d.name, []):
-			posting_date = getdate(entry.posting_date)
-
-			# opening
-			if posting_date < filters.from_date:
-				is_valid_opening = (d.root_type in ("Asset", "Liability", "Equity") or
-					(filters.year_start_date <= posting_date < filters.from_date))
-
-				if is_valid_opening:
-					d["opening_debit"] += flt(entry.debit)
-					d["opening_credit"] += flt(entry.credit)
-
-			elif posting_date <= filters.to_date:
-
-				if entry.is_opening == "Yes" and d.root_type in ("Asset", "Liability", "Equity"):
-					d["opening_debit"] += flt(entry.debit)
-					d["opening_credit"] += flt(entry.credit)
-
-				else:
 			d["debit"] += flt(entry.debit)
 			d["credit"] += flt(entry.credit)
 
 		total_row["debit"] += d["debit"]
 		total_row["credit"] += d["credit"]
 		
+		# add opening
+		d["opening_debit"] = opening_balances.get(d.name, {}).get("opening_debit", 0)
+		d["opening_credit"] = opening_balances.get(d.name, {}).get("opening_credit", 0)
+
 	return total_row
 
 def accumulate_values_into_parents(accounts, accounts_by_name):

erpnext/accounts/utils.py

@@ -91,7 +91,7 @@ def get_balance_on(account=None, date=None, party_type=None, party=None):
 		# different filter for group and ledger - improved performance
 		if acc.is_group:
 			cond.append("""exists (
-				select * from `tabAccount` ac where ac.name = gle.account
+				select name from `tabAccount` ac where ac.name = gle.account
 				and ac.lft >= %s and ac.rgt <= %s
 			)""" % (acc.lft, acc.rgt))
 		else:
@@ -397,7 +397,7 @@ def get_outstanding_invoices(amount_query, account, party_type, party):
 
 	for d in outstanding_voucher_list:
 		payment_amount = frappe.db.sql("""
-			select ifnull(sum(ifnull({amount_query}, 0)), 0)
+			select ifnull(sum({amount_query}), 0)
 			from
 				`tabGL Entry`
 			where

erpnext/buying/doctype/purchase_order/purchase_order.json

@@ -26,7 +26,7 @@
    "reqd": 1
   }, 
   {
-   "description": "Supplier (vendor) name as entered in supplier master", 
+   "description": "", 
    "fieldname": "supplier", 
    "fieldtype": "Link", 
    "in_filter": 1, 
@@ -873,7 +873,7 @@
  "icon": "icon-file-text", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-05-27 02:48:02.452899", 
+ "modified": "2015-06-02 17:15:44.711032", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order", 

erpnext/buying/doctype/purchase_order_item/purchase_order_item.json

@@ -75,7 +75,7 @@
   {
    "fieldname": "description", 
    "fieldtype": "Small Text", 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "label": "Description", 
    "oldfieldname": "description", 
    "oldfieldtype": "Small Text", 
@@ -538,7 +538,7 @@
  ], 
  "idx": 1, 
  "istable": 1, 
- "modified": "2015-05-27 02:47:16.553472", 
+ "modified": "2015-06-02 14:19:21.459032", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order Item", 

erpnext/buying/doctype/quality_inspection/quality_inspection.js

@@ -57,3 +57,7 @@ cur_frm.fields_dict['item_serial_no'].get_query = function(doc, cdt, cdn) {
 
 	return { filters: filter }
 }
+
+cur_frm.add_fetch('item_code', 'item_name', 'item_name');
+cur_frm.add_fetch('item_code', 'description', 'description');
+

erpnext/buying/doctype/quality_inspection/quality_inspection.json

@@ -127,6 +127,14 @@
    "permlevel": 0, 
    "width": "50%"
   }, 
+  {
+   "fieldname": "item_name", 
+   "fieldtype": "Data", 
+   "label": "Item Name", 
+   "permlevel": 0, 
+   "precision": "", 
+   "read_only": 1
+  }, 
   {
    "fieldname": "description", 
    "fieldtype": "Small Text", 
@@ -219,7 +227,7 @@
  "icon": "icon-search", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-04-14 07:37:07.331291", 
+ "modified": "2015-06-08 02:40:25.121948", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Quality Inspection", 

erpnext/buying/doctype/quality_inspection/quality_inspection.py

@@ -31,7 +31,6 @@ class QualityInspection(Document):
 				(self.name, self.modified, self.purchase_receipt_no,
 					self.item_code))
 
-
 	def on_cancel(self):
 		if self.purchase_receipt_no:
 			frappe.db.sql("""update `tabPurchase Receipt Item` t1, `tabPurchase Receipt` t2
@@ -39,7 +38,6 @@ class QualityInspection(Document):
 				where t1.parent = %s and t1.item_code = %s and t1.parent = t2.name""",
 				(self.modified, self.purchase_receipt_no, self.item_code))
 
-
 def item_query(doctype, txt, searchfield, start, page_len, filters):
 	if filters.get("from"):
 		from frappe.desk.reportview import get_match_cond

erpnext/buying/doctype/supplier_quotation/supplier_quotation.json

@@ -26,7 +26,7 @@
    "reqd": 1
   }, 
   {
-   "description": "Supplier (vendor) name as entered in supplier master", 
+   "description": "", 
    "fieldname": "supplier", 
    "fieldtype": "Link", 
    "in_filter": 1, 
@@ -660,7 +660,7 @@
  "icon": "icon-shopping-cart", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-05-27 02:48:02.098540", 
+ "modified": "2015-06-02 17:15:57.283516", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier Quotation", 

erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json

@@ -59,7 +59,7 @@
   {
    "fieldname": "description", 
    "fieldtype": "Small Text", 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "label": "Description", 
    "oldfieldname": "description", 
    "oldfieldtype": "Small Text", 
@@ -413,7 +413,7 @@
  ], 
  "idx": 1, 
  "istable": 1, 
- "modified": "2015-05-27 02:47:15.853886", 
+ "modified": "2015-06-02 14:19:33.922968", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier Quotation Item", 

erpnext/config/learn.py

@@ -31,7 +31,7 @@ def get_data():
 				{
 					"type": "help",
 					"label": _("Opening Stock Balance"),
-					"youtube_id": "yPgrtfeCTs"
+					"youtube_id": "0yPgrtfeCTs"
 				},
 				{
 					"type": "help",
@@ -106,7 +106,7 @@ def get_data():
 				{
 					"type": "help",
 					"label": _("Opening Stock Balance"),
-					"youtube_id": "yPgrtfeCTs"
+					"youtube_id": "0yPgrtfeCTs"
 				},
 				{
 					"type": "help",

erpnext/config/stock.py

@@ -266,7 +266,7 @@ def get_data():
 				{
 					"type": "help",
 					"label": _("Opening Stock Balance"),
-					"youtube_id": "yPgrtfeCTs"
+					"youtube_id": "0yPgrtfeCTs"
 				},
 				{
 					"type": "help",

erpnext/controllers/accounts_controller.py

@@ -38,6 +38,7 @@ class AccountsController(TransactionBase):
 			convert_to_recurring(self, self.get("posting_date") or self.get("transaction_date"))
 
 	def before_recurring(self):
+		if self.meta.get_field("fiscal_year"):
 			self.fiscal_year = None
 		if self.meta.get_field("due_date"):
 			self.due_date = None
@@ -46,7 +47,7 @@ class AccountsController(TransactionBase):
 		for fieldname in ["posting_date", "transaction_date"]:
 			if not self.get(fieldname) and self.meta.get_field(fieldname):
 				self.set(fieldname, today())
-				if not self.fiscal_year:
+				if self.meta.get_field("fiscal_year") and not self.fiscal_year:
 					self.fiscal_year = get_fiscal_year(self.get(fieldname))[0]
 				break
 

erpnext/controllers/status_updater.py

@@ -78,7 +78,7 @@ class StatusUpdater(Document):
 					self.status = s[0]
 					break
 
-			if self.status != _status:
+			if self.status != _status and self.status not in ("Submitted", "Cancelled"):
 				self.add_comment("Label", _(self.status))
 
 			if update:

erpnext/crm/doctype/newsletter_list/newsletter_list.py

@@ -44,11 +44,14 @@ class NewsletterList(Document):
 		return self.update_total_subscribers()
 
 	def update_total_subscribers(self):
-		self.total_subscribers = frappe.db.sql("""select count(*) from `tabNewsletter List Subscriber`
+		self.total_subscribers = self.get_total_subscribers()
-			where newsletter_list=%s""", self.name)[0][0]
 		self.db_update()
 		return self.total_subscribers
 
+	def get_total_subscribers(self):
+		return frappe.db.sql("""select count(*) from `tabNewsletter List Subscriber`
+			where newsletter_list=%s""", self.name)[0][0]
+
 	def on_trash(self):
 		for d in frappe.get_all("Newsletter List Subscriber", "name", {"newsletter_list": self.name}):
 			frappe.delete_doc("Newsletter List Subscriber", d.name)

erpnext/crm/doctype/opportunity_item/opportunity_item.json

@@ -85,7 +85,7 @@
   {
    "fieldname": "description", 
    "fieldtype": "Text", 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "label": "Description", 
    "oldfieldname": "description", 
    "oldfieldtype": "Text", 
@@ -134,7 +134,7 @@
  ], 
  "idx": 1, 
  "istable": 1, 
- "modified": "2015-05-14 14:55:18.325286", 
+ "modified": "2015-06-02 14:18:16.622288", 
  "modified_by": "Administrator", 
  "module": "CRM", 
  "name": "Opportunity Item", 

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.13"
+app_version = "5.0.23"
 
 error_report_email = "support@erpnext.com"
 
@@ -38,16 +38,14 @@ website_route_rules = [
 	{"from_route": "/invoices", "to_route": "Sales Invoice"},
 	{"from_route": "/invoices/<path:name>", "to_route": "print", "defaults": {"doctype": "Sales Invoice"}},
 	{"from_route": "/shipments", "to_route": "Delivery Note"},
-	{"from_route": "/shipments/<path:name>", "to_route": "print", "defaults": {"doctype": "Delivery Note"}},
+	{"from_route": "/shipments/<path:name>", "to_route": "print", "defaults": {"doctype": "Delivery Note"}}
-	{"from_route": "/issues", "to_route": "Issue"},
-	{"from_route": "/issues/<path:name>", "to_route": "print", "defaults": {"doctype": "Issue"}},
-	{"from_route": "/addresses", "to_route": "Address"},
 ]
 
 has_website_permission = {
 	"Sales Order": "erpnext.controllers.website_list_for_contact.has_website_permission",
 	"Sales Invoice": "erpnext.controllers.website_list_for_contact.has_website_permission",
-	"Delivery Note": "erpnext.controllers.website_list_for_contact.has_website_permission"
+	"Delivery Note": "erpnext.controllers.website_list_for_contact.has_website_permission",
+	"Issue": "erpnext.support.doctype.issue.issue.has_website_permission"
 }
 
 dump_report_map = "erpnext.startup.report_data_map.data_map"

erpnext/hr/doctype/leave_allocation/leave_allocation.py

@@ -23,9 +23,6 @@ class LeaveAllocation(Document):
 	def on_update(self):
 		self.get_total_allocated_leaves()
 
-	def on_cancel(self):
-		self.check_for_leave_application()
-
 	def validate_new_leaves_allocated_value(self):
 		"""validate that leave allocation is in multiples of 0.5"""
 		if flt(self.new_leaves_allocated) % 0.5:

erpnext/hr/doctype/leave_control_panel/leave_control_panel.js

@@ -25,3 +25,7 @@ cur_frm.cscript.allocation_type = function (doc, cdt, cdn){
 	doc.no_of_days = '';
 	refresh_field('no_of_days');
 }
+
+frappe.ui.form.on("Leave Control Panel", "refresh", function(frm) {
+	frm.disable_save();
+});

erpnext/hr/doctype/leave_control_panel/leave_control_panel.json

@@ -94,11 +94,11 @@
   }
  ], 
  "hide_heading": 0, 
- "hide_toolbar": 0, 
+ "hide_toolbar": 1, 
  "icon": "icon-cog", 
  "idx": 1, 
  "issingle": 1, 
- "modified": "2015-02-05 05:11:40.791976", 
+ "modified": "2015-06-05 11:38:19.994852", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Control Panel", 
@@ -110,7 +110,7 @@
    "read": 1, 
    "report": 0, 
    "role": "HR User", 
-   "share": 1, 
+   "share": 0, 
    "submit": 0, 
    "write": 1
   }

erpnext/hr/doctype/salary_manager/salary_manager.js

@@ -43,3 +43,8 @@ cur_frm.cscript.make_jv = function(doc, dt, dn) {
 		frappe.set_route("Form", doc.doctype, doc.name);
 	});
 }
+
+
+frappe.ui.form.on("Salary Manager", "refresh", function(frm) {
+	frm.disable_save();
+});

erpnext/hr/doctype/salary_manager/salary_manager.json

@@ -150,10 +150,11 @@
    "permlevel": 0
   }
  ], 
+ "hide_toolbar": 1, 
  "icon": "icon-cog", 
  "idx": 1, 
  "issingle": 1, 
- "modified": "2015-02-25 07:21:04.778082", 
+ "modified": "2015-06-05 11:33:00.152362", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Manager", 

erpnext/hr/doctype/upload_attendance/upload_attendance.js

@@ -12,6 +12,7 @@ erpnext.hr.AttendanceControlPanel = frappe.ui.form.Controller.extend({
 	},
 
 	refresh: function() {
+		this.frm.disable_save();
 		this.show_upload();
 	},
 

erpnext/hr/doctype/upload_attendance/upload_attendance.json

@@ -1,4 +1,5 @@
 {
+ "allow_copy": 1, 
  "creation": "2013-01-25 11:34:53", 
  "docstatus": 0, 
  "doctype": "DocType", 
@@ -53,11 +54,13 @@
    "permlevel": 0
   }
  ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 1, 
  "icon": "icon-upload-alt", 
  "idx": 1, 
  "issingle": 1, 
  "max_attachments": 1, 
- "modified": "2015-02-05 05:11:48.540845", 
+ "modified": "2015-06-05 11:37:04.348120", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Upload Attendance", 
@@ -65,25 +68,25 @@
  "permissions": [
   {
    "create": 1, 
-   "email": 1, 
+   "email": 0, 
    "permlevel": 0, 
-   "print": 1, 
+   "print": 0, 
    "read": 1, 
    "report": 0, 
    "role": "HR User", 
-   "share": 1, 
+   "share": 0, 
    "submit": 0, 
    "write": 1
   }, 
   {
    "create": 1, 
-   "email": 1, 
+   "email": 0, 
    "permlevel": 0, 
-   "print": 1, 
+   "print": 0, 
    "read": 1, 
    "report": 0, 
    "role": "HR Manager", 
-   "share": 1, 
+   "share": 0, 
    "submit": 0, 
    "write": 1
   }

erpnext/manufacturing/doctype/bom/bom.py

@@ -425,5 +425,5 @@ def validate_bom_no(item, bom_no):
 		if not getattr(frappe.flags, "in_test", False):
 			frappe.throw(_("BOM {0} must be submitted").format(bom_no))
 	if item and not (bom.item.lower() == item.lower() or \
-		bom.item.lower() == frappe.db.get_value("Item", item, "variant_of").lower()):
+		bom.item.lower() == cstr(frappe.db.get_value("Item", item, "variant_of")).lower()):
 		frappe.throw(_("BOM {0} does not belong to Item {1}").format(bom_no, item))

erpnext/manufacturing/doctype/production_order/production_order.py

@@ -309,10 +309,9 @@ class ProductionOrder(Document):
 			self.actual_end_date = None
 
 	def validate_delivery_date(self):
-		if self.docstatus==1:
+		if self.planned_start_date and self.expected_delivery_date \
-			if self.planned_end_date and self.expected_delivery_date \
+			and getdate(self.expected_delivery_date) < getdate(self.planned_start_date):
-				and getdate(self.expected_delivery_date) < getdate(self.planned_end_date):
+				frappe.throw(_("Expected Delivery Date must be greater than Planned Start Date."))
-					frappe.msgprint(_("Production might not be able to finish by the Expected Delivery Date."))
 
 	def delete_time_logs(self):
 		for time_log in frappe.get_all("Time Log", ["name"], {"production_order": self.name}):

erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json

@@ -1,4 +1,5 @@
 {
+ "allow_copy": 1, 
  "creation": "2013-01-21 12:03:47", 
  "default_print_format": "Standard", 
  "docstatus": 0, 
@@ -154,11 +155,12 @@
    "permlevel": 0
   }
  ], 
+ "hide_toolbar": 1, 
  "icon": "icon-calendar", 
  "idx": 1, 
  "in_create": 1, 
  "issingle": 1, 
- "modified": "2015-02-05 05:11:43.010625", 
+ "modified": "2015-06-05 11:44:31.629114", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Production Planning Tool", 

erpnext/patches.txt

@@ -161,3 +161,9 @@ erpnext.patches.v5_0.set_footer_address
 execute:frappe.db.set_value("Backup Manager", None, "send_backups_to_dropbox", 1 if frappe.db.get_value("Backup Manager", None, "upload_backups_to_dropbox") in ("Daily", "Weekly") else 0)
 execute:frappe.db.sql_list("delete from `tabDocPerm` where parent='Issue' and modified_by='Administrator' and role='Guest'")
 erpnext.patches.v5_0.update_item_and_description_again
+erpnext.patches.v5_0.repost_gle_for_jv_with_multiple_party
+erpnext.patches.v5_0.portal_fixes
+erpnext.patches.v5_0.reset_values_in_tools
+execute:frappe.delete_doc("Page", "users")
+erpnext.patches.v5_0.update_material_transferred_for_manufacturing_again
+erpnext.patches.v5_0.index_on_account_and_gl_entry

erpnext/patches/v5_0/index_on_account_and_gl_entry.py

@@ -0,0 +1,22 @@
+from __future__ import unicode_literals
+
+import frappe
+
+def execute():
+	index_map = {
+		"Account": ["parent_account", "lft", "rgt"],
+		"GL Entry": ["posting_date", "account", 'party', "voucher_no"]
+	}
+	
+	for dt, indexes in index_map.items():
+		existing_indexes = [d.Key_name for d in frappe.db.sql("""show index from `tab{0}` 
+			where Column_name != 'name'""".format(dt), as_dict=1)]
+
+		for old in existing_indexes:
+			if old in ("parent", "group_or_ledger", "is_pl_account", "debit_or_credit", "account_name", "company"):
+				frappe.db.sql("alter table `tab{0}` drop index {1}".format(dt, old))
+				existing_indexes.remove(old)
+							
+		for new in indexes:
+			if new not in existing_indexes:
+				frappe.db.sql("alter table `tab{0}` add index ({1})".format(dt, new))

erpnext/patches/v5_0/portal_fixes.py

@@ -0,0 +1,6 @@
+import frappe
+import erpnext.setup.install
+
+def execute():
+	frappe.reload_doc("website", "doctype", "web_form_field", force=True)
+	erpnext.setup.install.add_web_forms()

erpnext/patches/v5_0/repost_gle_for_jv_with_multiple_party.py

@@ -0,0 +1,26 @@
+# 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():
+	je_list = frappe.db.sql_list("""
+		select par.name from `tabJournal Entry` par 
+		where par.docstatus=1 and par.creation > '2015-03-01'
+			and (select count(distinct child.party) from `tabJournal Entry Account` child
+				where par.name=child.parent and ifnull(child.party, '') != '') > 1	
+	""")
+	
+	for d in je_list:		
+		# delete existing gle
+		frappe.db.sql("delete from `tabGL Entry` where voucher_type='Journal Entry' and voucher_no=%s", d)
+		
+		# repost gl entries
+		je = frappe.get_doc("Journal Entry", d)
+		je.make_gl_entries()
+		
+	if je_list:
+		print je_list
+		
+		

erpnext/patches/v5_0/reset_values_in_tools.py

@@ -0,0 +1,11 @@
+# Copyright (c) 2013, Frappe 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 ["Payment Tool", "Bank Reconciliation", "Payment Reconciliation", "Leave Control Panel", 
+		"Salary Manager", "Upload Attenadance", "Production Planning Tool", "BOM Replace Tool"]:
+			frappe.db.sql("delete from `tabSingles` where doctype=%s", dt)
+		

erpnext/patches/v5_0/update_material_transferred_for_manufacturing_again.py

@@ -0,0 +1,18 @@
+import frappe
+
+def execute():
+	pro_order_qty_transferred = frappe._dict()
+	for se in frappe.db.sql("""select production_order, sum(fg_completed_qty) as transferred_qty 
+		from `tabStock Entry`
+		where docstatus=1 and ifnull(production_order, '') != ''
+		and purpose = 'Material Transfer for Manufacture'
+		group by production_order""", as_dict=1):
+			pro_order_qty_transferred.setdefault(se.production_order, se.transferred_qty)
+	
+	for d in frappe.get_all("Production Order", filters={"docstatus": 1}, fields=["name", "qty"]):
+		if d.name in pro_order_qty_transferred:
+			material_transferred_for_manufacturing = pro_order_qty_transferred.get(d.name) \
+				if pro_order_qty_transferred.get(d.name) <= d.qty else d.qty		
+		
+			frappe.db.sql("""update `tabProduction Order` set material_transferred_for_manufacturing=%s
+				where name=%s""", (material_transferred_for_manufacturing, d.name))

erpnext/projects/doctype/activity_cost/activity_cost.js

@@ -0,0 +1 @@
+cur_frm.add_fetch('employee', 'employee_name', 'employee_name');

erpnext/projects/doctype/activity_cost/activity_cost.json

@@ -2,7 +2,7 @@
  "allow_copy": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
- "autoname": "Activity Cost - .#", 
+ "autoname": "AC-.#####", 
  "creation": "2015-03-23 02:00:21.861546", 
  "custom": 0, 
  "docstatus": 0, 
@@ -31,11 +31,12 @@
   }, 
   {
    "fieldname": "employee_name", 
-   "fieldtype": "Read Only", 
+   "fieldtype": "Data", 
    "label": "Employee Name", 
-   "options": "employee.employee_name", 
+   "options": "", 
    "permlevel": 0, 
-   "precision": ""
+   "precision": "", 
+   "read_only": 1
   }, 
   {
    "fieldname": "column_break_2", 
@@ -135,7 +136,7 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-04-14 02:08:33.690406", 
+ "modified": "2015-06-11 06:50:47.999788", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Activity Cost", 

erpnext/projects/doctype/activity_cost/activity_cost.py

@@ -15,6 +15,8 @@ class ActivityCost(Document):
 		self.check_unique()
 		
 	def set_title(self):
+		if not self.employee_name:
+			self.employee_name = frappe.db.get_value("Employee", self.employee, "employee_name")
 		self.title = _("{0} for {1}").format(self.employee_name, self.activity_type)
 		
 	def check_unique(self):

erpnext/projects/doctype/project/project.py

@@ -15,7 +15,8 @@ class Project(Document):
 
 	def onload(self):
 		"""Load project tasks for quick view"""
-		for task in frappe.get_all("Task", "*", {"project": self.name}, order_by="exp_start_date asc"):
+		if not self.get("tasks"):
+			for task in self.get_tasks():
 				self.append("tasks", {
 					"title": task.subject,
 					"status": task.status,
@@ -25,6 +26,12 @@ class Project(Document):
 					"task_id": task.name
 				})
 			
+	def __setup__(self):
+		self.onload()
+	
+	def get_tasks(self):
+		return frappe.get_all("Task", "*", {"project": self.name}, order_by="exp_start_date asc")
+		
 	def validate(self):
 		self.validate_dates()
 		self.sync_tasks()

erpnext/projects/doctype/task/task.py

@@ -29,6 +29,10 @@ class Task(Document):
 	def validate(self):
 		self.validate_dates()
 
+		if self.status!=self.get_db_value("status") and self.status == "Closed":
+			from frappe.desk.form.assign_to import clear
+			clear(self.doctype, self.name)
+
 	def validate_dates(self):
 		if self.exp_start_date and self.exp_end_date and getdate(self.exp_start_date) > getdate(self.exp_end_date):
 			frappe.throw(_("'Expected Start Date' can not be greater than 'Expected End Date'"))

erpnext/projects/doctype/task/test_task.py

@@ -146,3 +146,34 @@ class TestTask(unittest.TestCase):
 		self.assertEqual(frappe.db.get_value("Task", task3.name, "exp_start_date"), getdate('2015-1-26'))
 		self.assertEqual(frappe.db.get_value("Task", task3.name, "exp_end_date"), getdate('2015-1-28'))
 
+
+	def test_close_assignment(self):
+		task = frappe.new_doc("Task")
+		task.subject = "Test Close Assignment"
+		task.insert()
+
+		def assign():
+			from frappe.desk.form import assign_to
+			assign_to.add({
+				"assign_to": "test@example.com",
+				"doctype": task.doctype,
+				"name": task.name,
+				"description": "Close this task"
+			})
+
+		def get_owner_and_status():
+			return frappe.db.get_value("ToDo", filters={"reference_type": task.doctype, "reference_name": task.name,
+					"description": "Close this task"}, fieldname=("owner", "status"), as_dict=True)
+
+		assign()
+		todo = get_owner_and_status()
+		self.assertEquals(todo.owner, "test@example.com")
+		self.assertEquals(todo.status, "Open")
+
+		# assignment should be
+		task.load_from_db()
+		task.status = "Closed"
+		task.save()
+		todo = get_owner_and_status()
+		self.assertEquals(todo.owner, "test@example.com")
+		self.assertEquals(todo.status, "Closed")

erpnext/projects/doctype/time_log/time_log.py

@@ -195,8 +195,6 @@ class TimeLog(Document):
 		if self.for_manufacturing:
 			if not self.production_order:
 				frappe.throw(_("Production Order is Mandatory"))
-			if not self.operation:
-				frappe.throw(_("Operation is Mandatory"))
 			if not self.completed_qty:
 				self.completed_qty = 0
 

erpnext/public/js/controllers/transaction.js

@@ -105,6 +105,15 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 		}
 	},
 
+	barcode: function(doc, cdt, cdn) {
+		var d = locals[cdt][cdn];
+		if(d.barcode=="" || d.barcode==null) {
+			// barcode cleared, remove item
+			d.item_code = "";
+		}
+		this.item_code(doc, cdt, cdn);
+	},
+
 	item_code: function(doc, cdt, cdn) {
 		var me = this;
 		var item = frappe.get_doc(cdt, cdn);

erpnext/public/js/feature_setup.js

@@ -81,7 +81,8 @@ erpnext.feature_setup.feature_dict = {
 		'Item': {'fields': ['barcode']},
 		'Delivery Note': {'items': ['barcode']},
 		'Sales Invoice': {'items': ['barcode']},
-		'Stock Entry': {'items': ['barcode']}
+		'Stock Entry': {'items': ['barcode']},
+		'Purchase Receipt': {'items': ['barcode']}
 	},
 	'fs_item_group_in_details': {
 		'Delivery Note': {'items':['item_group']},

erpnext/public/js/stock_analytics.js

@@ -139,7 +139,7 @@ erpnext.StockAnalytics = erpnext.StockGridReport.extend({
 
 					if(sl.voucher_type=="Stock Reconciliation") {
 						var diff = (sl.qty_after_transaction * sl.valuation_rate) - item.closing_qty_value;
-						wh.fifo_stack.push([sl.qty_after_transaction, sl.valuation_rate, sl.posting_date]);
+						wh.fifo_stack = [[sl.qty_after_transaction, sl.valuation_rate, sl.posting_date]];
 						wh.balance_qty = sl.qty_after_transaction;
 						wh.balance_value = sl.valuation_rate * sl.qty_after_transaction;
 					} else {
@@ -167,7 +167,6 @@ erpnext.StockAnalytics = erpnext.StockGridReport.extend({
 	},
 	update_groups: function() {
 		var me = this;
-
 		$.each(this.data, function(i, item) {
 			// update groups
 			if(!item.is_group && me.apply_filter(item, "brand")) {

erpnext/selling/doctype/quotation_item/quotation_item.json

@@ -55,7 +55,7 @@
   {
    "fieldname": "description", 
    "fieldtype": "Small Text", 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "label": "Description", 
    "oldfieldname": "description", 
    "oldfieldtype": "Small Text", 
@@ -298,12 +298,13 @@
   }, 
   {
    "fieldname": "prevdoc_doctype", 
-   "fieldtype": "Data", 
+   "fieldtype": "Link", 
    "hidden": 1, 
    "label": "Against Doctype", 
    "no_copy": 1, 
    "oldfieldname": "prevdoc_doctype", 
    "oldfieldtype": "Data", 
+   "options": "DocType", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_width": "150px", 
@@ -313,11 +314,12 @@
   }, 
   {
    "fieldname": "prevdoc_docname", 
-   "fieldtype": "Data", 
+   "fieldtype": "Dynamic Link", 
    "label": "Against Docname", 
    "no_copy": 1, 
    "oldfieldname": "prevdoc_docname", 
    "oldfieldtype": "Data", 
+   "options": "prevdoc_doctype", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_width": "150px", 
@@ -390,7 +392,7 @@
  ], 
  "idx": 1, 
  "istable": 1, 
- "modified": "2015-05-27 02:47:15.474119", 
+ "modified": "2015-06-02 14:18:00.266748", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Quotation Item", 

erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js

@@ -8,6 +8,13 @@ frappe.query_reports["Customers Not Buying Since Long Time"] = {
 			"label": __("Days Since Last Order"),
 			"fieldtype": "Int",
 			"default": 60
+		},
+		{
+			"fieldname":"doctype",
+			"label": __("Doctype"),
+			"fieldtype": "Select",
+			"default": "Sales Order",
+			"options": "Sales Order\nSales Invoice"
 		}
 	]
 }

erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py

@@ -10,41 +10,51 @@ def execute(filters=None):
 	if not filters: filters ={}
 
 	days_since_last_order = filters.get("days_since_last_order")
+	doctype = filters.get("doctype")
+	
 	if cint(days_since_last_order) <= 0:
 		frappe.throw(_("'Days Since Last Order' must be greater than or equal to zero"))
 
 	columns = get_columns()
-	customers = get_so_details()
+	customers = get_sales_details(doctype)
 
 	data = []
 	for cust in customers:
 		if cint(cust[8]) >= cint(days_since_last_order):
-			cust.insert(7,get_last_so_amt(cust[0]))
+			cust.insert(7,get_last_sales_amt(cust[0], doctype))
 			data.append(cust)
 	return columns, data
 
-def get_so_details():
+def get_sales_details(doctype):
+	cond = """sum(so.base_net_total) as 'total_order_considered',
+			max(so.posting_date) as 'last_order_date',
+			DATEDIFF(CURDATE(), max(so.posting_date)) as 'days_since_last_order' """
+	if doctype == "Sales Order":
+		cond = """sum(if(so.status = "Stopped",
+				so.base_net_total * so.per_delivered/100,
+				so.base_net_total)) as 'total_order_considered',
+			max(so.transaction_date) as 'last_order_date',
+			DATEDIFF(CURDATE(), max(so.transaction_date)) as 'days_since_last_order'"""
+	
 	return frappe.db.sql("""select
 			cust.name,
 			cust.customer_name,
 			cust.territory,
 			cust.customer_group,
 			count(distinct(so.name)) as 'num_of_order',
-			sum(base_net_total) as 'total_order_value',
+			sum(base_net_total) as 'total_order_value', {0}
-			sum(if(so.status = "Stopped",
+		from `tabCustomer` cust, `tab{1}` so
-				so.base_net_total * so.per_delivered/100,
-				so.base_net_total)) as 'total_order_considered',
-			max(so.transaction_date) as 'last_sales_order_date',
-			DATEDIFF(CURDATE(), max(so.transaction_date)) as 'days_since_last_order'
-		from `tabCustomer` cust, `tabSales Order` so
 		where cust.name = so.customer and so.docstatus = 1
 		group by cust.name
-		order by 'days_since_last_order' desc """,as_list=1)
+		order by 'days_since_last_order' desc """.format(cond, doctype), as_list=1)
 
-def get_last_so_amt(customer):
+def get_last_sales_amt(customer, doctype):
-	res =  frappe.db.sql("""select base_net_total from `tabSales Order`
+	cond = "posting_date"
-		where customer ='%(customer)s' and docstatus = 1 order by transaction_date desc
+	if doctype =="Sales Order":
-		limit 1""" % {'customer': frappe.db.escape(customer)})
+		cond = "transaction_date"
+	res =  frappe.db.sql("""select base_net_total from `tab{0}`
+		where customer = %s and docstatus = 1 order by {1} desc
+		limit 1""".format(doctype, cond), customer)
 
 	return res and res[0][0] or 0
 
@@ -58,6 +68,6 @@ def get_columns():
 		_("Total Order Value") + ":Currency:120",
 		_("Total Order Considered") + ":Currency:160",
 		_("Last Order Amount") + ":Currency:160",
-		_("Last Sales Order Date") + ":Date:160",
+		_("Last Order Date") + ":Date:160",
 		_("Days Since Last Order") + "::160"
 	]

erpnext/selling/sales_common.js

@@ -124,15 +124,6 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
 		this.apply_pricing_rule();
 	},
 
-	barcode: function(doc, cdt, cdn) {
-		var d = locals[cdt][cdn];
-		if(d.barcode=="" || d.barcode==null) {
-			// barcode cleared, remove item
-			d.item_code = "";
-		}
-		this.item_code(doc, cdt, cdn);
-	},
-
 	selling_price_list: function() {
 		this.apply_price_list();
 	},

erpnext/setup/doctype/company/company.js

@@ -124,9 +124,9 @@ erpnext.company.setup_queries = function(frm) {
 		["default_cash_account", {"account_type": "Cash"}], 
 		["default_receivable_account", {"account_type": "Receivable"}], 
 		["default_payable_account", {"account_type": "Payable"}], 
-		["default_expense_account", {"report_type": "Profit and Loss"}], 
+		["default_expense_account", {"root_type": "Expense"}], 
-		["default_income_account", {"report_type": "Profit and Loss"}], 
+		["default_income_account", {"root_type": "Income"}], 
-		["round_off_account", {"account_type": "Profit and Loss"}],
+		["round_off_account", {"root_type": "Expense"}],
 		["cost_center", {}],
 		["round_off_cost_center", {}]
 	], function(i, v) {
@@ -135,8 +135,8 @@ erpnext.company.setup_queries = function(frm) {
 	
 	if (sys_defaults.auto_accounting_for_stock) {
 		$.each([
-			["stock_adjustment_account", {"report_type": "Profit and Loss"}], 
+			["stock_adjustment_account", {"root_type": "Expense"}], 
-			["expenses_included_in_valuation", {"report_type": "Profit and Loss"}],
+			["expenses_included_in_valuation", {"root_type": "Expense"}],
 			["stock_received_but_not_billed", {"report_type": "Balance Sheet"}]
 		], function(i, v) {
 			erpnext.company.set_custom_query(frm, v);
@@ -146,10 +146,9 @@ erpnext.company.setup_queries = function(frm) {
 
 erpnext.company.set_custom_query = function(frm, v) {
 	var filters = {
-		"company": frm.doc.company,
+		"company": frm.doc.name,
 		"is_group": 0
 	};
-	
 	for (var key in v[1]) 
 		filters[key] = v[1][key];
 

erpnext/setup/doctype/company/delete_company_transactions.py

@@ -27,12 +27,7 @@ def delete_for_doctype(doctype, company_name):
 	company_fieldname = meta.get("fields", {"fieldtype": "Link",
 		"options": "Company"})[0].fieldname
 
-	if meta.issingle:
+	if not meta.issingle:
-		single = frappe.get_doc(doctype, doctype)
-		single.set(company_fieldname, "")
-		single.flags.ignore_mandatory = True
-		single.save()
-	else:
 		if not meta.istable:
 			# delete children
 			for df in meta.get_table_fields():

erpnext/setup/doctype/item_group/item_group.py

@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe
-
+import urllib
 from frappe.utils.nestedset import NestedSet
 from frappe.website.website_generator import WebsiteGenerator
 from frappe.website.render import clear_cache
@@ -91,7 +91,7 @@ def get_item_for_list_in_html(context):
 	# add missing absolute link in files
 	# user may forget it during upload
 	if (context.get("website_image") or "").startswith("files/"):
-		context["website_image"] = "/" + context["website_image"]
+		context["website_image"] = "/" + urllib.quote(context["website_image"])
 	return frappe.get_template("templates/includes/product_in_grid.html").render(context)
 
 def get_group_item_count(item_group):

erpnext/setup/doctype/naming_series/naming_series.py

@@ -12,7 +12,6 @@ from frappe.model.document import Document
 class NamingSeriesNotSetError(frappe.ValidationError): pass
 
 class NamingSeries(Document):
-
 	def get_transactions(self, arg=None):
 		doctypes = list(set(frappe.db.sql_list("""select parent
 				from `tabDocField` where fieldname='naming_series'""")
@@ -50,7 +49,7 @@ class NamingSeries(Document):
 		self.set_series_for(self.select_doc_for_series, series_list)
 
 		# create series
-		map(self.insert_series, [d.split('.')[0] for d in series_list])
+		map(self.insert_series, [d.split('.')[0] for d in series_list if d.strip()])
 
 		msgprint(_("Series Updated"))
 

erpnext/setup/fixtures/web_form/addresses.json

@@ -0,0 +1,167 @@
+[
+ {
+  "allow_comments": 0, 
+  "allow_delete": 0, 
+  "allow_edit": 1, 
+  "allow_multiple": 1, 
+  "breadcrumbs": null, 
+  "doc_type": "Address", 
+  "docstatus": 0, 
+  "doctype": "Web Form", 
+  "introduction_text": null, 
+  "login_required": 1, 
+  "modified": "2015-06-01 06:53:43.699336", 
+  "name": "addresses", 
+  "page_name": "addresses", 
+  "published": 1, 
+  "success_message": null, 
+  "success_url": "/addresses", 
+  "title": "Addresses", 
+  "web_form_fields": [
+   {
+    "default": null, 
+    "description": "", 
+    "fieldname": "address_title", 
+    "fieldtype": "Data", 
+    "hidden": 0, 
+    "label": "Address Title", 
+    "options": null, 
+    "read_only": 0, 
+    "reqd": 0
+   }, 
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": "address_type", 
+    "fieldtype": "Select", 
+    "hidden": 0, 
+    "label": "Address Type", 
+    "options": "Billing\nShipping\nOffice\nPersonal\nPlant\nPostal\nShop\nSubsidiary\nWarehouse\nOther", 
+    "read_only": 0, 
+    "reqd": 1
+   }, 
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": "address_line1", 
+    "fieldtype": "Data", 
+    "hidden": 0, 
+    "label": "Address Line 1", 
+    "options": null, 
+    "read_only": 0, 
+    "reqd": 1
+   }, 
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": "address_line2", 
+    "fieldtype": "Data", 
+    "hidden": 0, 
+    "label": "Address Line 2", 
+    "options": null, 
+    "read_only": 0, 
+    "reqd": 0
+   }, 
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": "city", 
+    "fieldtype": "Data", 
+    "hidden": 0, 
+    "label": "City/Town", 
+    "options": null, 
+    "read_only": 0, 
+    "reqd": 1
+   }, 
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": "state", 
+    "fieldtype": "Data", 
+    "hidden": 0, 
+    "label": "State", 
+    "options": null, 
+    "read_only": 0, 
+    "reqd": 0
+   }, 
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": "pincode", 
+    "fieldtype": "Data", 
+    "hidden": 0, 
+    "label": "Pincode", 
+    "options": null, 
+    "read_only": 0, 
+    "reqd": 0
+   }, 
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": "country", 
+    "fieldtype": "Data", 
+    "hidden": 0, 
+    "label": "Country", 
+    "options": "Country", 
+    "read_only": 0, 
+    "reqd": 1
+   }, 
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": null, 
+    "fieldtype": "Column Break", 
+    "hidden": null, 
+    "label": null, 
+    "options": null, 
+    "read_only": null, 
+    "reqd": null
+   }, 
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": "email_id", 
+    "fieldtype": "Data", 
+    "hidden": 0, 
+    "label": "Email Id", 
+    "options": null, 
+    "read_only": 0, 
+    "reqd": 0
+   }, 
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": "phone", 
+    "fieldtype": "Data", 
+    "hidden": 0, 
+    "label": "Phone", 
+    "options": null, 
+    "read_only": 0, 
+    "reqd": 1
+   }, 
+   {
+    "default": "0", 
+    "description": "", 
+    "fieldname": "is_primary_address", 
+    "fieldtype": "Check", 
+    "hidden": 0, 
+    "label": "Preferred Billing Address", 
+    "options": null, 
+    "read_only": 0, 
+    "reqd": 0
+   }, 
+   {
+    "default": "0", 
+    "description": "", 
+    "fieldname": "is_shipping_address", 
+    "fieldtype": "Check", 
+    "hidden": 0, 
+    "label": "Preferred Shipping Address", 
+    "options": null, 
+    "read_only": 0, 
+    "reqd": 0
+   }
+  ], 
+  "web_page_link_text": null
+ }
+]

erpnext/setup/fixtures/web_form/issues.json

@@ -0,0 +1,68 @@
+[
+ {
+  "allow_comments": 1, 
+  "allow_delete": 1, 
+  "allow_edit": 1, 
+  "allow_multiple": 1, 
+  "breadcrumbs": "[{\"title\":\"Issues\", \"name\":\"issues\"}]", 
+  "doc_type": "Issue", 
+  "docstatus": 0, 
+  "doctype": "Web Form", 
+  "introduction_text": null, 
+  "login_required": 1, 
+  "modified": "2015-06-01 08:14:26.350792", 
+  "name": "issues", 
+  "page_name": "issues", 
+  "published": 1, 
+  "success_message": "", 
+  "success_url": "/issues", 
+  "title": "Issues", 
+  "web_form_fields": [
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": "subject", 
+    "fieldtype": "Data", 
+    "hidden": 0, 
+    "label": "Subject", 
+    "options": null, 
+    "read_only": 0, 
+    "reqd": 1
+   }, 
+   {
+    "default": "Open", 
+    "description": null, 
+    "fieldname": "status", 
+    "fieldtype": "Select", 
+    "hidden": null, 
+    "label": "Status", 
+    "options": "Open\nReplied\nHold\nClosed", 
+    "read_only": 1, 
+    "reqd": 0
+   }, 
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": "description", 
+    "fieldtype": "Text", 
+    "hidden": 0, 
+    "label": "Description", 
+    "options": null, 
+    "read_only": 0, 
+    "reqd": 0
+   }, 
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": "attachment", 
+    "fieldtype": "Attach", 
+    "hidden": null, 
+    "label": "Attachment", 
+    "options": null, 
+    "read_only": null, 
+    "reqd": null
+   }
+  ], 
+  "web_page_link_text": null
+ }
+]

erpnext/setup/install.py

@@ -15,6 +15,7 @@ def after_install():
 	feature_setup()
 	from erpnext.setup.page.setup_wizard.setup_wizard import add_all_roles_to
 	add_all_roles_to("Administrator")
+	add_web_forms()
 	frappe.db.commit()
 
 def feature_setup():
@@ -48,3 +49,12 @@ def set_single_defaults():
 				pass
 
 	frappe.db.set_default("date_format", "dd-mm-yyyy")
+
+def add_web_forms():
+	"""Import web forms for Issues and Addresses"""
+	from frappe.modules.import_file import import_file_by_path
+
+	import_file_by_path(frappe.get_app_path("erpnext", "setup/fixtures/web_form/issues.json"),
+		data_import=True)
+	import_file_by_path(frappe.get_app_path("erpnext", "setup/fixtures/web_form/addresses.json"),
+		data_import=True)

erpnext/setup/page/setup_wizard/setup_wizard.js

@@ -215,6 +215,7 @@ $.extend(erpnext.wiz, {
 
 					slide.get_field("language")
 						.set_input(erpnext.wiz.welcome.data.default_language || "english");
+					moment.locale("en");
 				}
 			});
 		},

erpnext/shopping_cart/cart.py

@@ -5,13 +5,14 @@ from __future__ import unicode_literals
 import frappe
 from frappe import throw, _
 import frappe.defaults
-from frappe.utils import flt, get_fullname, fmt_money, cstr
+from frappe.utils import cint, flt, get_fullname, fmt_money, cstr
 from erpnext.utilities.doctype.address.address import get_address_display
 from frappe.utils.nestedset import get_root_of
 
 class WebsitePriceListMissingError(frappe.ValidationError): pass
 
 def set_cart_count(quotation=None):
+	if cint(frappe.db.get_singles_value("Shopping Cart Settings", "enabled")):
 		if not quotation:
 			quotation = _get_cart_quotation()
 		cart_count = cstr(len(quotation.get("items")))
@@ -29,7 +30,7 @@ def get_cart_quotation(doc=None):
 	return {
 		"doc": decorate_quotation_doc(doc),
 		"addresses": [{"name": address.name, "display": address.display}
-			for address in get_address_docs(party)],
+			for address in get_address_docs(party=party)],
 		"shipping_rules": get_applicable_shipping_rules(party)
 	}
 
@@ -281,12 +282,13 @@ def get_lead_or_customer():
 
 		return lead_doc
 
-def get_address_docs(party=None):
+def get_address_docs(doctype=None, txt=None, filters=None, limit_start=0, limit_page_length=20, party=None):
 	if not party:
 		party = get_lead_or_customer()
 
 	address_docs = frappe.db.sql("""select * from `tabAddress`
-		where `%s`=%s order by name""" % (party.doctype.lower(), "%s"), party.name,
+		where `{0}`=%s order by name limit {1}, {2}""".format(party.doctype.lower(),
+			limit_start, limit_page_length), party.name,
 		as_dict=True, update={"doctype": "Address"})
 
 	for address in address_docs:

erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py

@@ -8,7 +8,7 @@ import frappe
 from frappe import _, msgprint
 from frappe.utils import comma_and
 from frappe.model.document import Document
-from frappe.utils.nestedset import get_ancestors_of
+from frappe.utils.nestedset import get_ancestors_of, get_root_of
 from erpnext.utilities.doctype.address.address import get_territory_from_address
 
 class ShoppingCartSetupError(frappe.ValidationError): pass
@@ -42,7 +42,7 @@ class ShoppingCartSettings(Document):
 		return territory_name_map
 
 	def validate_price_lists(self):
-		territory_name_map = self.validate_overlapping_territories("price_lists", "selling_price_list")
+		self.validate_overlapping_territories("price_lists", "selling_price_list")
 
 		# validate that a Shopping Cart Price List exists for the default territory as a catch all!
 		price_list_for_default_territory = self.get_name_from_territory(self.default_territory, "price_lists",
@@ -131,7 +131,8 @@ class ShoppingCartSettings(Document):
 	def get_price_list(self, billing_territory):
 		price_list = self.get_name_from_territory(billing_territory, "price_lists", "selling_price_list")
 		if not (price_list and price_list[0]):
-			price_list = self.get_name_from_territory(self.default_territory, "price_lists", "selling_price_list")
+			price_list = self.get_name_from_territory(self.default_territory or get_root_of("Territory"),
+				"price_lists", "selling_price_list")
 
 		return price_list and price_list[0] or None
 
@@ -165,7 +166,7 @@ def is_cart_enabled():
 	return get_shopping_cart_settings().enabled
 
 def get_default_territory():
-	return get_shopping_cart_settings().default_territory
+	return get_shopping_cart_settings().default_territory or get_root_of("Territory")
 
 def check_shopping_cart_enabled():
 	if not get_shopping_cart_settings().enabled:

erpnext/shopping_cart/utils.py

@@ -6,7 +6,6 @@ from __future__ import unicode_literals
 import frappe
 from frappe import _
 import frappe.defaults
-from frappe.utils import cint
 from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings import is_cart_enabled
 
 def show_cart_count():
@@ -44,6 +43,6 @@ def update_my_account_context(context):
 		{"label": _("Orders"), "url": "orders"},
 		{"label": _("Invoices"), "url": "invoices"},
 		{"label": _("Shipments"), "url": "shipments"},
-		# {"label": _("Issues"), "url": "tickets"},
+		{"label": _("Issues"), "url": "issues"},
 		{"label": _("Addresses"), "url": "addresses"},
 	])

erpnext/stock/doctype/delivery_note_item/delivery_note_item.json

@@ -65,7 +65,7 @@
   {
    "fieldname": "description", 
    "fieldtype": "Small Text", 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "label": "Description", 
    "oldfieldname": "description", 
    "oldfieldtype": "Small Text", 
@@ -523,7 +523,7 @@
  ], 
  "idx": 1, 
  "istable": 1, 
- "modified": "2015-05-27 02:47:16.946934", 
+ "modified": "2015-06-02 14:18:34.512236", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note Item", 

erpnext/stock/doctype/item/test_item.py

@@ -90,7 +90,7 @@ class TestItem(unittest.TestCase):
 			"income_account": "Sales - _TC",
 			"expense_account": "_Test Account Cost for Goods Sold - _TC",
 			"cost_center": "_Test Cost Center 2 - _TC",
-			"qty": 0.0,
+			"qty": 1.0,
 			"price_list_rate": 100.0,
 			"base_price_list_rate": 0.0,
 			"discount_percentage": 0.0,

erpnext/stock/doctype/material_request/material_request.json

@@ -221,7 +221,7 @@
  "icon": "icon-ticket", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-05-27 15:36:06.818491", 
+ "modified": "2015-06-09 05:47:05.934432", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Material Request", 

erpnext/stock/doctype/material_request/material_request_list.js

@@ -6,7 +6,13 @@ frappe.listview_settings['Material Request'] = {
 		} else if(doc.docstatus==1 && flt(doc.per_ordered) < 100) {
 			return [__("Pending"), "orange", "per_ordered,<,100"];
 		} else if(doc.docstatus==1 && flt(doc.per_ordered) == 100) {
+			if (doc.material_request_type == "Purchase") {
 				return [__("Ordered"), "green", "per_ordered,=,100"];
+			} else if (doc.material_request_type == "Material Transfer") {
+				return [__("Transfered"), "green", "per_ordered,=,100"];
+			} else if (doc.material_request_type == "Material Issue") {
+				return [__("Issued"), "green", "per_ordered,=,100"];
+			}
 		}
 	}
 };

erpnext/stock/doctype/material_request_item/material_request_item.json

@@ -48,7 +48,7 @@
   {
    "fieldname": "description", 
    "fieldtype": "Text", 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "label": "Description", 
    "oldfieldname": "description", 
    "oldfieldtype": "Text", 
@@ -264,7 +264,7 @@
  ], 
  "idx": 1, 
  "istable": 1, 
- "modified": "2015-02-19 01:07:00.695393", 
+ "modified": "2015-06-02 14:19:45.611733", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Material Request Item", 

erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json

@@ -4,6 +4,19 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "fields": [
+  {
+   "fieldname": "barcode", 
+   "fieldtype": "Data", 
+   "label": "Barcode", 
+   "permlevel": 0, 
+   "precision": ""
+  }, 
+  {
+   "fieldname": "section_break_2", 
+   "fieldtype": "Section Break", 
+   "permlevel": 0, 
+   "precision": ""
+  }, 
   {
    "fieldname": "item_code", 
    "fieldtype": "Link", 
@@ -49,7 +62,7 @@
   {
    "fieldname": "description", 
    "fieldtype": "Text", 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "label": "Description", 
    "oldfieldname": "description", 
    "oldfieldtype": "Text", 
@@ -642,7 +655,7 @@
  ], 
  "idx": 1, 
  "istable": 1, 
- "modified": "2015-05-27 02:47:16.086625", 
+ "modified": "2015-06-08 08:21:18.024324", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Purchase Receipt Item", 

erpnext/stock/doctype/stock_entry/stock_entry.py

@@ -5,7 +5,7 @@ from __future__ import unicode_literals
 import frappe
 import frappe.defaults
 
-from frappe.utils import cstr, cint, flt, comma_or, nowdate, get_datetime
+from frappe.utils import cstr, cint, flt, comma_or, get_datetime
 
 from frappe import _
 from erpnext.stock.utils import get_incoming_rate
@@ -112,7 +112,7 @@ class StockEntry(StockController):
 
 			for f in ("uom", "stock_uom", "description", "item_name", "expense_account",
 				"cost_center", "conversion_factor"):
-					if f not in ["expense_account", "cost_center"] or not item.get(f):
+					if f in ["stock_uom", "conversion_factor"] or not item.get(f):
 						item.set(f, item_details.get(f))
 
 			if self.difference_account:
@@ -190,6 +190,8 @@ class StockEntry(StockController):
 				frappe.throw(_("Production order number is mandatory for stock entry purpose manufacture"))
 			# check for double entry
 			if self.purpose=="Manufacture":
+				if not self.fg_completed_qty:
+					frappe.throw(_("For Quantity (Manufactured Qty) is mandatory"))
 				self.check_if_operations_completed()
 				self.check_duplicate_entry_for_production_order()
 		elif self.purpose != "Material Transfer":
@@ -378,11 +380,22 @@ class StockEntry(StockController):
 
 	def validate_finished_goods(self):
 		"""validation: finished good quantity should be same as manufacturing quantity"""
+		items_with_target_warehouse = []
 		for d in self.get('items'):
 			if d.bom_no and flt(d.transfer_qty) != flt(self.fg_completed_qty):
 				frappe.throw(_("Quantity in row {0} ({1}) must be same as manufactured quantity {2}"). \
 					format(d.idx, d.transfer_qty, self.fg_completed_qty))
 					
+			if self.production_order and self.purpose == "Manufacture" and d.t_warehouse:
+				items_with_target_warehouse.append(d.item_code)
+				
+		if self.production_order and self.purpose == "Manufacture":
+			production_item = frappe.db.get_value("Production Order", 
+				self.production_order, "production_item")
+			if production_item not in items_with_target_warehouse:
+				frappe.throw(_("Finished Item {0} must be entered for Manufacture type entry")
+					.format(production_item))
+
 	def validate_return_reference_doc(self):
 		"""validate item with reference doc"""
 		ref = get_return_doc_and_details(self)
@@ -399,7 +412,6 @@ class StockEntry(StockController):
 
 			# posting date check
 			ref_posting_datetime = "%s %s" % (ref.doc.posting_date, ref.doc.posting_time or "00:00:00")
-			this_posting_datetime = "%s %s" % (self.posting_date, self.posting_time)
 
 			if get_datetime(ref_posting_datetime) < get_datetime(ref_posting_datetime):
 				from frappe.utils.dateutils import datetime_in_user_format
@@ -474,6 +486,7 @@ class StockEntry(StockController):
 			pro_doc = frappe.get_doc("Production Order", self.production_order)
 			_validate_production_order(pro_doc)
 			pro_doc.run_method("update_status")
+			if self.fg_completed_qty:
 				pro_doc.run_method("update_production_order_qty")
 				if self.purpose == "Manufacture":
 					self.update_planned_qty(pro_doc)
@@ -546,9 +559,6 @@ class StockEntry(StockController):
 		return ret
 
 	def get_items(self):
-		if not self.fg_completed_qty or not self.bom_no:
-			frappe.throw(_("BOM and Manufacturing Quantity are required"))
-
 		self.set('items', [])
 		self.validate_production_order()
 
@@ -638,17 +648,16 @@ class StockEntry(StockController):
 		issued_item_qty = self.get_issued_qty()
 
 		max_qty = flt(self.pro_doc.qty)
-		only_pending_fetched = []
-
 		for item in item_dict:
 			pending_to_issue = (max_qty * item_dict[item]["qty"]) - issued_item_qty.get(item, 0)
 			desire_to_transfer = flt(self.fg_completed_qty) * item_dict[item]["qty"]
+
 			if desire_to_transfer <= pending_to_issue:
 				item_dict[item]["qty"] = desire_to_transfer
-			else:
+			elif pending_to_issue > 0:
 				item_dict[item]["qty"] = pending_to_issue
-				if pending_to_issue:
+			else:
-					only_pending_fetched.append(item)
+				item_dict[item]["qty"] = 0
 
 		# delete items with 0 qty
 		for item in item_dict.keys():
@@ -659,9 +668,6 @@ class StockEntry(StockController):
 		if not len(item_dict):
 			frappe.msgprint(_("""All items have already been transferred for this Production Order."""))
 
-		elif only_pending_fetched:
-			frappe.msgprint(_("Pending Items {0} updated").format(only_pending_fetched))
-
 		return item_dict
 
 	def get_issued_qty(self):

erpnext/stock/get_item_details.py

@@ -163,8 +163,8 @@ def get_basic_details(args, item):
 		"uom": item.stock_uom,
 		"min_order_qty": flt(item.min_order_qty) if args.parenttype == "Material Request" else "",
 		"conversion_factor": 1.0,
-		"qty": args.qty or 0.0,
+		"qty": args.qty or 1.0,
-		"stock_qty": 0.0,
+		"stock_qty": 1.0,
 		"price_list_rate": 0.0,
 		"base_price_list_rate": 0.0,
 		"rate": 0.0,

erpnext/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.json

@@ -5,12 +5,12 @@
  "doctype": "Report", 
  "idx": 1, 
  "is_standard": "Yes", 
- "modified": "2015-04-07 08:18:14.440193", 
+ "modified": "2015-06-10 15:52:49.492144", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Ordered Items To Be Delivered", 
  "owner": "Administrator", 
- "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order`.`project_name` as \"Project\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.qty as \"Qty:Float:140\",\n `tabSales Order Item`.delivered_qty as \"Delivered Qty:Float:140\",\n (`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.delivered_qty, 0)) as \"Qty to Deliver:Float:140\",\n `tabSales Order Item`.base_rate as \"Rate:Float:140\",\n `tabSales Order Item`.base_amount as \"Amount:Float:140\",\n ((`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.delivered_qty, 0))*`tabSales Order Item`.base_rate) as \"Amount to Deliver:Float:140\",\n `tabBin`.actual_qty as \"Available Qty:Float:120\",\n `tabBin`.projected_qty as \"Projected Qty:Float:120\",\n `tabSales Order`.`delivery_date` as \"Expected Delivery Date:Date:120\",\n `tabSales Order Item`.item_name as \"Item Name::150\",\n `tabSales Order Item`.description as \"Description::200\",\n `tabSales Order Item`.item_group as \"Item Group:Link/Item Group:120\"\nfrom\n `tabSales Order`, `tabSales Order Item`, `tabBin`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and `tabSales Order`.status != \"Stopped\"\n and ifnull(`tabSales Order Item`.delivered_qty,0) < ifnull(`tabSales Order Item`.qty,0)\n and `tabBin`.item_code = `tabSales Order Item`.item_code\n and `tabBin`.warehouse = `tabSales Order Item`.warehouse\norder by `tabSales Order`.transaction_date asc", 
+ "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order`.`project_name` as \"Project\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.qty as \"Qty:Float:140\",\n `tabSales Order Item`.delivered_qty as \"Delivered Qty:Float:140\",\n (`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.delivered_qty, 0)) as \"Qty to Deliver:Float:140\",\n `tabSales Order Item`.base_rate as \"Rate:Float:140\",\n `tabSales Order Item`.base_amount as \"Amount:Float:140\",\n ((`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.delivered_qty, 0))*`tabSales Order Item`.base_rate) as \"Amount to Deliver:Float:140\",\n `tabBin`.actual_qty as \"Available Qty:Float:120\",\n `tabBin`.projected_qty as \"Projected Qty:Float:120\",\n `tabSales Order`.`delivery_date` as \"Expected Delivery Date:Date:120\",\n `tabSales Order Item`.item_name as \"Item Name::150\",\n `tabSales Order Item`.description as \"Description::200\",\n `tabSales Order Item`.item_group as \"Item Group:Link/Item Group:120\",\n `tabSales Order Item`.warehouse as \"Warehouse:Link/Warehouse:200\"\nfrom\n `tabSales Order`, `tabSales Order Item`, `tabBin`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and `tabSales Order`.status != \"Stopped\"\n and ifnull(`tabSales Order Item`.delivered_qty,0) < ifnull(`tabSales Order Item`.qty,0)\n and `tabBin`.item_code = `tabSales Order Item`.item_code\n and `tabBin`.warehouse = `tabSales Order Item`.warehouse\norder by `tabSales Order`.transaction_date asc", 
  "ref_doctype": "Delivery Note", 
  "report_name": "Ordered Items To Be Delivered", 
  "report_type": "Query Report"

erpnext/support/doctype/issue/issue.json

@@ -66,7 +66,7 @@
    "oldfieldtype": "Data", 
    "options": "Email", 
    "permlevel": 0, 
-   "reqd": 1
+   "reqd": 0
   }, 
   {
    "fieldname": "fold", 
@@ -229,11 +229,19 @@
    "hidden": 1, 
    "label": "Content Type", 
    "permlevel": 0
+  }, 
+  {
+   "fieldname": "attachment", 
+   "fieldtype": "Attach", 
+   "hidden": 1, 
+   "label": "Attachment", 
+   "permlevel": 0, 
+   "precision": ""
   }
  ], 
  "icon": "icon-ticket", 
  "idx": 1, 
- "modified": "2015-05-28 03:21:04.690112", 
+ "modified": "2015-06-01 08:14:01.750421", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Issue", 

erpnext/support/doctype/issue/issue.py

@@ -17,6 +17,8 @@ class Issue(Document):
 		return "{0}: {1}".format(_(self.status), self.subject)
 
 	def validate(self):
+		if not self.raised_by:
+			self.raised_by = frappe.session.user
 		self.update_status()
 		self.set_lead_contact(self.raised_by)
 
@@ -54,7 +56,8 @@ class Issue(Document):
 def get_list_context(context=None):
 	return {
 		"title": _("My Issues"),
-		"get_list": get_issue_list
+		"get_list": get_issue_list,
+		"row_template": "templates/includes/issue_row.html"
 	}
 
 def get_issue_list(doctype, txt, filters, limit_start, limit_page_length=20):
@@ -84,3 +87,6 @@ def set_multiple_status(names, status):
 	names = json.loads(names)
 	for name in names:
 		set_status(name, status)
+
+def has_website_permission(doc, ptype, user, verbose=False):
+	return doc.raised_by==user

erpnext/templates/form_grid/includes/visible_cols.html

@@ -1,6 +1,6 @@
 {% $.each(visible_columns || [], function(i, df) { %}
 	{% 	var val = doc.get_formatted(df.fieldname);
-	if((df.fieldname !== "description") && val) { %}
+	if((df.fieldname !== "description" && df.fieldname !== "item_name") && val) { %}
 		<div class="row">
 			<div class="col-xs-4 text-ellipsis">
 				<strong title="{%= __(df.label) %}">{%= __(df.label) %}:</strong>

erpnext/templates/form_grid/item_grid.html

@@ -1,4 +1,4 @@
-{% var visible_columns = row.get_visible_columns(["item_code", "item_name", "description", "qty", "rate", "amount", "stock_uom", "uom", "discount_percentage", "schedule_date", "warehouse", "against_sales_order", "sales_order"]); %}
+{% var visible_columns = row.get_visible_columns(["item_code", "qty", "rate", "amount", "stock_uom", "uom", "discount_percentage", "schedule_date", "warehouse", "against_sales_order", "sales_order"]); %}
 
 {% if(!doc) { %}
 	<div class="row">
@@ -8,6 +8,7 @@
 		<div class="col-sm-2 col-xs-4 text-right">{%= __("Amount") %}</div>
 	</div>
 {% } else { %}
+	{% var visible_column_fieldnames = $.map(visible_columns, function(x, i) {return x.fieldname}); %}
 	<div class="row">
 		<div class="col-sm-6 col-xs-8">
 			{% if(doc.warehouse) {
@@ -45,8 +46,14 @@
                 <strong>{%= doc.item_code %}</strong>
             {% } %}
 
-			{% if(doc.item_name != doc.item_code) { %}
+			{% if(doc.item_name != doc.item_code && in_list(visible_column_fieldnames, "item_name")) { %}
 				<br>{%= doc.item_name %}{% } %}
+				
+			{% if((doc.description != doc.item_code != doc.item_name) && 
+				in_list(visible_column_fieldnames, "description")) { %}
+				<br>
+				<strong>Description: </strong>
+				{%= doc.get_formatted("description") %}{% } %}
 			{% include "templates/form_grid/includes/visible_cols.html" %}
 		</div>