Merge branch 'develop'

[fix] Stock Entry additional costs patch fix for v4 accounts

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.7.1'
+__version__ = '6.8.0'

erpnext/accounts/doctype/pricing_rule/pricing_rule.py

@@ -59,7 +59,7 @@ class PricingRule(Document):
 					self.set(f, None)
 
 	def validate_price_or_discount(self):
-		for field in ["Price", "Discount Percentage"]:
+		for field in ["Price"]:
 			if flt(self.get(frappe.scrub(field))) < 0:
 				throw(_("{0} can not be negative").format(field))
 
@@ -168,7 +168,11 @@ def get_pricing_rules(args):
 		field = frappe.scrub(parenttype)
 		condition = ""
 		if args.get(field):
-			lft, rgt = frappe.db.get_value(parenttype, args[field], ["lft", "rgt"])
+			try:
+				lft, rgt = frappe.db.get_value(parenttype, args[field], ["lft", "rgt"])
+			except TypeError:
+				frappe.throw(_("Invalid {0}").format(args[field]))
+
 			parent_groups = frappe.db.sql_list("""select name from `tab%s`
 				where lft<=%s and rgt>=%s""" % (parenttype, '%s', '%s'), (lft, rgt))
 

erpnext/accounts/report/gross_profit/gross_profit.py

@@ -98,11 +98,18 @@ class GrossProfitGenerator(object):
 
 			row.base_amount = flt(row.base_net_amount)
 
-			product_bundles = self.product_bundles.get(row.parenttype, {}).get(row.parent, frappe._dict())
+			product_bundles = []
+			if row.update_stock:
+				product_bundles = self.product_bundles.get(row.parenttype, {}).get(row.parent, frappe._dict())
+			elif row.dn_detail:
+				product_bundles = self.product_bundles.get("Delivery Note", {})\
+					.get(row.delivery_note, frappe._dict())
+				row.item_row = row.dn_detail
 
 			# get buying amount
 			if row.item_code in product_bundles:
-				row.buying_amount = self.get_buying_amount_from_product_bundle(row, product_bundles[row.item_code])
+				row.buying_amount = self.get_buying_amount_from_product_bundle(row,
+					product_bundles[row.item_code])
 			else:
 				row.buying_amount = self.get_buying_amount(row, row.item_code)
 
@@ -142,7 +149,6 @@ class GrossProfitGenerator(object):
 					new_row.qty += row.qty
 					new_row.buying_amount += row.buying_amount
 					new_row.base_amount += row.base_amount
-					# new_row.allocated_amount += (row.allocated_amount or 0) if new_row.allocated_amount else 0
 
 			new_row.gross_profit = new_row.base_amount - new_row.buying_amount
 			new_row.gross_profit_percent = ((new_row.gross_profit / new_row.base_amount) * 100.0) \
@@ -158,9 +164,9 @@ class GrossProfitGenerator(object):
 
 	def get_buying_amount_from_product_bundle(self, row, product_bundle):
 		buying_amount = 0.0
-		for bom_item in product_bundle:
-			if bom_item.get("parent_detail_docname")==row.item_row:
-				buying_amount += self.get_buying_amount(row, bom_item.item_code)
+		for packed_item in product_bundle:
+			if packed_item.get("parent_detail_docname")==row.item_row:
+				buying_amount += self.get_buying_amount(row, packed_item.item_code)
 
 		return buying_amount
 
@@ -176,14 +182,14 @@ class GrossProfitGenerator(object):
 		else:
 			my_sle = self.sle.get((item_code, row.warehouse))
 			if (row.update_stock or row.dn_detail) and my_sle:
-				parenttype, parent, item_row = row.parenttype, row.parent, row.item_row
+				parenttype, parent = row.parenttype, row.parent
 				if row.dn_detail:
-					parenttype, parent, item_row = "Delivery Note", row.delivery_note, row.dn_detail
-				
+					parenttype, parent = "Delivery Note", row.delivery_note
+
 				for i, sle in enumerate(my_sle):
 					# find the stock valution rate from stock ledger entry
 					if sle.voucher_type == parenttype and parent == sle.voucher_no and \
-						sle.voucher_detail_no == item_row:
+						sle.voucher_detail_no == row.item_row:
 							previous_stock_value = len(my_sle) > i+1 and \
 								flt(my_sle[i+1].stock_value) or 0.0
 							return  previous_stock_value - flt(sle.stock_value)

erpnext/buying/doctype/supplier/supplier.js

@@ -12,6 +12,7 @@ cur_frm.cscript.refresh = function(doc, dt, dn) {
 
 	if(doc.__islocal){
     	hide_field(['address_html','contact_html']);
+		erpnext.utils.clear_address_and_contact(cur_frm);
 	}
 	else{
 	  	unhide_field(['address_html','contact_html']);

erpnext/change_log/v6/v6_2_0.md

@@ -1 +1 @@
-- **[Multi-currency Accounting](https://manual.erpnext.com/contents/accounts/multi-currency-accounting)**: You can now have an Account in a different currency than your Company's currency
+- **[Multi-currency Accounting](https://frappe.github.io/erpnext/user/guides/accounts/multi-currency-accounting)**: You can now have an Account in a different currency than your Company's currency

erpnext/change_log/v6/v6_8_0.md

@@ -0,0 +1,2 @@
+- Removed Stock UOM Replace Utility    
+  Replacing UOM and Conversion Factor in existing transactions broke the integrity of data. The cleaner solution is to create new Items for a different Stock UOM, and keep existing transactions as they are.

erpnext/config/docs.py

@@ -0,0 +1,28 @@
+source_link = "https://github.com/frappe/erpnext"
+docs_base_url = "https://frappe.github.io/erpnext"
+headline = "Learn ERPNext Inside Out"
+sub_heading = "Find detailed explanation for all ERPNext features"
+long_description = """
+ERPNext helps you to manage all your business information in one application and use it to manage operations and take decisions based on data.
+
+Among other things, ERPNext will help you to:
+
+- Track all Invoices and Payments.
+- Know what quantity of which product is available in stock.
+- Identify open customer queries.
+- Manage payroll.
+- Assign tasks and follow up on them.
+- Maintain a database of all your customers, suppliers and their contacts.
+- Prepare quotes.
+- Get reminders on maintenance schedules.
+- Publish your website.
+
+And a lot lot lot more."""
+
+def get_context(context):
+	context.top_bar_items = [
+		{"label": "Contents", "url": context.docs_base_url + "/contents.html", "right": 1},
+		{"label": "User Guide", "url": context.docs_base_url + "/user/guides", "right": 1},
+		{"label": "Videos", "url": context.docs_base_url + "/user/videos", "right": 1},
+		{"label": "Developer Docs", "url": context.docs_base_url + "/current", "right": 1}
+	]

erpnext/crm/doctype/lead/lead.js

@@ -37,6 +37,8 @@ erpnext.LeadController = frappe.ui.form.Controller.extend({
 
 		if(!this.frm.doc.__islocal) {
 			erpnext.utils.render_address_and_contact(cur_frm);
+		} else {
+			erpnext.utils.clear_address_and_contact(cur_frm);
 		}
 	},