Merge branch 'develop'

[fix] Disable atrribute table in variant item record

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.14.0'
+__version__ = '6.15.1'

erpnext/accounts/doctype/fiscal_year/fiscal_year.py

@@ -62,7 +62,7 @@ def auto_create_fiscal_year():
 			start_year = cstr(new_fy.year_start_date.year)
 			end_year = cstr(new_fy.year_end_date.year)
 			new_fy.year = start_year if start_year==end_year else (start_year + "-" + end_year)
-
-			new_fy.insert()
+			
+			new_fy.insert(ignore_permissions=True)
 		except frappe.NameError:
 			pass

erpnext/accounts/doctype/journal_entry/journal_entry.js

@@ -347,6 +347,7 @@ frappe.ui.form.on("Journal Entry Account", {
 				callback: function(r) {
 					if(r.message) {
 						$.extend(d, r.message);
+						erpnext.journal_entry.set_debit_credit_in_company_currency(frm, dt, dn);
 						refresh_field('accounts');
 					}
 				}
@@ -355,11 +356,11 @@ frappe.ui.form.on("Journal Entry Account", {
 	},
 
 	debit_in_account_currency: function(frm, cdt, cdn) {
-		erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
+		erpnext.journal_entry.set_exchange_rate(frm, cdt, cdn);
 	},
 
 	credit_in_account_currency: function(frm, cdt, cdn) {
-		erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
+		erpnext.journal_entry.set_exchange_rate(frm, cdt, cdn);
 	},
 
 	debit: function(frm, dt, dn) {
@@ -368,6 +369,17 @@ frappe.ui.form.on("Journal Entry Account", {
 
 	credit: function(frm, dt, dn) {
 		cur_frm.cscript.update_totals(frm.doc);
+	},
+	
+	exchange_rate: function(frm, cdt, cdn) {
+		var company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
+		var row = locals[cdt][cdn];
+
+		if(row.account_currency == company_currency || !frm.doc.multi_currency) {
+			frappe.model.set_value(cdt, cdn, "exchange_rate", 1);
+		}
+		
+		erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
 	}
 })
 
@@ -395,8 +407,6 @@ $.extend(erpnext.journal_entry, {
 	},
 
 	set_debit_credit_in_company_currency: function(frm, cdt, cdn) {
-		erpnext.journal_entry.set_exchange_rate(frm, cdt, cdn);
-
 		var row = locals[cdt][cdn];
 
 		frappe.model.set_value(cdt, cdn, "debit",
@@ -413,7 +423,8 @@ $.extend(erpnext.journal_entry, {
 		var row = locals[cdt][cdn];
 
 		if(row.account_currency == company_currency || !frm.doc.multi_currency) {
-			frappe.model.set_value(cdt, cdn, "exchange_rate", 1);
+			row.exchange_rate = 1;
+			erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
 		} else if (!row.exchange_rate || row.exchange_rate == 1 || row.account_type == "Bank") {
 			frappe.call({
 				method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_exchange_rate",
@@ -429,11 +440,15 @@ $.extend(erpnext.journal_entry, {
 				},
 				callback: function(r) {
 					if(r.message) {
-						frappe.model.set_value(cdt, cdn, "exchange_rate", r.message);
+						row.exchange_rate = r.message;
+						erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
 					}
 				}
 			})
+		} else {
+			erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
 		}
+		refresh_field("exchange_rate", cdn, "accounts");
 	},
 
 	quick_entry: function(frm) {

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -104,6 +104,12 @@ class JournalEntry(AccountsController):
 						msgprint(_("Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.").format(d.idx, d.account))
 					elif d.reference_type in ("Sales Order", "Purchase Order") and d.is_advance != "Yes":
 						frappe.throw(_("Row {0}: Payment against Sales/Purchase Order should always be marked as advance").format(d.idx))
+						
+				if d.is_advance == "Yes":
+					if d.party_type == 'Customer' and flt(d.debit) > 0:
+						frappe.throw(_("Row {0}: Advance against Customer must be credit").format(d.idx))
+					elif d.party_type == 'Supplier' and flt(d.credit) > 0:
+						frappe.throw(_("Row {0}: Advance against Supplier must be debit").format(d.idx))
 
 	def validate_against_jv(self):
 		for d in self.get('accounts'):

erpnext/accounts/page/accounts_browser/accounts_browser.js

@@ -66,7 +66,7 @@ frappe.pages["Accounts Browser"].on_page_load  = function(wrapper){
 			$.each(r.message, function(i, v) {
 				$('<option>').html(v).attr('value', v).appendTo(wrapper.$company_select);
 			});
-			wrapper.$company_select.val(frappe.defaults.get_user_default("company") || r.message[0]).change();
+			wrapper.$company_select.val(frappe.defaults.get_user_default("Company") || r.message[0]).change();
 		}
 	});
 }

erpnext/accounts/report/accounts_payable/accounts_payable.js

@@ -8,7 +8,7 @@ frappe.query_reports["Accounts Payable"] = {
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		},
 		{
 			"fieldname":"supplier",

erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js

@@ -8,7 +8,7 @@ frappe.query_reports["Accounts Payable Summary"] = {
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		},
 		{
 			"fieldname":"supplier",

erpnext/accounts/report/accounts_receivable/accounts_receivable.js

@@ -8,7 +8,7 @@ frappe.query_reports["Accounts Receivable"] = {
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		},
 		{
 			"fieldname":"customer",

erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js

@@ -8,7 +8,7 @@ frappe.query_reports["Accounts Receivable Summary"] = {
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		},
 		{
 			"fieldname":"customer",

erpnext/accounts/report/budget_variance_report/budget_variance_report.js

@@ -22,7 +22,7 @@ frappe.query_reports["Budget Variance Report"] = {
 			label: __("Company"),
 			fieldtype: "Link",
 			options: "Company",
-			default: frappe.defaults.get_user_default("company")
+			default: frappe.defaults.get_user_default("Company")
 		},
 	]
 }

erpnext/accounts/report/general_ledger/general_ledger.js

@@ -8,7 +8,7 @@ frappe.query_reports["General Ledger"] = {
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company"),
+			"default": frappe.defaults.get_user_default("Company"),
 			"reqd": 1
 		},
 		{

erpnext/accounts/report/gross_profit/gross_profit.js

@@ -9,7 +9,7 @@ frappe.query_reports["Gross Profit"] = {
 			"fieldtype": "Link",
 			"options": "Company",
 			"reqd": 1,
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		},
 		{
 			"fieldname":"from_date",

erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js

@@ -33,7 +33,7 @@ frappe.query_reports["Item-wise Purchase Register"] = {
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		}
 	]
 }

erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js

@@ -27,7 +27,7 @@ frappe.query_reports["Item-wise Sales Register"] = frappe.query_reports["Sales R
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		}
 	]
 }

erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js

@@ -9,7 +9,7 @@ frappe.query_reports["Payment Period Based On Invoice Date"] = {
 			fieldtype: "Link",
 			options: "Company",
 			reqd: 1,
-			default: frappe.defaults.get_user_default("company")
+			default: frappe.defaults.get_user_default("Company")
 		},
 		{
 			fieldname: "from_date",

erpnext/accounts/report/purchase_register/purchase_register.js

@@ -27,7 +27,7 @@ frappe.query_reports["Purchase Register"] = {
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		}
 	]
 }

erpnext/accounts/report/sales_register/sales_register.js

@@ -27,7 +27,7 @@ frappe.query_reports["Sales Register"] = {
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		}
 	]
 }

erpnext/accounts/report/trial_balance/trial_balance.js

@@ -10,7 +10,7 @@ frappe.query_reports["Trial Balance"] = {
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company"),
+			"default": frappe.defaults.get_user_default("Company"),
 			"reqd": 1
 		},
 		{

erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js

@@ -8,7 +8,7 @@ frappe.query_reports["Trial Balance for Party"] = {
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company"),
+			"default": frappe.defaults.get_user_default("Company"),
 			"reqd": 1
 		},
 		{

erpnext/accounts/utils.py

@@ -383,7 +383,7 @@ def get_actual_expense(args):
 def get_currency_precision(currency=None):
 	if not currency:
 		currency = frappe.db.get_value("Company",
-			frappe.db.get_default("company"), "default_currency", cache=True)
+			frappe.db.get_default("Company"), "default_currency", cache=True)
 	currency_format = frappe.db.get_value("Currency", currency, "number_format", cache=True)
 
 	from frappe.utils import get_number_format_info

erpnext/buying/doctype/purchase_order/purchase_order.py

@@ -140,7 +140,7 @@ class PurchaseOrder(BuyingController):
 		clear_doctype_notifications(self)
 
 	def on_submit(self):
-		if self.has_drop_ship_item():
+		if self.is_against_so():
 			self.update_status_updater()
 
 		super(PurchaseOrder, self).on_submit()
@@ -157,8 +157,10 @@ class PurchaseOrder(BuyingController):
 		purchase_controller.update_last_purchase_rate(self, is_submit = 1)
 
 	def on_cancel(self):
-		if self.has_drop_ship_item():
+		if self.is_against_so():
 			self.update_status_updater()
+			
+		if self.has_drop_ship_item():
 			self.update_delivered_qty_in_sales_order()
 
 		pc_obj = frappe.get_doc('Purchase Common')
@@ -222,13 +224,10 @@ class PurchaseOrder(BuyingController):
 			so.notify_update()
 
 	def has_drop_ship_item(self):
-		is_drop_ship = False
-
-		for item in self.items:
-			if item.delivered_by_supplier == 1:
-				is_drop_ship = True
-
-		return is_drop_ship
+		return any([d.delivered_by_supplier for d in self.items])
+		
+	def is_against_so(self):
+		return any([d.prevdoc_doctype for d in self.items if d.prevdoc_doctype=="Sales Order"])
 
 	def set_received_qty_for_drop_ship_items(self):
 		for item in self.items:

erpnext/config/learn.py

@@ -21,6 +21,11 @@ def get_data():
 					"label": _("Customizing Forms"),
 					"youtube_id": "pJhL9mmxV_U"
 				},
+				{
+					"type": "help",
+					"label": _("Report Builder"),
+					"youtube_id": "y0o5iYZOioU"
+				},
 			]
 
 		},
@@ -273,6 +278,11 @@ def get_data():
 					"label": _("Publish Items on Website"),
 					"youtube_id": "W31LBBNzbgc"
 				},
+				{
+					"type": "help",
+					"label": _("Shopping Cart"),
+					"youtube_id": "xkrYO-KFukM"
+				},
 			]
 		},
 	]

erpnext/controllers/item_variant.py

@@ -12,7 +12,7 @@ class InvalidItemAttributeValueError(frappe.ValidationError): pass
 class ItemTemplateCannotHaveStock(frappe.ValidationError): pass
 
 @frappe.whitelist()
-def get_variant(item, args):
+def get_variant(template, args, variant=None):
 	"""Validates Attributes and their Values, then looks for an exactly matching Item Variant
 
 		:param item: Template Item
@@ -24,9 +24,9 @@ def get_variant(item, args):
 	if not args:
 		frappe.throw(_("Please specify at least one attribute in the Attributes table"))
 
-	validate_item_variant_attributes(item, args)
+	validate_item_variant_attributes(template, args)
 
-	return find_variant(item, args)
+	return find_variant(template, args, variant)
 
 def validate_item_variant_attributes(item, args):
 	attribute_values = {}
@@ -65,7 +65,7 @@ def validate_item_variant_attributes(item, args):
 			frappe.throw(_("Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values").format(
 				value, attribute))
 
-def find_variant(item, args):
+def find_variant(template, args, variant_item_code=None):
 	conditions = ["""(iv_attribute.attribute="{0}" and iv_attribute.attribute_value="{1}")"""\
 		.format(frappe.db.escape(key), frappe.db.escape(cstr(value))) for key, value in args.items()]
 
@@ -79,8 +79,8 @@ def find_variant(item, args):
 		where variant_of=%s and exists (
 			select name from `tabItem Variant Attribute` iv_attribute
 				where iv_attribute.parent=item.name
-				and ({conditions})
-		)""".format(conditions=conditions), item)
+				and ({conditions}) and parent != %s
+		)""".format(conditions=conditions), (template, cstr(variant_item_code)))
 
 	for variant in possible_variants:
 		variant = frappe.get_doc("Item", variant)

erpnext/crm/doctype/lead/lead.py

@@ -90,7 +90,7 @@ def _make_customer(source_name, target_doc=None, ignore_permissions=False):
 			target.customer_type = "Individual"
 			target.customer_name = source.lead_name
 
-		target.customer_group = frappe.db.get_default("customer_group")
+		target.customer_group = frappe.db.get_default("Customer Group")
 
 	doclist = get_mapped_doc("Lead", source_name,
 		{"Lead": {

erpnext/crm/doctype/newsletter/newsletter.py

@@ -121,7 +121,7 @@ def create_lead(email_id):
 		"lead_name": real_name or email_id,
 		"status": "Lead",
 		"naming_series": get_default_naming_series("Lead"),
-		"company": frappe.db.get_default("company"),
+		"company": frappe.db.get_default("Company"),
 		"source": "Email"
 	})
 	lead.insert()

erpnext/crm/doctype/opportunity/opportunity.js

@@ -29,8 +29,8 @@ erpnext.crm.Opportunity = frappe.ui.form.Controller.extend({
 
 		if(!this.frm.doc.status)
 			set_multiple(cdt, cdn, { status:'Draft' });
-		if(!this.frm.doc.company && frappe.defaults.get_user_default("company"))
-			set_multiple(cdt, cdn, { company:frappe.defaults.get_user_default("company") });
+		if(!this.frm.doc.company && frappe.defaults.get_user_default("Company"))
+			set_multiple(cdt, cdn, { company:frappe.defaults.get_user_default("Company") });
 		if(!this.frm.doc.fiscal_year && sys_defaults.fiscal_year)
 			set_multiple(cdt, cdn, { fiscal_year:sys_defaults.fiscal_year });