Merge branch 'hotfix' into gstr1-fixes

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -23,6 +23,7 @@
    "columns": 0,
    "default": "1",
    "description": "If enabled, the system will post accounting entries for inventory automatically.",
+   "fetch_if_empty": 0,
    "fieldname": "auto_accounting_for_stock",
    "fieldtype": "Check",
    "hidden": 1,
@@ -55,6 +56,7 @@
    "collapsible": 0,
    "columns": 0,
    "description": "Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",
+   "fetch_if_empty": 0,
    "fieldname": "acc_frozen_upto",
    "fieldtype": "Date",
    "hidden": 0,
@@ -87,6 +89,7 @@
    "collapsible": 0,
    "columns": 0,
    "description": "Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts",
+   "fetch_if_empty": 0,
    "fieldname": "frozen_accounts_modifier",
    "fieldtype": "Link",
    "hidden": 0,
@@ -119,6 +122,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "column_break_4",
    "fieldtype": "Column Break",
    "hidden": 0,
@@ -151,6 +155,7 @@
    "collapsible": 0,
    "columns": 0,
    "description": "Role that is allowed to submit transactions that exceed credit limits set.",
+   "fetch_if_empty": 0,
    "fieldname": "credit_controller",
    "fieldtype": "Link",
    "hidden": 0,
@@ -183,6 +188,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "check_supplier_invoice_uniqueness",
    "fieldtype": "Check",
    "hidden": 0,
@@ -215,6 +221,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "make_payment_via_journal_entry",
    "fieldtype": "Check",
    "hidden": 0,
@@ -248,6 +255,7 @@
    "collapsible": 0,
    "columns": 0,
    "default": "1",
+   "fetch_if_empty": 0,
    "fieldname": "unlink_payment_on_cancellation_of_invoice",
    "fieldtype": "Check",
    "hidden": 0,
@@ -281,6 +289,7 @@
    "collapsible": 0,
    "columns": 0,
    "default": "1",
+   "fetch_if_empty": 0,
    "fieldname": "book_asset_depreciation_entry_automatically",
    "fieldtype": "Check",
    "hidden": 0,
@@ -313,6 +322,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "allow_cost_center_in_entry_of_bs_account",
    "fieldtype": "Check",
    "hidden": 0,
@@ -345,6 +355,40 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "automatically_fetch_payment_terms",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Automatically Fetch Payment Terms",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "print_settings",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -377,6 +421,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "show_inclusive_tax_in_print",
    "fieldtype": "Check",
    "hidden": 0,
@@ -409,6 +454,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "column_break_12",
    "fieldtype": "Column Break",
    "hidden": 0,
@@ -440,6 +486,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "show_payment_schedule_in_print",
    "fieldtype": "Check",
    "hidden": 0,
@@ -472,6 +519,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "currency_exchange_section",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -505,6 +553,7 @@
    "collapsible": 0,
    "columns": 0,
    "default": "1",
+   "fetch_if_empty": 0,
    "fieldname": "allow_stale",
    "fieldtype": "Check",
    "hidden": 0,
@@ -539,6 +588,7 @@
    "columns": 0,
    "default": "1",
    "depends_on": "eval:doc.allow_stale==0",
+   "fetch_if_empty": 0,
    "fieldname": "stale_days",
    "fieldtype": "Int",
    "hidden": 0,
@@ -571,6 +621,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "report_settings_sb",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -605,6 +656,7 @@
    "columns": 0,
    "default": "0",
    "description": "Only select if you have setup Cash Flow Mapper documents",
+   "fetch_if_empty": 0,
    "fieldname": "use_custom_cash_flow",
    "fieldtype": "Check",
    "hidden": 0,
@@ -642,7 +694,7 @@
  "issingle": 1,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-01-07 16:52:03.869199", 
+ "modified": "2019-04-17 05:58:23.012494",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",

erpnext/accounts/report/accounts_receivable/accounts_receivable.py

@@ -487,13 +487,8 @@ class ReceivablePayableReport(object):
 			conditions.append("company=%s")
 			values.append(self.filters.company)
 
-		company_finance_book = erpnext.get_default_finance_book(self.filters.company)
+		if self.filters.finance_book:
-
-		if not self.filters.finance_book or (self.filters.finance_book == company_finance_book):
 			conditions.append("ifnull(finance_book,'') in (%s, '')")
-			values.append(company_finance_book)
-		elif self.filters.finance_book:
-			conditions.append("ifnull(finance_book,'') = %s")
 			values.append(self.filters.finance_book)
 
 		if self.filters.get(party_type_field):

erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py

@@ -31,11 +31,8 @@ def get_data(filters):
 
 		filters_data.append(["against_voucher", "in", assets])
 
-	company_finance_book = erpnext.get_default_finance_book(filters.get("company"))
+	if filters.get("finance_book"):
-	if (not filters.get('finance_book') or (filters.get('finance_book') == company_finance_book)):
 		filters_data.append(["finance_book", "in", ['', filters.get('finance_book')]])
-	elif filters.get("finance_book"):
-		filters_data.append(["finance_book", "=", filters.get('finance_book')])
 
 	gl_entries = frappe.get_all('GL Entry',
 		filters= filters_data,

erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py

@@ -354,7 +354,8 @@ def set_gl_entries_by_account(from_date, to_date, root_lft, root_rgt, filters, g
 				"to_date": to_date,
 				"lft": root_lft,
 				"rgt": root_rgt,
-				"company": d.name
+				"company": d.name,
+				"finance_book": filters.get("finance_book")
 			},
 			as_dict=True)
 
@@ -384,14 +385,8 @@ def get_additional_conditions(from_date, ignore_closing_entries, filters):
 	if from_date:
 		additional_conditions.append("gl.posting_date >= %(from_date)s")
 
-	company_finance_book = erpnext.get_default_finance_book(filters.get("company"))
+	if filters.get("finance_book"):
-
+		additional_conditions.append("ifnull(finance_book, '') in (%(finance_book)s, '')")
-	if not filters.get('finance_book') or (filters.get('finance_book') == company_finance_book):
-		additional_conditions.append("ifnull(finance_book, '') in ('%s', '')" %
-			frappe.db.escape(company_finance_book))
-	elif filters.get("finance_book"):
-		additional_conditions.append("ifnull(finance_book, '') = '%s' " %
-			frappe.db.escape(filters.get("finance_book")))
 
 	return " and {}".format(" and ".join(additional_conditions)) if additional_conditions else ""
 

erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py

@@ -184,12 +184,8 @@ class PartyLedgerSummaryReport(object):
 		if self.filters.company:
 			conditions.append("gle.company=%(company)s")
 
-		self.filters.company_finance_book = erpnext.get_default_finance_book(self.filters.company)
+		if self.filters.finance_book:
-
+			conditions.append("ifnull(finance_book,'') in (%(finance_book)s, '')")
-		if not self.filters.finance_book or (self.filters.finance_book == self.filters.company_finance_book):
-			conditions.append("ifnull(finance_book,'') in (%(company_finance_book)s, '')")
-		elif self.filters.finance_book:
-			conditions.append("ifnull(finance_book,'') = %(finance_book)s")
 
 		if self.filters.get("party"):
 			conditions.append("party=%(party)s")

erpnext/accounts/report/financial_statements.py

@@ -392,14 +392,8 @@ def get_additional_conditions(from_date, ignore_closing_entries, filters):
 			filters.cost_center = get_cost_centers_with_children(filters.cost_center)
 			additional_conditions.append("cost_center in %(cost_center)s")
 
-		company_finance_book = erpnext.get_default_finance_book(filters.get("company"))
+		if filters.get("finance_book"):
-
+			additional_conditions.append("ifnull(finance_book, '') in (%(finance_book)s, '')")
-		if not filters.get('finance_book') or (filters.get('finance_book') == company_finance_book):
-			additional_conditions.append("ifnull(finance_book, '') in ('%s', '')" %
-				frappe.db.escape(company_finance_book))
-		elif filters.get("finance_book"):
-			additional_conditions.append("ifnull(finance_book, '') = '%s' " %
-				frappe.db.escape(filters.get("finance_book")))
 
 	return " and {}".format(" and ".join(additional_conditions)) if additional_conditions else ""
 

erpnext/accounts/report/general_ledger/general_ledger.py

@@ -186,12 +186,8 @@ def get_conditions(filters):
 	if filters.get("project"):
 		conditions.append("project in %(project)s")
 
-	company_finance_book = erpnext.get_default_finance_book(filters.get("company"))
+	if filters.get("finance_book"):
-	if not filters.get("finance_book") or (filters.get("finance_book") == company_finance_book):
-		filters['finance_book'] = company_finance_book
 		conditions.append("ifnull(finance_book, '') in (%(finance_book)s, '')")
-	elif filters.get("finance_book"):
-		conditions.append("ifnull(finance_book, '') = %(finance_book)s")
 
 	from frappe.desk.reportview import build_match_conditions
 	match_conditions = build_match_conditions("GL Entry")

erpnext/buying/doctype/purchase_order/purchase_order.py

@@ -395,7 +395,7 @@ def make_purchase_invoice(source_name, target_doc=None):
 			or item.get("buying_cost_center")
 			or item_group.get("buying_cost_center"))
 
-	doc = get_mapped_doc("Purchase Order", source_name,	{
+	fields = {
 		"Purchase Order": {
 			"doctype": "Purchase Invoice",
 			"field_map": {
@@ -419,7 +419,15 @@ def make_purchase_invoice(source_name, target_doc=None):
 			"doctype": "Purchase Taxes and Charges",
 			"add_if_empty": True
 		}
-	}, target_doc, postprocess)
+	}
+
+	if frappe.get_single("Accounts Settings").automatically_fetch_payment_terms == 1:
+		fields["Payment Schedule"] = {
+			"doctype": "Payment Schedule",
+			"add_if_empty": True
+		}
+
+	doc = get_mapped_doc("Purchase Order", source_name,	fields, target_doc, postprocess)
 
 	return doc
 

erpnext/buying/doctype/purchase_order/test_purchase_order.py

@@ -6,7 +6,7 @@ import unittest
 import frappe
 import frappe.defaults
 from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
-from frappe.utils import flt, add_days, nowdate
+from frappe.utils import flt, add_days, nowdate, getdate
 from erpnext.stock.doctype.item.test_item import make_item
 from erpnext.buying.doctype.purchase_order.purchase_order import (make_purchase_receipt, make_purchase_invoice, make_rm_stock_entry as make_subcontract_transfer_entry)
 from erpnext.stock.doctype.material_request.test_material_request import make_material_request
@@ -133,9 +133,9 @@ class TestPurchaseOrder(unittest.TestCase):
 		po.submit()
 
 		self.assertEqual(po.payment_schedule[0].payment_amount, 2500.0)
-		self.assertEqual(po.payment_schedule[0].due_date, po.transaction_date)
+		self.assertEqual(getdate(po.payment_schedule[0].due_date), getdate(po.transaction_date))
 		self.assertEqual(po.payment_schedule[1].payment_amount, 2500.0)
-		self.assertEqual(po.payment_schedule[1].due_date, add_days(po.transaction_date, 30))
+		self.assertEqual(getdate(po.payment_schedule[1].due_date), add_days(getdate(po.transaction_date), 30))
 		pi = make_purchase_invoice(po.name)
 		pi.save()
 
@@ -143,9 +143,9 @@ class TestPurchaseOrder(unittest.TestCase):
 		self.assertEqual(len(pi.get("items", [])), 1)
 
 		self.assertEqual(pi.payment_schedule[0].payment_amount, 2500.0)
-		self.assertEqual(pi.payment_schedule[0].due_date, po.transaction_date)
+		self.assertEqual(getdate(pi.payment_schedule[0].due_date), getdate(po.transaction_date))
 		self.assertEqual(pi.payment_schedule[1].payment_amount, 2500.0)
-		self.assertEqual(pi.payment_schedule[1].due_date, add_days(po.transaction_date, 30))
+		self.assertEqual(getdate(pi.payment_schedule[1].due_date), add_days(getdate(po.transaction_date), 30))
 
 	def test_subcontracting(self):
 		po = create_purchase_order(item_code="_Test FG Item", is_subcontracted="Yes")
@@ -294,6 +294,10 @@ class TestPurchaseOrder(unittest.TestCase):
 		make_stock_entry(target="_Test Warehouse - _TC", qty=10, basic_rate=100)
 		make_stock_entry(target="_Test Warehouse - _TC", item_code="_Test Item Home Desktop 100",
 			qty=20, basic_rate=100)
+		make_stock_entry(target="_Test Warehouse 1 - _TC", item_code="_Test Item",
+			qty=30, basic_rate=100)
+		make_stock_entry(target="_Test Warehouse 1 - _TC", item_code="_Test Item Home Desktop 100",
+			qty=30, basic_rate=100)
 
 		bin1 = frappe.db.get_value("Bin",
 			filters={"warehouse": "_Test Warehouse - _TC", "item_code": "_Test Item"},

erpnext/controllers/accounts_controller.py

@@ -30,9 +30,8 @@ class AccountsController(TransactionBase):
 		return self.__company_currency
 
 	def onload(self):
-		if self.get("__onload"):
+		self.set_onload("make_payment_via_journal_entry",
-			self.get("__onload").make_payment_via_journal_entry \
+			frappe.db.get_single_value('Accounts Settings', 'make_payment_via_journal_entry'))
-				= frappe.db.get_single_value('Accounts Settings', 'make_payment_via_journal_entry')
 
 		if self.is_new():
 			relevant_docs = ("Quotation", "Purchase Order", "Sales Order",

erpnext/patches/v11_1/woocommerce_set_creation_user.py

@@ -1,10 +1,11 @@
 from __future__ import unicode_literals
 import frappe
+from frappe.utils import cint
 
 def execute():
-	woocommerce_setting_enable_sync = frappe.db.sql("SELECT t.value FROM tabSingles t WHERE doctype = 'Woocommerce Settings' AND field = 'enable_sync'",  as_dict=True)
+	frappe.reload_doc("erpnext_integrations", "doctype","woocommerce_settings")
-	if len(woocommerce_setting_enable_sync) and woocommerce_setting_enable_sync[0].value == '1':
+	doc = frappe.get_doc("Woocommerce Settings")
-		frappe.db.sql("""UPDATE tabSingles
+
-					SET value = (SELECT t.value FROM tabSingles t WHERE doctype = 'Woocommerce Settings' AND field = 'modified_by')
+	if cint(doc.enable_sync):
-					WHERE doctype = 'Woocommerce Settings'
+		doc.creation_user = doc.modified_by
-					AND field = 'creation_user';""")
+		doc.save(ignore_permissions=True)

erpnext/projects/doctype/project/project.py

@@ -241,7 +241,7 @@ class Project(Document):
 		from_expense_claim = frappe.db.sql("""select
 			sum(total_sanctioned_amount) as total_sanctioned_amount
 			from `tabExpense Claim` where project = %s
-			and docstatus = 1""", self.name, as_dict=1, debug=1)[0]
+			and docstatus = 1""", self.name, as_dict=1)[0]
 
 		self.actual_start_date = from_time_sheet.start_date
 		self.actual_end_date = from_time_sheet.end_date

erpnext/projects/report/billing_summary.py

@@ -54,9 +54,6 @@ def get_data(filters):
 	data = []
 	record = get_records(filters)
 
-	billable_hours_worked = 0
-	hours_worked = 0
-	working_cost = 0
 	for entries in record:
 		total_hours = 0
 		total_billable_hours = 0
@@ -81,11 +78,6 @@ def get_data(filters):
 				total_hours, total_billable_hours, total_amount = get_billable_and_total_hours(activity,
 					time_end, time_start, total_hours, total_billable_hours, total_amount)
 
-
-		hours_worked += total_hours
-		billable_hours_worked += total_billable_hours
-		working_cost += total_amount
-
 		row = {
 			"employee": entries.employee,
 			"employee_name": entries.employee_name,
@@ -97,14 +89,6 @@ def get_data(filters):
 		if entries_exists:
 			data.append(row)
 			entries_exists = False
-
-	total = {
-		"total_billable_hours": billable_hours_worked,
-		"total_hours": hours_worked,
-		"amount": working_cost
-	}
-	if billable_hours_worked !=0 or hours_worked !=0 or working_cost !=0:
-		data.append(total)
 	return data
 
 def get_records(filters):

erpnext/projects/report/employee_billing_summary/employee_billing_summary.json

@@ -1,5 +1,5 @@
 {
- "add_total_row": 0, 
+ "add_total_row": 1, 
  "creation": "2019-03-08 15:08:19.929728", 
  "disable_prepared_report": 0, 
  "disabled": 0, 
@@ -7,7 +7,7 @@
  "doctype": "Report", 
  "idx": 0, 
  "is_standard": "Yes", 
- "modified": "2019-03-08 15:08:19.929728", 
+ "modified": "2019-04-16 17:29:18.376932", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Employee Billing Summary", 

erpnext/projects/report/project_billing_summary/project_billing_summary.json

@@ -1,5 +1,5 @@
 {
- "add_total_row": 0, 
+ "add_total_row": 1, 
  "creation": "2019-03-11 16:22:39.460524", 
  "disable_prepared_report": 0, 
  "disabled": 0, 
@@ -7,7 +7,7 @@
  "doctype": "Report", 
  "idx": 0, 
  "is_standard": "Yes", 
- "modified": "2019-03-11 16:22:39.460524", 
+ "modified": "2019-04-16 17:28:32.749633", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Project Billing Summary", 

erpnext/selling/doctype/customer/customer.js

@@ -123,5 +123,11 @@ frappe.ui.form.on("Customer", {
 	},
 	validate: function(frm) {
 		if(frm.doc.lead_name) frappe.model.clear_doc("Lead", frm.doc.lead_name);
+
+		var total = 0;
+		for (var idx in frm.doc.sales_team) {
+			total += frm.doc.sales_team[idx].allocated_percentage;
+			if (total > 100) frappe.throw(__("Total contribution percentage can't exceed 100"));
+		}
 	},
 });