From 41236ed0e5a73ed3c767cd9812ddaf7cc6b51e90 Mon Sep 17 00:00:00 2001 From: Saif Ur Rehman Date: Wed, 12 Dec 2018 05:12:20 +0500 Subject: [PATCH 01/86] feat: Customer Ledger Summary report --- .../customer_ledger_summary/__init__.py | 0 .../customer_ledger_summary.js | 97 +++++++ .../customer_ledger_summary.json | 26 ++ .../customer_ledger_summary.py | 264 ++++++++++++++++++ 4 files changed, 387 insertions(+) create mode 100644 erpnext/accounts/report/customer_ledger_summary/__init__.py create mode 100644 erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js create mode 100644 erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.json create mode 100644 erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py diff --git a/erpnext/accounts/report/customer_ledger_summary/__init__.py b/erpnext/accounts/report/customer_ledger_summary/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js new file mode 100644 index 0000000000..105977b6e4 --- /dev/null +++ b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js @@ -0,0 +1,97 @@ +// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt +/* eslint-disable */ + +frappe.query_reports["Customer Ledger Summary"] = { + "filters": [ + { + "fieldname":"company", + "label": __("Company"), + "fieldtype": "Link", + "options": "Company", + "default": frappe.defaults.get_user_default("Company") + }, + { + "fieldname":"from_date", + "label": __("From Date"), + "fieldtype": "Date", + "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1), + "reqd": 1, + "width": "60px" + }, + { + "fieldname":"to_date", + "label": __("To Date"), + "fieldtype": "Date", + "default": frappe.datetime.get_today(), + "reqd": 1, + "width": "60px" + }, + { + "fieldname":"finance_book", + "label": __("Finance Book"), + "fieldtype": "Link", + "options": "Finance Book" + }, + { + "fieldname":"party", + "label": __("Customer"), + "fieldtype": "Link", + "options": "Customer", + on_change: () => { + var customer = frappe.query_report.get_filter_value('customer'); + if (customer) { + frappe.db.get_value('Customer', customer, ["tax_id", "customer_name", "credit_limit", "payment_terms"], function(value) { + frappe.query_report.set_filter_value('tax_id', value["tax_id"]); + frappe.query_report.set_filter_value('customer_name', value["customer_name"]); + }); + } else { + frappe.query_report.set_filter_value('tax_id', ""); + frappe.query_report.set_filter_value('customer_name', ""); + } + } + }, + { + "fieldname":"customer_group", + "label": __("Customer Group"), + "fieldtype": "Link", + "options": "Customer Group" + }, + { + "fieldname":"payment_terms_template", + "label": __("Payment Terms Template"), + "fieldtype": "Link", + "options": "Payment Terms Template" + }, + { + "fieldname":"territory", + "label": __("Territory"), + "fieldtype": "Link", + "options": "Territory" + }, + { + "fieldname":"sales_partner", + "label": __("Sales Partner"), + "fieldtype": "Link", + "options": "Sales Partner" + }, + { + "fieldname":"sales_person", + "label": __("Sales Person"), + "fieldtype": "Link", + "options": "Sales Person" + }, + { + "fieldname":"tax_id", + "label": __("Tax Id"), + "fieldtype": "Data", + "hidden": 1 + }, + { + "fieldname":"customer_name", + "label": __("Customer Name"), + "fieldtype": "Data", + "hidden": 1 + } + ] +}; diff --git a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.json b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.json new file mode 100644 index 0000000000..91e4e197d3 --- /dev/null +++ b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.json @@ -0,0 +1,26 @@ +{ + "add_total_row": 1, + "creation": "2018-12-11 00:58:19.078506", + "disabled": 0, + "docstatus": 0, + "doctype": "Report", + "idx": 0, + "is_standard": "Yes", + "modified": "2018-12-11 00:59:21.708343", + "modified_by": "Administrator", + "module": "Accounts", + "name": "Customer Ledger Summary", + "owner": "Administrator", + "prepared_report": 0, + "ref_doctype": "Sales Invoice", + "report_name": "Customer Ledger Summary", + "report_type": "Script Report", + "roles": [ + { + "role": "Accounts Manager" + }, + { + "role": "Accounts User" + } + ] +} \ No newline at end of file diff --git a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py new file mode 100644 index 0000000000..0b590db49d --- /dev/null +++ b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py @@ -0,0 +1,264 @@ +# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +import erpnext +from frappe import _, scrub +from frappe.utils import getdate, nowdate, flt, cint + +class PartyLedgerSummaryReport(object): + def __init__(self, filters=None): + self.filters = frappe._dict(filters or {}) + self.filters.from_date = getdate(self.filters.from_date or nowdate()) + self.filters.to_date = getdate(self.filters.to_date or nowdate()) + + def run(self, args): + if self.filters.from_date > self.filters.to_date: + frappe.throw(_("From Date must be before To Date")) + + self.filters.party_type = args.get("party_type") + self.party_naming_by = frappe.db.get_value(args.get("naming_by")[0], None, args.get("naming_by")[1]) + + columns = self.get_columns() + data = self.get_data() + return columns, data + + def get_columns(self): + columns = [{ + "label": _(self.filters.party_type), + "fieldtype": "Link", + "fieldname": "party", + "options": self.filters.party_type, + "width": 200 + }] + + if self.party_naming_by == "Naming Series": + columns.append({ + "label": _(self.filters.party_type + "Name"), + "fieldtype": "Data", + "fieldname": "party_name", + "width": 110 + }) + + credit_or_debit_note = "Credit Note" if self.filters.party_type == "Customer" else "Debit Note" + columns += [ + { + "label": _("Opening Balance"), + "fieldname": "opening_balance", + "fieldtype": "Currency", + "width": 120 + }, + { + "label": _("Invoiced Amount"), + "fieldname": "invoiced_amount", + "fieldtype": "Currency", + "width": 120 + }, + { + "label": _("Paid Amount"), + "fieldname": "paid_amount", + "fieldtype": "Currency", + "width": 120 + }, + { + "label": _(credit_or_debit_note), + "fieldname": "return_amount", + "fieldtype": "Currency", + "width": 120 + }, + { + "label": _("Write Off Amount"), + "fieldname": "write_off_amount", + "fieldtype": "Currency", + "width": 120 + }, + { + "label": _("Closing Balance"), + "fieldname": "closing_balance", + "fieldtype": "Currency", + "width": 120 + } + ] + + return columns + + def get_data(self): + if not self.filters.get("company"): + self.filters["company"] = frappe.db.get_single_value('Global Defaults', 'default_company') + + credit_or_debit_note = "Credit Note" if self.filters.party_type == "Customer" else "Debit Note" + invoice_dr_or_cr = "debit" if self.filters.party_type == "Customer" else "credit" + reverse_dr_or_cr = "credit" if self.filters.party_type == "Customer" else "debit" + + self.get_gl_entries() + self.get_return_invoices() + self.get_party_write_off_amounts() + + self.party_data = frappe._dict({}) + for gle in self.gl_entries: + self.party_data.setdefault(gle.party, frappe._dict({ + "party": gle.party, + "party_name": "", # TODO add party_name + "opening_balance": 0, + "invoiced_amount": 0, + "paid_amount": -self.party_write_off_amounts.get(gle.party, 0), + "return_amount": 0, + "write_off_amount": self.party_write_off_amounts.get(gle.party, 0), + "closing_balance": 0 + })) + + amount = gle.get(invoice_dr_or_cr) - gle.get(reverse_dr_or_cr) + self.party_data[gle.party].closing_balance += amount + + if gle.posting_date < self.filters.from_date: + self.party_data[gle.party].opening_balance += amount + else: + if amount > 0: + self.party_data[gle.party].invoiced_amount += amount + elif gle.voucher_no in self.return_invoices: + self.party_data[gle.party].return_amount -= amount + else: + self.party_data[gle.party].paid_amount -= amount + + return [d for d in self.party_data.values() if d.opening_balance or d.invoiced_amount or d.paid_amount + or d.return_amount or d.write_off_amount or d.closing_amount] + + def get_gl_entries(self): + conditions = self.prepare_conditions() + + self.gl_entries = frappe.db.sql(""" + select + posting_date, party, voucher_type, voucher_no, against_voucher_type, against_voucher, debit, credit + from + `tabGL Entry` + where + docstatus < 2 and party_type=%(party_type)s and ifnull(party, '') != '' and posting_date <= %(to_date)s + {0} + order by posting_date""".format(conditions), self.filters, as_dict=True) + + def prepare_conditions(self): + conditions = [""] + + if self.filters.company: + conditions.append("company=%(company)s") + + self.filters.company_finance_book = erpnext.get_default_finance_book(self.filters.company) + + 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") + + if self.filters.party_type == "Customer": + if self.filters.get("customer_group"): + lft, rgt = frappe.db.get_value("Customer Group", + self.filters.get("customer_group"), ["lft", "rgt"]) + + conditions.append("""party in (select name from tabCustomer + where exists(select name from `tabCustomer Group` where lft >= {0} and rgt <= {1} + and name=tabCustomer.customer_group))""".format(lft, rgt)) + + if self.filters.get("territory"): + lft, rgt = frappe.db.get_value("Territory", + self.filters.get("territory"), ["lft", "rgt"]) + + conditions.append("""party in (select name from tabCustomer + where exists(select name from `tabTerritory` where lft >= {0} and rgt <= {1} + and name=tabCustomer.territory))""".format(lft, rgt)) + + if self.filters.get("payment_terms_template"): + conditions.append("party in (select name from tabCustomer where payment_terms=%(payment_terms_template)s)") + + if self.filters.get("sales_partner"): + conditions.append("party in (select name from tabCustomer where default_sales_partner=%(sales_partner)s)") + + if self.filters.get("sales_person"): + lft, rgt = frappe.db.get_value("Sales Person", + self.filters.get("sales_person"), ["lft", "rgt"]) + + conditions.append("""party in (select parent from `tabSales Team` + where parenttype = 'Customer' and exists(select name from `tabSales Person` + where lft >= {0} and rgt <= {1} and name=`tabSales Team`.sales_person))""".format(lft, rgt)) + + if self.filters.party_type == "Supplier": + if self.filters.get("supplier_group"): + conditions.append("""party in (select name from tabSupplier + where supplier_group=%(supplier_group)s)""") + + return " and ".join(conditions) + + def get_return_invoices(self): + doctype = "Sales Invoice" if self.filters.party_type == "Customer" else "Purchase Invoice" + self.return_invoices = [d.name for d in frappe.get_all(doctype, filters={"is_return": 1, "docstatus": 1, + "posting_date": ["between", [self.filters.from_date, self.filters.to_date]]})] + + def get_party_write_off_amounts(self): + conditions = self.prepare_conditions() + income_or_expense = "Expense Account" if self.filters.party_type == "Customer" else "Income Account" + invoice_dr_or_cr = "debit" if self.filters.party_type == "Customer" else "credit" + reverse_dr_or_cr = "credit" if self.filters.party_type == "Customer" else "debit" + round_off_account = frappe.get_cached_value('Company', self.filters.company, "round_off_account") + + gl_entries = frappe.db.sql(""" + select + posting_date, account, party, voucher_type, voucher_no, debit, credit + from + `tabGL Entry` + where + docstatus < 2 + and (voucher_type, voucher_no) in ( + select voucher_type, voucher_no from `tabGL Entry` gle, `tabAccount` acc + where acc.name = gle.account and acc.account_type = '{income_or_expense}' + and gle.posting_date between %(from_date)s and %(to_date)s and gle.docstatus < 2 + ) and (voucher_type, voucher_no) in ( + select voucher_type, voucher_no from `tabGL Entry` gle + where gle.party_type=%(party_type)s and ifnull(party, '') != '' + and gle.posting_date between %(from_date)s and %(to_date)s and gle.docstatus < 2 {conditions} + ) + order by posting_date + """.format(conditions=conditions, income_or_expense=income_or_expense), self.filters, as_dict=True) + + self.party_write_off_amounts = {} + write_off_voucher_entries = {} + for gle in gl_entries: + write_off_voucher_entries.setdefault((gle.voucher_type, gle.voucher_no), []) + write_off_voucher_entries[(gle.voucher_type, gle.voucher_no)].append(gle) + + for voucher, voucher_gl_entries in write_off_voucher_entries.iteritems(): + parties = {} + write_offs = {} + has_irrelevant_entry = False + + for gle in voucher_gl_entries: + if gle.account == round_off_account: + continue + elif gle.party: + parties.setdefault(gle.party, 0) + parties[gle.party] += gle.get(reverse_dr_or_cr) - gle.get(invoice_dr_or_cr) + elif frappe.get_cached_value("Account", gle.account, "account_type") == income_or_expense: + write_offs.setdefault(gle.account, 0) + write_offs[gle.account] += gle.get(invoice_dr_or_cr) - gle.get(reverse_dr_or_cr) + else: + has_irrelevant_entry = True + + if parties and write_offs: + if len(parties) == 1: + for account, amount in write_offs.iteritems(): + party = parties.keys()[0] + self.party_write_off_amounts.setdefault(party, 0) + self.party_write_off_amounts[party] += amount + elif len(write_offs) == 1 and not has_irrelevant_entry: + for party, amount in parties.iteritems(): + self.party_write_off_amounts.setdefault(party, 0) + self.party_write_off_amounts[party] += amount + +def execute(filters=None): + args = { + "party_type": "Customer", + "naming_by": ["Selling Settings", "cust_master_name"], + } + return PartyLedgerSummaryReport(filters).run(args) \ No newline at end of file From b07d108beeb361309df1cb11d3be831e5f24841c Mon Sep 17 00:00:00 2001 From: Saif Ur Rehman Date: Wed, 12 Dec 2018 05:45:49 +0500 Subject: [PATCH 02/86] feat: Supplier Ledger Summary --- .../customer_ledger_summary.js | 6 +- .../customer_ledger_summary.py | 18 +++- .../supplier_ledger_summary/__init__.py | 0 .../supplier_ledger_summary.js | 97 +++++++++++++++++++ .../supplier_ledger_summary.json | 27 ++++++ .../supplier_ledger_summary.py | 13 +++ 6 files changed, 156 insertions(+), 5 deletions(-) create mode 100644 erpnext/accounts/report/supplier_ledger_summary/__init__.py create mode 100644 erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js create mode 100644 erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.json create mode 100644 erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.py diff --git a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js index 105977b6e4..a123631663 100644 --- a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js +++ b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js @@ -39,9 +39,9 @@ frappe.query_reports["Customer Ledger Summary"] = { "fieldtype": "Link", "options": "Customer", on_change: () => { - var customer = frappe.query_report.get_filter_value('customer'); - if (customer) { - frappe.db.get_value('Customer', customer, ["tax_id", "customer_name", "credit_limit", "payment_terms"], function(value) { + var party = frappe.query_report.get_filter_value('party'); + if (party) { + frappe.db.get_value('Customer', party, ["tax_id", "customer_name"], function(value) { frappe.query_report.set_filter_value('tax_id', value["tax_id"]); frappe.query_report.set_filter_value('customer_name', value["customer_name"]); }); diff --git a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py index 0b590db49d..63a3498f00 100644 --- a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py +++ b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py @@ -47,37 +47,50 @@ class PartyLedgerSummaryReport(object): "label": _("Opening Balance"), "fieldname": "opening_balance", "fieldtype": "Currency", + "options": "currency", "width": 120 }, { "label": _("Invoiced Amount"), "fieldname": "invoiced_amount", "fieldtype": "Currency", + "options": "currency", "width": 120 }, { "label": _("Paid Amount"), "fieldname": "paid_amount", "fieldtype": "Currency", + "options": "currency", "width": 120 }, { "label": _(credit_or_debit_note), "fieldname": "return_amount", "fieldtype": "Currency", + "options": "currency", "width": 120 }, { "label": _("Write Off Amount"), "fieldname": "write_off_amount", "fieldtype": "Currency", + "options": "currency", "width": 120 }, { "label": _("Closing Balance"), "fieldname": "closing_balance", "fieldtype": "Currency", + "options": "currency", "width": 120 + }, + { + "label": _("Currency"), + "fieldname": "currency", + "fieldtype": "Link", + "options": "Currency", + "width": 50 } ] @@ -87,7 +100,7 @@ class PartyLedgerSummaryReport(object): if not self.filters.get("company"): self.filters["company"] = frappe.db.get_single_value('Global Defaults', 'default_company') - credit_or_debit_note = "Credit Note" if self.filters.party_type == "Customer" else "Debit Note" + company_currency = frappe.get_cached_value('Company', self.filters.get("company"), "default_currency") invoice_dr_or_cr = "debit" if self.filters.party_type == "Customer" else "credit" reverse_dr_or_cr = "credit" if self.filters.party_type == "Customer" else "debit" @@ -105,7 +118,8 @@ class PartyLedgerSummaryReport(object): "paid_amount": -self.party_write_off_amounts.get(gle.party, 0), "return_amount": 0, "write_off_amount": self.party_write_off_amounts.get(gle.party, 0), - "closing_balance": 0 + "closing_balance": 0, + "currency": company_currency })) amount = gle.get(invoice_dr_or_cr) - gle.get(reverse_dr_or_cr) diff --git a/erpnext/accounts/report/supplier_ledger_summary/__init__.py b/erpnext/accounts/report/supplier_ledger_summary/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js b/erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js new file mode 100644 index 0000000000..6fd16f2090 --- /dev/null +++ b/erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js @@ -0,0 +1,97 @@ +// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt +/* eslint-disable */ + +frappe.query_reports["Supplier Ledger Summary"] = { + "filters": [ + { + "fieldname":"company", + "label": __("Company"), + "fieldtype": "Link", + "options": "Company", + "default": frappe.defaults.get_user_default("Company") + }, + { + "fieldname":"from_date", + "label": __("From Date"), + "fieldtype": "Date", + "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1), + "reqd": 1, + "width": "60px" + }, + { + "fieldname":"to_date", + "label": __("To Date"), + "fieldtype": "Date", + "default": frappe.datetime.get_today(), + "reqd": 1, + "width": "60px" + }, + { + "fieldname":"finance_book", + "label": __("Finance Book"), + "fieldtype": "Link", + "options": "Finance Book" + }, + { + "fieldname":"party", + "label": __("Customer"), + "fieldtype": "Link", + "options": "Customer", + on_change: () => { + var party = frappe.query_report.get_filter_value('party'); + if (party) { + frappe.db.get_value('Supplier', party, ["tax_id", "supplier_name"], function(value) { + frappe.query_report.set_filter_value('tax_id', value["tax_id"]); + frappe.query_report.set_filter_value('supplier_name', value["supplier_name"]); + }); + } else { + frappe.query_report.set_filter_value('tax_id', ""); + frappe.query_report.set_filter_value('supplier_name', ""); + } + } + }, + { + "fieldname":"supplier_group", + "label": __("Supplier Group"), + "fieldtype": "Link", + "options": "Supplier Group" + }, + { + "fieldname":"payment_terms_template", + "label": __("Payment Terms Template"), + "fieldtype": "Link", + "options": "Payment Terms Template" + }, + { + "fieldname":"territory", + "label": __("Territory"), + "fieldtype": "Link", + "options": "Territory" + }, + { + "fieldname":"sales_partner", + "label": __("Sales Partner"), + "fieldtype": "Link", + "options": "Sales Partner" + }, + { + "fieldname":"sales_person", + "label": __("Sales Person"), + "fieldtype": "Link", + "options": "Sales Person" + }, + { + "fieldname":"tax_id", + "label": __("Tax Id"), + "fieldtype": "Data", + "hidden": 1 + }, + { + "fieldname":"supplier_name", + "label": __("Supplier Name"), + "fieldtype": "Data", + "hidden": 1 + } + ] +}; diff --git a/erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.json b/erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.json new file mode 100644 index 0000000000..eb3b4123e2 --- /dev/null +++ b/erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.json @@ -0,0 +1,27 @@ +{ + "add_total_row": 1, + "creation": "2018-12-12 05:10:02.987274", + "disabled": 0, + "docstatus": 0, + "doctype": "Report", + "idx": 0, + "is_standard": "Yes", + "letter_head": "Capital Traders", + "modified": "2018-12-12 05:10:02.987274", + "modified_by": "Administrator", + "module": "Accounts", + "name": "Supplier Ledger Summary", + "owner": "Administrator", + "prepared_report": 0, + "ref_doctype": "Purchase Invoice", + "report_name": "Supplier Ledger Summary", + "report_type": "Script Report", + "roles": [ + { + "role": "Accounts Manager" + }, + { + "role": "Accounts User" + } + ] +} \ No newline at end of file diff --git a/erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.py b/erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.py new file mode 100644 index 0000000000..d2c23ee4e7 --- /dev/null +++ b/erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.py @@ -0,0 +1,13 @@ +# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from erpnext.accounts.report.customer_ledger_summary.customer_ledger_summary import PartyLedgerSummaryReport + +def execute(filters=None): + args = { + "party_type": "Supplier", + "naming_by": ["Buying Settings", "supp_master_name"], + } + return PartyLedgerSummaryReport(filters).run(args) \ No newline at end of file From b53231595d5649ed9fb3d45853ab46ae73240e52 Mon Sep 17 00:00:00 2001 From: Saif Ur Rehman Date: Wed, 12 Dec 2018 15:46:50 +0500 Subject: [PATCH 03/86] Using same filter for Sales Person from Accounts Receivable Added Customer/Supplier Ledger Summary in Accounts Module page --- .../customer_ledger_summary.py | 11 +++-- erpnext/config/accounts.py | 48 ++++++++++++------- 2 files changed, 38 insertions(+), 21 deletions(-) diff --git a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py index 63a3498f00..2b228fd6b6 100644 --- a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py +++ b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py @@ -194,9 +194,14 @@ class PartyLedgerSummaryReport(object): lft, rgt = frappe.db.get_value("Sales Person", self.filters.get("sales_person"), ["lft", "rgt"]) - conditions.append("""party in (select parent from `tabSales Team` - where parenttype = 'Customer' and exists(select name from `tabSales Person` - where lft >= {0} and rgt <= {1} and name=`tabSales Team`.sales_person))""".format(lft, rgt)) + conditions.append("""exists(select name from `tabSales Team` steam where + steam.sales_person in (select name from `tabSales Person` where lft >= {0} and rgt <= {1}) + and ((steam.parent = voucher_no and steam.parenttype = voucher_type) + or (steam.parent = against_voucher and steam.parenttype = against_voucher_type) + or (steam.parent = party and steam.parenttype = 'Customer')))""".format(lft, rgt)) + #conditions.append("""party in (select parent from `tabSales Team` + # where parenttype = 'Customer' and exists(select name from `tabSales Person` + # where lft >= {0} and rgt <= {1} and name=`tabSales Team`.sales_person))""".format(lft, rgt)) if self.filters.party_type == "Supplier": if self.filters.get("supplier_group"): diff --git a/erpnext/config/accounts.py b/erpnext/config/accounts.py index 15996c3a44..bfa7162400 100644 --- a/erpnext/config/accounts.py +++ b/erpnext/config/accounts.py @@ -351,6 +351,36 @@ def get_data(): "is_query_report": True, "doctype": "Sales Invoice" }, + { + "type": "report", + "name": "Item-wise Sales Register", + "is_query_report": True, + "doctype": "Sales Invoice" + }, + { + "type": "report", + "name": "Item-wise Purchase Register", + "is_query_report": True, + "doctype": "Purchase Invoice" + }, + { + "type": "report", + "name": "Profitability Analysis", + "doctype": "GL Entry", + "is_query_report": True, + }, + { + "type": "report", + "name": "Customer Ledger Summary", + "doctype": "Sales Invoice", + "is_query_report": True, + }, + { + "type": "report", + "name": "Supplier Ledger Summary", + "doctype": "Sales Invoice", + "is_query_report": True, + } ] }, { @@ -363,12 +393,6 @@ def get_data(): "doctype": "GL Entry", "is_query_report": True, }, - { - "type": "report", - "name": "Profitability Analysis", - "doctype": "GL Entry", - "is_query_report": True, - }, { "type": "report", "name": "Payment Period Based On Invoice Date", @@ -381,18 +405,6 @@ def get_data(): "is_query_report": True, "doctype": "Sales Invoice" }, - { - "type": "report", - "name": "Item-wise Sales Register", - "is_query_report": True, - "doctype": "Sales Invoice" - }, - { - "type": "report", - "name": "Item-wise Purchase Register", - "is_query_report": True, - "doctype": "Purchase Invoice" - }, { "type": "report", "name": "Accounts Receivable Summary", From f6f503a1f658cabe031c9b7a62253844e862cfc3 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 19 Dec 2018 15:06:44 +0530 Subject: [PATCH 04/86] [Fix] Is fixed asset checkbox not checked if user duplicate the existing invoice --- erpnext/assets/doctype/asset/test_asset.py | 12 +++++++++++- erpnext/controllers/accounts_controller.py | 3 +++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/erpnext/assets/doctype/asset/test_asset.py b/erpnext/assets/doctype/asset/test_asset.py index 76c46cff7a..de164762ff 100644 --- a/erpnext/assets/doctype/asset/test_asset.py +++ b/erpnext/assets/doctype/asset/test_asset.py @@ -49,7 +49,17 @@ class TestAsset(unittest.TestCase): self.assertFalse(frappe.db.get_value("GL Entry", {"voucher_type": "Purchase Invoice", "voucher_no": pi.name})) - + + def test_is_fixed_asset_set(self): + doc = frappe.new_doc('Purchase Invoice') + doc.supplier = '_Test Supplier' + doc.append('items', { + 'item_code': 'Macbook Pro', + 'qty': 1 + }) + + doc.set_missing_values() + self.assertEquals(doc.items[0].is_fixed_asset, 1) def test_schedule_for_straight_line_method(self): asset = frappe.get_doc("Asset", "Macbook Pro 1") diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 68f4f73147..97536e7e82 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -218,6 +218,9 @@ class AccountsController(TransactionBase): if stock_qty != len(get_serial_nos(item.get('serial_no'))): item.set(fieldname, value) + if self.doctype in ["Purchase Invoice", "Sales Invoice"] and item.meta.get_field('is_fixed_asset'): + item.set('is_fixed_asset', ret.get('is_fixed_asset', 0)) + if ret.get("pricing_rule"): # if user changed the discount percentage then set user's discount percentage ? item.set("discount_percentage", ret.get("discount_percentage")) From e2762df90be03f4829b23c827f2ba9a9b06804df Mon Sep 17 00:00:00 2001 From: scmmishra Date: Tue, 8 Jan 2019 17:38:28 +0530 Subject: [PATCH 05/86] Fix: Naming series not reflecting in leave application --- erpnext/hr/doctype/leave_application/leave_application.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/hr/doctype/leave_application/leave_application.json b/erpnext/hr/doctype/leave_application/leave_application.json index 7afbc4da89..eaef60cb62 100644 --- a/erpnext/hr/doctype/leave_application/leave_application.json +++ b/erpnext/hr/doctype/leave_application/leave_application.json @@ -3,7 +3,7 @@ "allow_guest_to_view": 0, "allow_import": 0, "allow_rename": 0, - "autoname": "LAP/.#####", + "autoname": "naming_series:", "beta": 0, "creation": "2013-02-20 11:18:11", "custom": 0, @@ -796,7 +796,7 @@ "issingle": 0, "istable": 0, "max_attachments": 3, - "modified": "2017-06-13 14:28:52.426044", + "modified": "2019-01-08 17:35:10.795225", "modified_by": "Administrator", "module": "HR", "name": "Leave Application", From b2c9268ece2feaef11dab0aaa07f60e576f771c9 Mon Sep 17 00:00:00 2001 From: Jamsheer Date: Mon, 19 Nov 2018 16:05:34 +0530 Subject: [PATCH 06/86] fix: Patient Appointment - Calendar - set color from appointment type --- .../patient_appointment/patient_appointment.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py index 5364031fce..7ac44b6cc2 100755 --- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py @@ -337,11 +337,19 @@ def get_events(start, end, filters=None): from frappe.desk.calendar import get_event_conditions conditions = get_event_conditions("Patient Appointment", filters) - data = frappe.db.sql("""select name, patient, practitioner, status, - duration, timestamp(appointment_date, appointment_time) as - 'start' from `tabPatient Appointment` where - (appointment_date between %(start)s and %(end)s) - and docstatus < 2 {conditions}""".format(conditions=conditions), + data = frappe.db.sql(""" + select + `tabPatient Appointment`.name, `tabPatient Appointment`.patient, + `tabPatient Appointment`.practitioner, `tabPatient Appointment`.status, + `tabPatient Appointment`.duration, + timestamp(`tabPatient Appointment`.appointment_date, `tabPatient Appointment`.appointment_time) as 'start', + `tabAppointment Type`.color + from + `tabPatient Appointment` + left join `tabAppointment Type` on `tabPatient Appointment`.appointment_type=`tabAppointment Type`.name + where + (`tabPatient Appointment`.appointment_date between %(start)s and %(end)s) + and `tabPatient Appointment`.docstatus < 2 {conditions}""".format(conditions=conditions), {"start": start, "end": end}, as_dict=True, update={"allDay": 0}) for item in data: From f4d0fcb8361cd92a6f1df75322670f7875b7ae0b Mon Sep 17 00:00:00 2001 From: Jamsheer Date: Mon, 19 Nov 2018 16:10:13 +0530 Subject: [PATCH 07/86] fix: patient - user welcome email configuration --- erpnext/healthcare/doctype/patient/patient.py | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/healthcare/doctype/patient/patient.py b/erpnext/healthcare/doctype/patient/patient.py index bff24f7ab2..bf15cad5d5 100644 --- a/erpnext/healthcare/doctype/patient/patient.py +++ b/erpnext/healthcare/doctype/patient/patient.py @@ -33,7 +33,6 @@ class Patient(Document): "email": self.email, "user_type": "Website User" }) - user.flags.no_welcome_email = True user.flags.ignore_permissions = True user.add_roles("Patient") From f3c4f5a901ab256a7eaf5699ff748b3850927992 Mon Sep 17 00:00:00 2001 From: Jamsheer Date: Mon, 19 Nov 2018 16:29:32 +0530 Subject: [PATCH 08/86] fix: Clinical Procedure - copy fields from appointment --- .../doctype/clinical_procedure/clinical_procedure.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.py b/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.py index a21f5acb7e..beffe367d8 100644 --- a/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.py +++ b/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.py @@ -183,13 +183,15 @@ def create_procedure(appointment): procedure.patient_age = appointment.patient_age procedure.patient_sex = appointment.patient_sex procedure.procedure_template = appointment.procedure_template - procedure.procedure_prescription = appointment.procedure_prescription + procedure.prescription = appointment.procedure_prescription + procedure.practitioner = appointment.practitioner procedure.invoiced = appointment.invoiced procedure.medical_department = appointment.department procedure.start_date = appointment.appointment_date procedure.start_time = appointment.appointment_time procedure.notes = appointment.notes procedure.service_unit = appointment.service_unit + procedure.company = appointment.company consume_stock = frappe.db.get_value("Clinical Procedure Template", appointment.procedure_template, "consume_stock") if consume_stock == 1: procedure.consume_stock = True @@ -203,7 +205,9 @@ def create_procedure(appointment): return procedure.as_dict() def insert_clinical_procedure_to_medical_record(doc): - subject = cstr(doc.procedure_template) +" "+ doc.practitioner + subject = cstr(doc.procedure_template) + if doc.practitioner: + subject += " "+doc.practitioner if subject and doc.notes: subject += "
"+doc.notes From 3e01891e229b966401d46050ffdf10779f57d228 Mon Sep 17 00:00:00 2001 From: Jamsheer Date: Mon, 19 Nov 2018 17:02:48 +0530 Subject: [PATCH 09/86] fix: Traverse note from procedure prescription to appointment --- .../doctype/patient_appointment/patient_appointment.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py index 7ac44b6cc2..117608234e 100755 --- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py @@ -27,6 +27,10 @@ class PatientAppointment(Document): def after_insert(self): if self.procedure_prescription: frappe.db.set_value("Procedure Prescription", self.procedure_prescription, "appointment_booked", True) + if self.procedure_template: + comments = frappe.db.get_value("Procedure Prescription", self.procedure_prescription, "comments") + if comments: + frappe.db.set_value("Patient Appointment", self.name, "notes", comments) # Check fee validity exists appointment = self validity_exist = validity_exists(appointment.practitioner, appointment.patient) From fb7b5292b3e207ddcf7060f2c18d2c6f7842ead5 Mon Sep 17 00:00:00 2001 From: Jamsheer Date: Mon, 19 Nov 2018 17:07:35 +0530 Subject: [PATCH 10/86] fix: Clinical Procedure - consume stock if items present --- .../healthcare/doctype/clinical_procedure/clinical_procedure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.py b/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.py index beffe367d8..7c6f4d5999 100644 --- a/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.py +++ b/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.py @@ -43,7 +43,7 @@ class ClinicalProcedure(Document): self.reload() def complete(self): - if self.consume_stock: + if self.consume_stock and self.items: create_stock_entry(self) frappe.db.set_value("Clinical Procedure", self.name, "status", 'Completed') From c0097ad72935959164a3524d36e131fc98169832 Mon Sep 17 00:00:00 2001 From: Jamsheer Date: Fri, 23 Nov 2018 11:37:58 +0530 Subject: [PATCH 11/86] feat: Filter active Healthcare Practitioner --- .../healthcare_practitioner.json | 1910 +++++++++-------- .../healthcare_practitioner.py | 21 + erpnext/hooks.py | 3 +- 3 files changed, 995 insertions(+), 939 deletions(-) diff --git a/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner.json b/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner.json index ad68924d5a..4a848a081d 100644 --- a/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner.json +++ b/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner.json @@ -1,1007 +1,1041 @@ { - "allow_copy": 1, - "allow_guest_to_view": 0, - "allow_import": 1, - "allow_rename": 1, - "autoname": "", - "beta": 1, - "creation": "2016-02-23 11:20:53.565119", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "Setup", - "editable_grid": 0, + "allow_copy": 1, + "allow_events_in_timeline": 0, + "allow_guest_to_view": 0, + "allow_import": 1, + "allow_rename": 1, + "autoname": "", + "beta": 1, + "creation": "2016-02-23 11:20:53.565119", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "Setup", + "editable_grid": 0, "fields": [ { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "first_name", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 1, - "label": "First Name", - "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": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "first_name", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 1, + "label": "First Name", + "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": 1, + "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, - "fieldname": "middle_name", - "fieldtype": "Data", - "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": "Middle Name (Optional)", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "middle_name", + "fieldtype": "Data", + "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": "Middle Name (Optional)", + "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, - "fieldname": "last_name", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Last Name", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "last_name", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Last Name", + "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, - "fieldname": "image", - "fieldtype": "Attach Image", - "hidden": 1, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Image", - "length": 0, - "no_copy": 1, - "permlevel": 0, - "precision": "", - "print_hide": 1, - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "image", + "fieldtype": "Attach Image", + "hidden": 1, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Image", + "length": 0, + "no_copy": 1, + "permlevel": 0, + "precision": "", + "print_hide": 1, + "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, - "fieldname": "employee", - "fieldtype": "Link", - "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": "Employee", - "length": 0, - "no_copy": 0, - "options": "Employee", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "employee", + "fieldtype": "Link", + "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": "Employee", + "length": 0, + "no_copy": 0, + "options": "Employee", + "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, - "fieldname": "user_id", - "fieldtype": "Link", - "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": "User", - "length": 0, - "no_copy": 0, - "options": "User", - "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": 1, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "user_id", + "fieldtype": "Link", + "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": "User", + "length": 0, + "no_copy": 0, + "options": "User", + "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": 1, + "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, - "fieldname": "designation", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 1, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 1, - "label": "Designation", - "length": 0, - "no_copy": 0, - "options": "Designation", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "designation", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 1, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Designation", + "length": 0, + "no_copy": 0, + "options": "Designation", + "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, - "fieldname": "department", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 1, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 1, - "label": "Department", - "length": 0, - "no_copy": 0, - "options": "Medical Department", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "department", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 1, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 1, + "label": "Department", + "length": 0, + "no_copy": 0, + "options": "Medical Department", + "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, - "fieldname": "column_break_7", - "fieldtype": "Column Break", - "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, - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_7", + "fieldtype": "Column Break", + "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, + "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, - "fieldname": "hospital", - "fieldtype": "Data", - "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": "Hospital", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "hospital", + "fieldtype": "Data", + "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": "Hospital", + "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, - "fieldname": "mobile_phone", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Mobile", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "mobile_phone", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Mobile", + "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, - "fieldname": "residence_phone", - "fieldtype": "Data", - "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": "Phone (R)", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "residence_phone", + "fieldtype": "Data", + "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": "Phone (R)", + "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, - "fieldname": "office_phone", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Phone (Office)", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "office_phone", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Phone (Office)", + "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, - "fieldname": "appointments", - "fieldtype": "Section Break", - "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": "Appointments", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "1", + "fieldname": "active", + "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": "Active", + "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, - "fieldname": "practitioner_schedules", - "fieldtype": "Table", - "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": "Practitioner Schedules", - "length": 0, - "no_copy": 0, - "options": "Practitioner Service Unit Schedule", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "appointments", + "fieldtype": "Section Break", + "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": "Appointments", + "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, - "fieldname": "charges", - "fieldtype": "Section Break", - "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": "Charges", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "practitioner_schedules", + "fieldtype": "Table", + "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": "Practitioner Schedules", + "length": 0, + "no_copy": 0, + "options": "Practitioner Service Unit Schedule", + "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, - "fieldname": "op_consulting_charge_item", - "fieldtype": "Link", - "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": "Out Patient Consulting Charge Item", - "length": 0, - "no_copy": 0, - "options": "Item", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "charges", + "fieldtype": "Section Break", + "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": "Charges", + "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, - "fieldname": "op_consulting_charge", - "fieldtype": "Currency", - "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": "OP Consulting Charge", - "length": 0, - "no_copy": 0, - "options": "Currency", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "op_consulting_charge_item", + "fieldtype": "Link", + "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": "Out Patient Consulting Charge Item", + "length": 0, + "no_copy": 0, + "options": "Item", + "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, - "fieldname": "column_break_18", - "fieldtype": "Column Break", - "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, - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "op_consulting_charge", + "fieldtype": "Currency", + "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": "OP Consulting Charge", + "length": 0, + "no_copy": 0, + "options": "Currency", + "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, - "fieldname": "inpatient_visit_charge_item", - "fieldtype": "Link", - "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": "Inpatient Visit Charge Item", - "length": 0, - "no_copy": 0, - "options": "Item", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_18", + "fieldtype": "Column Break", + "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, + "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, - "fieldname": "inpatient_visit_charge", - "fieldtype": "Currency", - "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": "Inpatient Visit Charge", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "inpatient_visit_charge_item", + "fieldtype": "Link", + "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": "Inpatient Visit Charge Item", + "length": 0, + "no_copy": 0, + "options": "Item", + "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, - "fieldname": "contacts_and_address", - "fieldtype": "Section Break", - "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": "Contacts and Address", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "inpatient_visit_charge", + "fieldtype": "Currency", + "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": "Inpatient Visit Charge", + "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, - "fieldname": "address_html", - "fieldtype": "HTML", - "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": "Address HTML", - "length": 0, - "no_copy": 1, - "permlevel": 0, - "precision": "", - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 1, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "contacts_and_address", + "fieldtype": "Section Break", + "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": "Contacts and Address", + "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, - "fieldname": "column_break_19", - "fieldtype": "Column Break", - "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, - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "address_html", + "fieldtype": "HTML", + "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": "Address HTML", + "length": 0, + "no_copy": 1, + "permlevel": 0, + "precision": "", + "print_hide": 1, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 1, + "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, - "fieldname": "contact_html", - "fieldtype": "HTML", - "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": "Contact HTML", - "length": 0, - "no_copy": 1, - "permlevel": 0, - "precision": "", - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 1, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_19", + "fieldtype": "Column Break", + "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, + "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, - "fieldname": "account_details", - "fieldtype": "Section Break", - "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": "Account Details", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "contact_html", + "fieldtype": "HTML", + "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": "Contact HTML", + "length": 0, + "no_copy": 1, + "permlevel": 0, + "precision": "", + "print_hide": 1, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 1, + "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, - "fieldname": "accounts", - "fieldtype": "Table", - "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": "Income Account", - "length": 0, - "no_copy": 0, - "options": "Party Account", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "account_details", + "fieldtype": "Section Break", + "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": "Account Details", + "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, - "fieldname": "default_currency", - "fieldtype": "Link", - "hidden": 1, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Default Currency", - "length": 0, - "no_copy": 1, - "options": "Currency", - "permlevel": 0, - "precision": "", - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 1, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "accounts", + "fieldtype": "Table", + "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": "Income Account", + "length": 0, + "no_copy": 0, + "options": "Party Account", + "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, + "fieldname": "default_currency", + "fieldtype": "Link", + "hidden": 1, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Default Currency", + "length": 0, + "no_copy": 1, + "options": "Currency", + "permlevel": 0, + "precision": "", + "print_hide": 1, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 1, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_field": "image", - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2018-08-06 16:45:37.899084", - "modified_by": "Administrator", - "module": "Healthcare", - "name": "Healthcare Practitioner", - "name_case": "", - "owner": "Administrator", + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_field": "image", + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2018-11-23 08:54:51.442105", + "modified_by": "Administrator", + "module": "Healthcare", + "name": "Healthcare Practitioner", + "name_case": "", + "owner": "Administrator", "permissions": [ { - "amend": 0, - "cancel": 0, - "create": 1, - "delete": 0, - "email": 1, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Laboratory User", - "set_user_permissions": 0, - "share": 1, - "submit": 0, + "amend": 0, + "cancel": 0, + "create": 1, + "delete": 0, + "email": 1, + "export": 0, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Laboratory User", + "set_user_permissions": 0, + "share": 1, + "submit": 0, "write": 1 - }, + }, { - "amend": 0, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Physician", - "set_user_permissions": 0, - "share": 1, - "submit": 0, + "amend": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Physician", + "set_user_permissions": 0, + "share": 1, + "submit": 0, "write": 1 - }, + }, { - "amend": 0, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Nursing User", - "set_user_permissions": 0, - "share": 1, - "submit": 0, + "amend": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Nursing User", + "set_user_permissions": 0, + "share": 1, + "submit": 0, "write": 1 } - ], - "quick_entry": 0, - "read_only": 0, - "read_only_onload": 0, - "restrict_to_domain": "Healthcare", - "search_fields": "first_name,mobile_phone,office_phone", - "show_name_in_global_search": 1, - "sort_field": "modified", - "sort_order": "DESC", - "title_field": "first_name", - "track_changes": 1, - "track_seen": 0, + ], + "quick_entry": 0, + "read_only": 0, + "read_only_onload": 0, + "restrict_to_domain": "Healthcare", + "search_fields": "first_name,mobile_phone,office_phone", + "show_name_in_global_search": 1, + "sort_field": "modified", + "sort_order": "DESC", + "title_field": "first_name", + "track_changes": 1, + "track_seen": 0, "track_views": 0 } \ No newline at end of file diff --git a/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner.py b/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner.py index 8a087dd1b2..891d86557f 100644 --- a/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner.py +++ b/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner.py @@ -9,6 +9,7 @@ from frappe import throw, _ from frappe.utils import cstr from erpnext.accounts.party import validate_party_accounts from frappe.contacts.address_and_contact import load_address_and_contact, delete_contact_and_address +from frappe.desk.reportview import build_match_conditions, get_filters_cond class HealthcarePractitioner(Document): def onload(self): @@ -65,3 +66,23 @@ class HealthcarePractitioner(Document): def validate_service_item(item, msg): if frappe.db.get_value("Item", item, "is_stock_item") == 1: frappe.throw(_(msg)) + +def get_practitioner_list(doctype, txt, searchfield, start, page_len, filters=None): + fields = ["name", "first_name", "mobile_phone"] + match_conditions = build_match_conditions("Healthcare Practitioner") + match_conditions = "and {}".format(match_conditions) if match_conditions else "" + + if filters: + filter_conditions = get_filters_cond(doctype, filters, []) + match_conditions += "{}".format(filter_conditions) + + return frappe.db.sql("""select %s from `tabHealthcare Practitioner` where docstatus < 2 + and (%s like %s or first_name like %s) + and active = 1 + {match_conditions} + order by + case when name like %s then 0 else 1 end, + case when first_name like %s then 0 else 1 end, + name, first_name limit %s, %s""".format(match_conditions=match_conditions) % + (", ".join(fields), searchfield, "%s", "%s", "%s", "%s", "%s", "%s"), + ("%%%s%%" % txt, "%%%s%%" % txt, "%%%s%%" % txt, "%%%s%%" % txt, start, page_len)) diff --git a/erpnext/hooks.py b/erpnext/hooks.py index bf7e32ab78..e8d3b07698 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -182,7 +182,8 @@ dump_report_map = "erpnext.startup.report_data_map.data_map" before_tests = "erpnext.setup.utils.before_tests" standard_queries = { - "Customer": "erpnext.selling.doctype.customer.customer.get_customer_list" + "Customer": "erpnext.selling.doctype.customer.customer.get_customer_list", + "Healthcare Practitioner": "erpnext.healthcare.doctype.healthcare_practitioner.healthcare_practitioner.get_practitioner_list" } doc_events = { From 52ac72e63e82b6502b325e29e06fabb55d09e896 Mon Sep 17 00:00:00 2001 From: Jamsheer Date: Fri, 23 Nov 2018 14:16:42 +0530 Subject: [PATCH 12/86] fix: Validate Patient Appointment --- .../patient_appointment.py | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py index 117608234e..1f7e1b7f42 100755 --- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document import json -from frappe.utils import getdate, add_days +from frappe.utils import getdate, add_days, get_time from frappe import _ import datetime from frappe.core.doctype.sms_settings.sms_settings import send_sms @@ -24,6 +24,27 @@ class PatientAppointment(Document): frappe.db.set_value("Patient Appointment", self.name, "status", "Open") self.reload() + def validate(self): + end_time = datetime.datetime.combine(getdate(self.appointment_date), get_time(self.appointment_time)) + datetime.timedelta(minutes=float(self.duration)) + overlaps = frappe.db.sql(""" + select + name, practitioner, patient, appointment_time, duration + from + `tabPatient Appointment` + where + appointment_date=%s and name!=%s and status NOT IN ("Closed", "Cancelled") + and (practitioner=%s or patient=%s) and + ((appointment_time<%s and appointment_time + INTERVAL duration MINUTE>%s) or + (appointment_time>%s and appointment_time<%s) or + (appointment_time=%s)) + """, (self.appointment_date, self.name, self.practitioner, self.patient, + self.appointment_time, end_time.time(), self.appointment_time, end_time.time(), self.appointment_time)) + + print (overlaps) + if overlaps: + frappe.throw(_("""Appointment overlaps with {0}.
{1} has appointment scheduled + with {2} at {3} having {4} minute(s) duration.""").format(overlaps[0][0], overlaps[0][1], overlaps[0][2], overlaps[0][3], overlaps[0][4])) + def after_insert(self): if self.procedure_prescription: frappe.db.set_value("Procedure Prescription", self.procedure_prescription, "appointment_booked", True) From c3804230cdcad17c24f1d1409c8996194a4912fd Mon Sep 17 00:00:00 2001 From: Jamsheer Date: Fri, 23 Nov 2018 14:43:52 +0530 Subject: [PATCH 13/86] fix: Patient - Quick Entry enabled --- erpnext/healthcare/doctype/patient/patient.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/erpnext/healthcare/doctype/patient/patient.json b/erpnext/healthcare/doctype/patient/patient.json index 28e5351e67..c195f4ddc7 100644 --- a/erpnext/healthcare/doctype/patient/patient.json +++ b/erpnext/healthcare/doctype/patient/patient.json @@ -219,7 +219,7 @@ "allow_bulk_edit": 0, "allow_in_quick_entry": 0, "allow_on_submit": 0, - "bold": 0, + "bold": 1, "collapsible": 0, "columns": 0, "fieldname": "blood_group", @@ -252,7 +252,7 @@ "allow_bulk_edit": 0, "allow_in_quick_entry": 0, "allow_on_submit": 0, - "bold": 0, + "bold": 1, "collapsible": 0, "columns": 0, "fieldname": "dob", @@ -480,7 +480,7 @@ "allow_bulk_edit": 0, "allow_in_quick_entry": 0, "allow_on_submit": 0, - "bold": 0, + "bold": 1, "collapsible": 0, "columns": 0, "fieldname": "mobile", @@ -512,7 +512,7 @@ "allow_bulk_edit": 0, "allow_in_quick_entry": 0, "allow_on_submit": 0, - "bold": 0, + "bold": 1, "collapsible": 0, "columns": 0, "fieldname": "email", @@ -1391,7 +1391,7 @@ "issingle": 0, "istable": 0, "max_attachments": 50, - "modified": "2018-10-14 22:09:39.849116", + "modified": "2018-11-23 12:11:14.336657", "modified_by": "Administrator", "module": "Healthcare", "name": "Patient", @@ -1456,7 +1456,7 @@ "write": 1 } ], - "quick_entry": 0, + "quick_entry": 1, "read_only": 0, "read_only_onload": 0, "restrict_to_domain": "Healthcare", From 17bb0da27863dec52cdf1199959b26b6935b8c38 Mon Sep 17 00:00:00 2001 From: Jamsheer Date: Fri, 23 Nov 2018 15:39:11 +0530 Subject: [PATCH 14/86] fix: remove print statement --- .../doctype/patient_appointment/patient_appointment.py | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py index 1f7e1b7f42..dbc302e418 100755 --- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py @@ -40,7 +40,6 @@ class PatientAppointment(Document): """, (self.appointment_date, self.name, self.practitioner, self.patient, self.appointment_time, end_time.time(), self.appointment_time, end_time.time(), self.appointment_time)) - print (overlaps) if overlaps: frappe.throw(_("""Appointment overlaps with {0}.
{1} has appointment scheduled with {2} at {3} having {4} minute(s) duration.""").format(overlaps[0][0], overlaps[0][1], overlaps[0][2], overlaps[0][3], overlaps[0][4])) From f2d7e3309f87cd6f8b7dce59a7eba0e95c740e9a Mon Sep 17 00:00:00 2001 From: Jamsheer Date: Fri, 23 Nov 2018 16:29:30 +0530 Subject: [PATCH 15/86] fix: Patient Appointment - Calendar - status != Cancelled --- .../doctype/patient_appointment/patient_appointment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py index dbc302e418..7aa41c546c 100755 --- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py @@ -373,7 +373,7 @@ def get_events(start, end, filters=None): left join `tabAppointment Type` on `tabPatient Appointment`.appointment_type=`tabAppointment Type`.name where (`tabPatient Appointment`.appointment_date between %(start)s and %(end)s) - and `tabPatient Appointment`.docstatus < 2 {conditions}""".format(conditions=conditions), + and `tabPatient Appointment`.status != 'Cancelled' and `tabPatient Appointment`.docstatus < 2 {conditions}""".format(conditions=conditions), {"start": start, "end": end}, as_dict=True, update={"allDay": 0}) for item in data: From 45c5138eafe6d2c21f1773de73ee9aa21f6f125b Mon Sep 17 00:00:00 2001 From: Jamsheer Date: Fri, 23 Nov 2018 16:48:10 +0530 Subject: [PATCH 16/86] fix: updated options for abdomen in Vital Signs --- .../doctype/vital_signs/vital_signs.json | 1861 +++++++++-------- 1 file changed, 931 insertions(+), 930 deletions(-) diff --git a/erpnext/healthcare/doctype/vital_signs/vital_signs.json b/erpnext/healthcare/doctype/vital_signs/vital_signs.json index 234871c75b..1503f835a4 100644 --- a/erpnext/healthcare/doctype/vital_signs/vital_signs.json +++ b/erpnext/healthcare/doctype/vital_signs/vital_signs.json @@ -1,997 +1,998 @@ { - "allow_copy": 1, - "allow_guest_to_view": 0, - "allow_import": 1, - "allow_rename": 0, - "beta": 1, - "creation": "2017-02-02 11:00:24.853005", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "", - "editable_grid": 1, - "engine": "InnoDB", + "allow_copy": 1, + "allow_events_in_timeline": 0, + "allow_guest_to_view": 0, + "allow_import": 1, + "allow_rename": 0, + "beta": 1, + "creation": "2017-02-02 11:00:24.853005", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", "fields": [ { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_from": "patient.inpatient_record", - "fieldname": "inpatient_record", - "fieldtype": "Link", - "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": "Inpatient Record", - "length": 0, - "no_copy": 0, - "options": "Inpatient Record", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fetch_from": "patient.inpatient_record", + "fieldname": "inpatient_record", + "fieldtype": "Link", + "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": "Inpatient Record", + "length": 0, + "no_copy": 0, + "options": "Inpatient Record", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "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_from": "inpatient_record.patient", - "fieldname": "patient", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 1, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 1, - "label": "Patient", - "length": 0, - "no_copy": 0, - "options": "Patient", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fetch_from": "inpatient_record.patient", + "fieldname": "patient", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 1, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Patient", + "length": 0, + "no_copy": 0, + "options": "Patient", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "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_from": "patient.patient_name", - "fieldname": "patient_name", - "fieldtype": "Data", - "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": "Patient Name", - "length": 0, - "no_copy": 0, - "options": "", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fetch_from": "patient.patient_name", + "fieldname": "patient_name", + "fieldtype": "Data", + "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": "Patient Name", + "length": 0, + "no_copy": 0, + "options": "", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "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, - "fieldname": "appointment", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 1, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Appointment", - "length": 0, - "no_copy": 1, - "options": "Patient Appointment", - "permlevel": 0, - "precision": "", - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 1, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "appointment", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 1, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Appointment", + "length": 0, + "no_copy": 1, + "options": "Patient Appointment", + "permlevel": 0, + "precision": "", + "print_hide": 1, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 1, + "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, - "fieldname": "encounter", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 1, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Patient Encounter", - "length": 0, - "no_copy": 1, - "options": "Patient Encounter", - "permlevel": 0, - "precision": "", - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 1, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "encounter", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 1, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Patient Encounter", + "length": 0, + "no_copy": 1, + "options": "Patient Encounter", + "permlevel": 0, + "precision": "", + "print_hide": 1, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 1, + "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, - "fieldname": "column_break_2", - "fieldtype": "Column Break", - "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, - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_2", + "fieldtype": "Column Break", + "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, + "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, - "default": "Today", - "fieldname": "signs_date", - "fieldtype": "Date", - "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": "Date", - "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": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "Today", + "fieldname": "signs_date", + "fieldtype": "Date", + "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": "Date", + "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": 1, + "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, - "default": "", - "fieldname": "signs_time", - "fieldtype": "Time", - "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": "Time", - "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": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "", + "fieldname": "signs_time", + "fieldtype": "Time", + "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": "Time", + "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": 1, + "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, - "fieldname": "sb_vs", - "fieldtype": "Section Break", - "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": "Vital Signs", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "sb_vs", + "fieldtype": "Section Break", + "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": "Vital Signs", + "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, - "description": "Presence of a fever (temp > 38.5 \u00b0C/101.3 \u00b0F or sustained temp > 38 \u00b0C/100.4 \u00b0F)", - "fieldname": "temperature", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 1, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Body Temperature", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "description": "Presence of a fever (temp > 38.5 \u00b0C/101.3 \u00b0F or sustained temp > 38 \u00b0C/100.4 \u00b0F)", + "fieldname": "temperature", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 1, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Body Temperature", + "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, - "description": "Adults' pulse rate is anywhere between 50 and 80 beats per minute.", - "fieldname": "pulse", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 1, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Heart Rate / Pulse", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "description": "Adults' pulse rate is anywhere between 50 and 80 beats per minute.", + "fieldname": "pulse", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 1, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Heart Rate / Pulse", + "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, - "description": "Normal reference range for an adult is 16\u201320 breaths/minute (RCP 2012)", - "fieldname": "respiratory_rate", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 1, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Respiratory rate", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "description": "Normal reference range for an adult is 16\u201320 breaths/minute (RCP 2012)", + "fieldname": "respiratory_rate", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 1, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Respiratory rate", + "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, - "fieldname": "tongue", - "fieldtype": "Select", - "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": "Tongue", - "length": 0, - "no_copy": 0, - "options": "\nCoated\nVery Coated\nNormal\nFurry\nCuts", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "tongue", + "fieldtype": "Select", + "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": "Tongue", + "length": 0, + "no_copy": 0, + "options": "\nCoated\nVery Coated\nNormal\nFurry\nCuts", + "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, - "fieldname": "abdomen", - "fieldtype": "Select", - "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": "Abdomen", - "length": 0, - "no_copy": 0, - "options": "\nBloated\nFull\nFluid\nConstipated", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "abdomen", + "fieldtype": "Select", + "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": "Abdomen", + "length": 0, + "no_copy": 0, + "options": "\nNormal\nBloated\nFull\nFluid\nConstipated", + "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, - "fieldname": "column_break_8", - "fieldtype": "Column Break", - "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, - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_8", + "fieldtype": "Column Break", + "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, + "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, - "fieldname": "reflexes", - "fieldtype": "Select", - "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": "Reflexes", - "length": 0, - "no_copy": 0, - "options": "\nNormal\nHyper\nVery Hyper\nOne Sided", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "reflexes", + "fieldtype": "Select", + "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": "Reflexes", + "length": 0, + "no_copy": 0, + "options": "\nNormal\nHyper\nVery Hyper\nOne Sided", + "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, - "fieldname": "bp_systolic", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 1, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Blood Pressure (systolic)", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "bp_systolic", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 1, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Blood Pressure (systolic)", + "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, - "description": "", - "fieldname": "bp_diastolic", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 1, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Blood Pressure (diastolic)", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "description": "", + "fieldname": "bp_diastolic", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 1, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Blood Pressure (diastolic)", + "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, - "description": "Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated \"120/80 mmHg\"", - "fieldname": "bp", - "fieldtype": "Data", - "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": "Blood Pressure", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "description": "Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated \"120/80 mmHg\"", + "fieldname": "bp", + "fieldtype": "Data", + "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": "Blood Pressure", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "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, - "fieldname": "vital_signs_note", - "fieldtype": "Small Text", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 1, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Notes", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "vital_signs_note", + "fieldtype": "Small Text", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 1, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Notes", + "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, - "fieldname": "sb_nutrition_values", - "fieldtype": "Section Break", - "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": "Nutrition Values", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "sb_nutrition_values", + "fieldtype": "Section Break", + "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": "Nutrition Values", + "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, - "fieldname": "height", - "fieldtype": "Float", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Height (In Meter)", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "height", + "fieldtype": "Float", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Height (In Meter)", + "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, - "fieldname": "weight", - "fieldtype": "Float", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Weight (In Kilogram)", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "weight", + "fieldtype": "Float", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Weight (In Kilogram)", + "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, - "default": "0.00", - "fieldname": "bmi", - "fieldtype": "Float", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "BMI", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "0.00", + "fieldname": "bmi", + "fieldtype": "Float", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "BMI", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "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, - "fieldname": "column_break_14", - "fieldtype": "Column Break", - "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, - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_14", + "fieldtype": "Column Break", + "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, + "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, - "fieldname": "nutrition_note", - "fieldtype": "Small Text", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 1, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Notes", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "nutrition_note", + "fieldtype": "Small Text", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 1, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Notes", + "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, - "fieldname": "company", - "fieldtype": "Link", - "hidden": 1, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Company", - "length": 0, - "no_copy": 0, - "options": "Company", - "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, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "company", + "fieldtype": "Link", + "hidden": 1, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Company", + "length": 0, + "no_copy": 0, + "options": "Company", + "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, - "fieldname": "amended_from", - "fieldtype": "Link", - "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": "Amended From", - "length": 0, - "no_copy": 1, - "options": "Vital Signs", - "permlevel": 0, - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "amended_from", + "fieldtype": "Link", + "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": "Amended From", + "length": 0, + "no_copy": 1, + "options": "Vital Signs", + "permlevel": 0, + "print_hide": 1, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 1, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2018-08-26 10:26:20.896305", - "modified_by": "Administrator", - "module": "Healthcare", - "name": "Vital Signs", - "name_case": "", - "owner": "Administrator", + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 1, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2018-11-23 14:14:05.933292", + "modified_by": "Administrator", + "module": "Healthcare", + "name": "Vital Signs", + "name_case": "", + "owner": "Administrator", "permissions": [ { - "amend": 0, - "cancel": 1, - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Physician", - "set_user_permissions": 0, - "share": 1, - "submit": 1, + "amend": 0, + "cancel": 1, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Physician", + "set_user_permissions": 0, + "share": 1, + "submit": 1, "write": 1 - }, + }, { - "amend": 0, - "cancel": 1, - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Nursing User", - "set_user_permissions": 0, - "share": 1, - "submit": 1, + "amend": 0, + "cancel": 1, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Nursing User", + "set_user_permissions": 0, + "share": 1, + "submit": 1, "write": 1 } - ], - "quick_entry": 0, - "read_only": 0, - "read_only_onload": 0, - "restrict_to_domain": "Healthcare", - "search_fields": "patient, signs_date", - "show_name_in_global_search": 1, - "sort_field": "modified", - "sort_order": "DESC", - "title_field": "patient", - "track_changes": 1, - "track_seen": 1, + ], + "quick_entry": 0, + "read_only": 0, + "read_only_onload": 0, + "restrict_to_domain": "Healthcare", + "search_fields": "patient, signs_date", + "show_name_in_global_search": 1, + "sort_field": "modified", + "sort_order": "DESC", + "title_field": "patient", + "track_changes": 1, + "track_seen": 1, "track_views": 0 } \ No newline at end of file From c0ac84977683cce7caa28048413c5ca91f245997 Mon Sep 17 00:00:00 2001 From: Jamsheer Date: Wed, 9 Jan 2019 11:48:41 +0530 Subject: [PATCH 17/86] fix: Helathcare Prcatitioner custom query escaped --- .../healthcare_practitioner.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner.py b/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner.py index 891d86557f..ed9eae3529 100644 --- a/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner.py +++ b/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner.py @@ -83,6 +83,19 @@ def get_practitioner_list(doctype, txt, searchfield, start, page_len, filters=No order by case when name like %s then 0 else 1 end, case when first_name like %s then 0 else 1 end, - name, first_name limit %s, %s""".format(match_conditions=match_conditions) % - (", ".join(fields), searchfield, "%s", "%s", "%s", "%s", "%s", "%s"), - ("%%%s%%" % txt, "%%%s%%" % txt, "%%%s%%" % txt, "%%%s%%" % txt, start, page_len)) + name, first_name limit %s, %s""".format( + match_conditions=match_conditions) % + ( + ", ".join(fields), + frappe.db.escape(searchfield), + "%s", "%s", "%s", "%s", "%s", "%s" + ), + ( + "%%%s%%" % frappe.db.escape(txt), + "%%%s%%" % frappe.db.escape(txt), + "%%%s%%" % frappe.db.escape(txt), + "%%%s%%" % frappe.db.escape(txt), + start, + page_len + ) + ) From 319ca86c81b0992369bde8cb883b630a8ee05599 Mon Sep 17 00:00:00 2001 From: Jamsheer Date: Wed, 9 Jan 2019 13:29:20 +0530 Subject: [PATCH 18/86] fix: Test Fee Validity --- erpnext/healthcare/doctype/fee_validity/test_fee_validity.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/healthcare/doctype/fee_validity/test_fee_validity.py b/erpnext/healthcare/doctype/fee_validity/test_fee_validity.py index b8305d748f..26b1450463 100644 --- a/erpnext/healthcare/doctype/fee_validity/test_fee_validity.py +++ b/erpnext/healthcare/doctype/fee_validity/test_fee_validity.py @@ -68,6 +68,7 @@ def create_appointment(patient, practitioner, appointment_date, department): appointment.department = department appointment.appointment_date = appointment_date appointment.company = "_Test Company" + appointment.duration = 15 appointment.save(ignore_permissions=True) return appointment From 701c762a68d6d88f1a8553aa1f67b01cc5ba643a Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 9 Jan 2019 14:07:55 +0530 Subject: [PATCH 19/86] Show outward entries in negative for Bank Clearance Summary report --- .../report/bank_clearance_summary/bank_clearance_summary.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py index 13424dbcb5..0861b20f14 100644 --- a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +++ b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py @@ -36,8 +36,8 @@ def get_conditions(filters): def get_entries(filters): conditions = get_conditions(filters) journal_entries = frappe.db.sql("""SELECT - "Journal Entry", jv.name, jv.posting_date, jv.cheque_no, jv.clearance_date, jvd.against_account, - if((jvd.debit - jvd.credit) < 0, (jvd.debit - jvd.credit) * -1, (jvd.debit - jvd.credit)) + "Journal Entry", jv.name, jv.posting_date, jv.cheque_no, + jv.clearance_date, jvd.against_account, jvd.debit - jvd.credit FROM `tabJournal Entry Account` jvd, `tabJournal Entry` jv WHERE @@ -46,7 +46,7 @@ def get_entries(filters): payment_entries = frappe.db.sql("""SELECT "Payment Entry", name, posting_date, reference_no, clearance_date, party, - if(paid_from=%(account)s, paid_amount, received_amount) + if(paid_from=%(account)s, paid_amount * -1, received_amount) FROM `tabPayment Entry` WHERE From f86123ad5a5a0da9be7e74f7b6e1360f3f9733f9 Mon Sep 17 00:00:00 2001 From: Saif Ur Rehman Date: Tue, 15 Jan 2019 15:18:43 +0500 Subject: [PATCH 20/86] feat(Party Ledger Summary): Include columns for discount and other adjustments --- .../customer_ledger_summary.py | 91 +++++++++++++------ erpnext/setup/doctype/company/company.js | 2 + erpnext/setup/doctype/company/company.json | 68 +++++++++++++- 3 files changed, 131 insertions(+), 30 deletions(-) diff --git a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py index 2b228fd6b6..c8044c532a 100644 --- a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py +++ b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py @@ -6,6 +6,7 @@ import frappe import erpnext from frappe import _, scrub from frappe.utils import getdate, nowdate, flt, cint +from six import iteritems class PartyLedgerSummaryReport(object): def __init__(self, filters=None): @@ -20,6 +21,11 @@ class PartyLedgerSummaryReport(object): self.filters.party_type = args.get("party_type") self.party_naming_by = frappe.db.get_value(args.get("naming_by")[0], None, args.get("naming_by")[1]) + discount_account_field = "discount_allowed_account" if self.filters.party_type == "Customer" \ + else "discount_received_account" + self.round_off_account, self.write_off_account, self.discount_account = frappe.get_cached_value('Company', + self.filters.company, ["round_off_account", "write_off_account", discount_account_field]) + columns = self.get_columns() data = self.get_data() return columns, data @@ -42,6 +48,8 @@ class PartyLedgerSummaryReport(object): }) credit_or_debit_note = "Credit Note" if self.filters.party_type == "Customer" else "Debit Note" + discount_allowed_or_received = "Discount Allowed" if self.filters.party_type == "Customer" else "Discount Received" + columns += [ { "label": _("Opening Balance"), @@ -71,6 +79,13 @@ class PartyLedgerSummaryReport(object): "options": "currency", "width": 120 }, + { + "label": _(discount_allowed_or_received), + "fieldname": "discount_amount", + "fieldtype": "Currency", + "options": "currency", + "width": 120 + }, { "label": _("Write Off Amount"), "fieldname": "write_off_amount", @@ -78,6 +93,13 @@ class PartyLedgerSummaryReport(object): "options": "currency", "width": 120 }, + { + "label": _("Other Adjustments"), + "fieldname": "adjustment_amount", + "fieldtype": "Currency", + "options": "currency", + "width": 120 + }, { "label": _("Closing Balance"), "fieldname": "closing_balance", @@ -106,18 +128,17 @@ class PartyLedgerSummaryReport(object): self.get_gl_entries() self.get_return_invoices() - self.get_party_write_off_amounts() + self.get_party_adjustment_amounts() self.party_data = frappe._dict({}) for gle in self.gl_entries: self.party_data.setdefault(gle.party, frappe._dict({ "party": gle.party, - "party_name": "", # TODO add party_name + "party_name": "", # TODO add party_name "opening_balance": 0, "invoiced_amount": 0, - "paid_amount": -self.party_write_off_amounts.get(gle.party, 0), + "paid_amount": 0, "return_amount": 0, - "write_off_amount": self.party_write_off_amounts.get(gle.party, 0), "closing_balance": 0, "currency": company_currency })) @@ -135,8 +156,18 @@ class PartyLedgerSummaryReport(object): else: self.party_data[gle.party].paid_amount -= amount - return [d for d in self.party_data.values() if d.opening_balance or d.invoiced_amount or d.paid_amount - or d.return_amount or d.write_off_amount or d.closing_amount] + out = [] + for party, row in iteritems(self.party_data): + if row.opening_balance or row.invoiced_amount or row.paid_amount or row.return_amount or row.closing_amount: + total_party_adjustment = sum([amount for account, amount in iteritems(self.party_adjustment_details.get(party, {}))]) + row.paid_amount -= total_party_adjustment + row.discount_amount = self.party_adjustment_details.get(party, {}).get(self.discount_account, 0) + row.write_off_amount = self.party_adjustment_details.get(party, {}).get(self.write_off_account, 0) + row.adjustment_amount = total_party_adjustment - row.discount_amount - row.write_off_amount + + out.append(row) + + return out def get_gl_entries(self): conditions = self.prepare_conditions() @@ -215,12 +246,11 @@ class PartyLedgerSummaryReport(object): self.return_invoices = [d.name for d in frappe.get_all(doctype, filters={"is_return": 1, "docstatus": 1, "posting_date": ["between", [self.filters.from_date, self.filters.to_date]]})] - def get_party_write_off_amounts(self): + def get_party_adjustment_amounts(self): conditions = self.prepare_conditions() - income_or_expense = "Expense Account" if self.filters.party_type == "Customer" else "Income Account" + income_or_expense = "Expense" if self.filters.party_type == "Customer" else "Income" invoice_dr_or_cr = "debit" if self.filters.party_type == "Customer" else "credit" reverse_dr_or_cr = "credit" if self.filters.party_type == "Customer" else "debit" - round_off_account = frappe.get_cached_value('Company', self.filters.company, "round_off_account") gl_entries = frappe.db.sql(""" select @@ -231,7 +261,7 @@ class PartyLedgerSummaryReport(object): docstatus < 2 and (voucher_type, voucher_no) in ( select voucher_type, voucher_no from `tabGL Entry` gle, `tabAccount` acc - where acc.name = gle.account and acc.account_type = '{income_or_expense}' + where acc.name = gle.account and acc.root_type = '{income_or_expense}' and gle.posting_date between %(from_date)s and %(to_date)s and gle.docstatus < 2 ) and (voucher_type, voucher_no) in ( select voucher_type, voucher_no from `tabGL Entry` gle @@ -241,39 +271,42 @@ class PartyLedgerSummaryReport(object): order by posting_date """.format(conditions=conditions, income_or_expense=income_or_expense), self.filters, as_dict=True) - self.party_write_off_amounts = {} - write_off_voucher_entries = {} + self.party_adjustment_details = {} + adjustment_voucher_entries = {} for gle in gl_entries: - write_off_voucher_entries.setdefault((gle.voucher_type, gle.voucher_no), []) - write_off_voucher_entries[(gle.voucher_type, gle.voucher_no)].append(gle) + adjustment_voucher_entries.setdefault((gle.voucher_type, gle.voucher_no), []) + adjustment_voucher_entries[(gle.voucher_type, gle.voucher_no)].append(gle) - for voucher, voucher_gl_entries in write_off_voucher_entries.iteritems(): + for voucher, voucher_gl_entries in iteritems(adjustment_voucher_entries): parties = {} - write_offs = {} + accounts = {} has_irrelevant_entry = False for gle in voucher_gl_entries: - if gle.account == round_off_account: + if gle.account == self.round_off_account: continue elif gle.party: parties.setdefault(gle.party, 0) parties[gle.party] += gle.get(reverse_dr_or_cr) - gle.get(invoice_dr_or_cr) - elif frappe.get_cached_value("Account", gle.account, "account_type") == income_or_expense: - write_offs.setdefault(gle.account, 0) - write_offs[gle.account] += gle.get(invoice_dr_or_cr) - gle.get(reverse_dr_or_cr) + elif frappe.get_cached_value("Account", gle.account, "root_type") == income_or_expense: + accounts.setdefault(gle.account, 0) + accounts[gle.account] += gle.get(invoice_dr_or_cr) - gle.get(reverse_dr_or_cr) else: has_irrelevant_entry = True - if parties and write_offs: + if parties and accounts: if len(parties) == 1: - for account, amount in write_offs.iteritems(): - party = parties.keys()[0] - self.party_write_off_amounts.setdefault(party, 0) - self.party_write_off_amounts[party] += amount - elif len(write_offs) == 1 and not has_irrelevant_entry: - for party, amount in parties.iteritems(): - self.party_write_off_amounts.setdefault(party, 0) - self.party_write_off_amounts[party] += amount + party = parties.keys()[0] + for account, amount in iteritems(accounts): + self.party_adjustment_details.setdefault(party, {}) + self.party_adjustment_details[party].setdefault(account, 0) + self.party_adjustment_details[party][account] += amount + elif len(accounts) == 1 and not has_irrelevant_entry: + account = accounts.keys()[0] + for party, amount in iteritems(parties): + self.party_adjustment_details.setdefault(party, {}) + self.party_adjustment_details[party].setdefault(account, 0) + self.party_adjustment_details[party][account] += amount def execute(filters=None): args = { diff --git a/erpnext/setup/doctype/company/company.js b/erpnext/setup/doctype/company/company.js index 16676ac78a..70e047a4e8 100644 --- a/erpnext/setup/doctype/company/company.js +++ b/erpnext/setup/doctype/company/company.js @@ -206,6 +206,8 @@ erpnext.company.setup_queries = function(frm) { ["default_payroll_payable_account", {"root_type": "Liability"}], ["round_off_account", {"root_type": "Expense"}], ["write_off_account", {"root_type": "Expense"}], + ["discount_allowed_account", {"root_type": "Expense"}], + ["discount_received_account", {"root_type": "Income"}], ["exchange_gain_loss_account", {"root_type": "Expense"}], ["unrealized_exchange_gain_loss_account", {"root_type": "Expense"}], ["accumulated_depreciation_account", diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json index 01f8956a82..77c371e0cd 100644 --- a/erpnext/setup/doctype/company/company.json +++ b/erpnext/setup/doctype/company/company.json @@ -1250,6 +1250,72 @@ "translatable": 0, "unique": 0 }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "discount_allowed_account", + "fieldtype": "Link", + "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": "Discount Allowed Account", + "length": 0, + "no_copy": 0, + "options": "Account", + "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, + "fieldname": "discount_received_account", + "fieldtype": "Link", + "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": "Discount Received Account", + "length": 0, + "no_copy": 0, + "options": "Account", + "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, @@ -2903,7 +2969,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2018-10-24 12:57:46.776452", + "modified": "2019-01-15 13:29:54.510379", "modified_by": "Administrator", "module": "Setup", "name": "Company", From 55566b7f8e838fbeb349d754e6235737581af032 Mon Sep 17 00:00:00 2001 From: Saif Ur Rehman Date: Sat, 19 Jan 2019 15:12:08 +0500 Subject: [PATCH 21/86] fix(Party Ledger Summary): Codacy fix --- .../customer_ledger_summary.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py index c8044c532a..47116cf336 100644 --- a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py +++ b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py @@ -4,9 +4,9 @@ from __future__ import unicode_literals import frappe import erpnext -from frappe import _, scrub -from frappe.utils import getdate, nowdate, flt, cint -from six import iteritems +from frappe import _ +from frappe.utils import getdate, nowdate +from six import iteritems, itervalues class PartyLedgerSummaryReport(object): def __init__(self, filters=None): @@ -159,7 +159,7 @@ class PartyLedgerSummaryReport(object): out = [] for party, row in iteritems(self.party_data): if row.opening_balance or row.invoiced_amount or row.paid_amount or row.return_amount or row.closing_amount: - total_party_adjustment = sum([amount for account, amount in iteritems(self.party_adjustment_details.get(party, {}))]) + total_party_adjustment = sum([amount for amount in itervalues(self.party_adjustment_details.get(party, {}))]) row.paid_amount -= total_party_adjustment row.discount_amount = self.party_adjustment_details.get(party, {}).get(self.discount_account, 0) row.write_off_amount = self.party_adjustment_details.get(party, {}).get(self.write_off_account, 0) @@ -230,9 +230,6 @@ class PartyLedgerSummaryReport(object): and ((steam.parent = voucher_no and steam.parenttype = voucher_type) or (steam.parent = against_voucher and steam.parenttype = against_voucher_type) or (steam.parent = party and steam.parenttype = 'Customer')))""".format(lft, rgt)) - #conditions.append("""party in (select parent from `tabSales Team` - # where parenttype = 'Customer' and exists(select name from `tabSales Person` - # where lft >= {0} and rgt <= {1} and name=`tabSales Team`.sales_person))""".format(lft, rgt)) if self.filters.party_type == "Supplier": if self.filters.get("supplier_group"): @@ -277,7 +274,7 @@ class PartyLedgerSummaryReport(object): adjustment_voucher_entries.setdefault((gle.voucher_type, gle.voucher_no), []) adjustment_voucher_entries[(gle.voucher_type, gle.voucher_no)].append(gle) - for voucher, voucher_gl_entries in iteritems(adjustment_voucher_entries): + for voucher_gl_entries in itervalues(adjustment_voucher_entries): parties = {} accounts = {} has_irrelevant_entry = False @@ -313,4 +310,4 @@ def execute(filters=None): "party_type": "Customer", "naming_by": ["Selling Settings", "cust_master_name"], } - return PartyLedgerSummaryReport(filters).run(args) \ No newline at end of file + return PartyLedgerSummaryReport(filters).run(args) From 31d58eac01d2ef5f96185be15295e0f08172ccb7 Mon Sep 17 00:00:00 2001 From: Saif Ur Rehman Date: Sat, 19 Jan 2019 15:28:40 +0500 Subject: [PATCH 22/86] fix(Party Ledger Summary): Added Supplier/Customer Name column --- .../customer_ledger_summary.py | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py index 47116cf336..e33bd61411 100644 --- a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py +++ b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py @@ -134,7 +134,7 @@ class PartyLedgerSummaryReport(object): for gle in self.gl_entries: self.party_data.setdefault(gle.party, frappe._dict({ "party": gle.party, - "party_name": "", # TODO add party_name + "party_name": gle.party_name, "opening_balance": 0, "invoiced_amount": 0, "paid_amount": 0, @@ -171,16 +171,25 @@ class PartyLedgerSummaryReport(object): def get_gl_entries(self): conditions = self.prepare_conditions() + join = join_field = "" + if self.filters.party_type == "Customer": + join_field = ", p.customer_name as party_name" + join = "left join `tabCustomer` p on gle.party = p.name" + elif self.filters.party_type == "Supplier": + join_field = ", p.supplier_name as party_name" + join = "left join `tabSupplier` p on gle.party = p.name" self.gl_entries = frappe.db.sql(""" select - posting_date, party, voucher_type, voucher_no, against_voucher_type, against_voucher, debit, credit - from - `tabGL Entry` + gle.posting_date, gle.party, gle.voucher_type, gle.voucher_no, gle.against_voucher_type, + gle.against_voucher, gle.debit, gle.credit {join_field} + from `tabGL Entry` gle + {join} where - docstatus < 2 and party_type=%(party_type)s and ifnull(party, '') != '' and posting_date <= %(to_date)s - {0} - order by posting_date""".format(conditions), self.filters, as_dict=True) + gle.docstatus < 2 and gle.party_type=%(party_type)s and ifnull(gle.party, '') != '' + and gle.posting_date <= %(to_date)s {conditions} + order by gle.posting_date + """.format(join=join, join_field=join_field, conditions=conditions), self.filters, as_dict=True) def prepare_conditions(self): conditions = [""] @@ -265,7 +274,6 @@ class PartyLedgerSummaryReport(object): where gle.party_type=%(party_type)s and ifnull(party, '') != '' and gle.posting_date between %(from_date)s and %(to_date)s and gle.docstatus < 2 {conditions} ) - order by posting_date """.format(conditions=conditions, income_or_expense=income_or_expense), self.filters, as_dict=True) self.party_adjustment_details = {} From dd461636e3067c33a14210d70582ef822684e6cc Mon Sep 17 00:00:00 2001 From: scmmishra Date: Mon, 21 Jan 2019 19:35:02 +0530 Subject: [PATCH 23/86] [feat] Updated all help_links --- erpnext/public/js/help_links.js | 356 ++++++++++++++++---------------- 1 file changed, 178 insertions(+), 178 deletions(-) diff --git a/erpnext/public/js/help_links.js b/erpnext/public/js/help_links.js index b8d0019e28..20ba56a5ec 100644 --- a/erpnext/public/js/help_links.js +++ b/erpnext/public/js/help_links.js @@ -1,524 +1,524 @@ frappe.provide('frappe.help.help_links'); frappe.help.help_links['Form/Rename Tool'] = [ - { label: 'Bulk Rename', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/data/bulk-rename' }, + { label: 'Bulk Rename', url: 'https://erpnext.com/docs/user/manual/en/setting-up/data/bulk-rename' }, ] //Setup frappe.help.help_links['List/User'] = [ - { label: 'New User', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/users-and-permissions/adding-users' }, - { label: 'Rename User', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/rename-user' }, + { label: 'New User', url: 'https://erpnext.com/docs/user/manual/en/setting-up/users-and-permissions/adding-users' }, + { label: 'Rename User', url: 'https://erpnext.com/docs/user/manual/en/setting-up/articles/rename-user' }, ] frappe.help.help_links['permission-manager'] = [ - { label: 'Role Permissions Manager', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/users-and-permissions/role-based-permissions' }, - { label: 'Managing Perm Level in Permissions Manager', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/managing-perm-level' }, - { label: 'User Permissions', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/users-and-permissions/user-permissions' }, - { label: 'Sharing', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/users-and-permissions/sharing' }, - { label: 'Password', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/change-password' }, + { label: 'Role Permissions Manager', url: 'https://erpnext.com/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions' }, + { label: 'Managing Perm Level in Permissions Manager', url: 'https://erpnext.com/docs/user/manual/en/setting-up/articles/managing-perm-level' }, + { label: 'User Permissions', url: 'https://erpnext.com/docs/user/manual/en/setting-up/users-and-permissions/user-permissions' }, + { label: 'Sharing', url: 'https://erpnext.com/docs/user/manual/en/setting-up/users-and-permissions/sharing' }, + { label: 'Password', url: 'https://erpnext.com/docs/user/manual/en/setting-up/articles/change-password' }, ] frappe.help.help_links['Form/System Settings'] = [ - { label: 'Naming Series', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/settings/system-settings' }, + { label: 'Naming Series', url: 'https://erpnext.com/docs/user/manual/en/setting-up/settings/system-settings' }, ] frappe.help.help_links['data-import-tool'] = [ - { label: 'Importing and Exporting Data', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/data/data-import-tool' }, - { label: 'Overwriting Data from Data Import Tool', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool' }, + { label: 'Importing and Exporting Data', url: 'https://erpnext.com/docs/user/manual/en/setting-up/data/data-import-tool' }, + { label: 'Overwriting Data from Data Import Tool', url: 'https://erpnext.com/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool' }, ] frappe.help.help_links['module_setup'] = [ - { label: 'Role Permissions Manager', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/users-and-permissions/role-based-permissions' }, + { label: 'Role Permissions Manager', url: 'https://erpnext.com/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions' }, ] frappe.help.help_links['Form/Naming Series'] = [ - { label: 'Naming Series', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/settings/naming-series' }, - { label: 'Setting the Current Value for Naming Series', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/naming-series-current-value' }, + { label: 'Naming Series', url: 'https://erpnext.com/docs/user/manual/en/setting-up/settings/naming-series' }, + { label: 'Setting the Current Value for Naming Series', url: 'https://erpnext.com/docs/user/manual/en/setting-up/articles/naming-series-current-value' }, ] frappe.help.help_links['Form/Global Defaults'] = [ - { label: 'Global Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/settings/global-defaults' }, + { label: 'Global Settings', url: 'https://erpnext.com/docs/user/manual/en/setting-up/settings/global-defaults' }, ] frappe.help.help_links['Form/Email Digest'] = [ - { label: 'Email Digest', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/email/email-digest' }, + { label: 'Email Digest', url: 'https://erpnext.com/docs/user/manual/en/setting-up/email/email-digest' }, ] frappe.help.help_links['List/Print Heading'] = [ - { label: 'Print Heading', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/print/print-headings' }, + { label: 'Print Heading', url: 'https://erpnext.com/docs/user/manual/en/setting-up/print/print-headings' }, ] frappe.help.help_links['List/Letter Head'] = [ - { label: 'Letter Head', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/print/letter-head' }, + { label: 'Letter Head', url: 'https://erpnext.com/docs/user/manual/en/setting-up/print/letter-head' }, ] frappe.help.help_links['List/Address Template'] = [ - { label: 'Address Template', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/print/address-template' }, + { label: 'Address Template', url: 'https://erpnext.com/docs/user/manual/en/setting-up/print/address-template' }, ] frappe.help.help_links['List/Terms and Conditions'] = [ - { label: 'Terms and Conditions', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/print/terms-and-conditions' }, + { label: 'Terms and Conditions', url: 'https://erpnext.com/docs/user/manual/en/setting-up/print/terms-and-conditions' }, ] frappe.help.help_links['List/Cheque Print Template'] = [ - { label: 'Cheque Print Template', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/print/cheque-print-template' }, + { label: 'Cheque Print Template', url: 'https://erpnext.com/docs/user/manual/en/setting-up/print/cheque-print-template' }, ] frappe.help.help_links['List/Email Account'] = [ - { label: 'Email Account', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/email/email-account' }, + { label: 'Email Account', url: 'https://erpnext.com/docs/user/manual/en/setting-up/email/email-account' }, ] frappe.help.help_links['List/Notification'] = [ - { label: 'Notification', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/email/notifications' }, + { label: 'Notification', url: 'https://erpnext.com/docs/user/manual/en/setting-up/email/notifications' }, ] frappe.help.help_links['Form/Notification'] = [ - { label: 'Notification', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/email/notifications' }, + { label: 'Notification', url: 'https://erpnext.com/docs/user/manual/en/setting-up/email/notifications' }, ] frappe.help.help_links['List/Email Digest'] = [ - { label: 'Email Digest', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/email/email-digest' }, + { label: 'Email Digest', url: 'https://erpnext.com/docs/user/manual/en/setting-up/email/email-digest' }, ] frappe.help.help_links['List/Auto Email Report'] = [ - { label: 'Auto Email Reports', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/email/email-reports' }, + { label: 'Auto Email Reports', url: 'https://erpnext.com/docs/user/manual/en/setting-up/email/email-reports' }, ] frappe.help.help_links['Form/Print Settings'] = [ - { label: 'Print Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/print/print-settings' }, + { label: 'Print Settings', url: 'https://erpnext.com/docs/user/manual/en/setting-up/print/print-settings' }, ] frappe.help.help_links['print-format-builder'] = [ - { label: 'Print Format Builder', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/print/print-settings' }, + { label: 'Print Format Builder', url: 'https://erpnext.com/docs/user/manual/en/setting-up/print/print-settings' }, ] frappe.help.help_links['List/Print Heading'] = [ - { label: 'Print Heading', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/print/print-headings' }, + { label: 'Print Heading', url: 'https://erpnext.com/docs/user/manual/en/setting-up/print/print-headings' }, ] //setup-integrations frappe.help.help_links['Form/PayPal Settings'] = [ - { label: 'PayPal Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/integrations/paypal-integration' }, + { label: 'PayPal Settings', url: 'https://erpnext.com/docs/user/manual/en/setting-up/integrations/paypal-integration' }, ] frappe.help.help_links['Form/Razorpay Settings'] = [ - { label: 'Razorpay Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/integrations/razorpay-integration' }, + { label: 'Razorpay Settings', url: 'https://erpnext.com/docs/user/manual/en/setting-up/integrations/razorpay-integration' }, ] frappe.help.help_links['Form/Dropbox Settings'] = [ - { label: 'Dropbox Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/integrations/dropbox-backup' }, + { label: 'Dropbox Settings', url: 'https://erpnext.com/docs/user/manual/en/setting-up/integrations/dropbox-backup' }, ] frappe.help.help_links['Form/LDAP Settings'] = [ - { label: 'LDAP Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/integrations/ldap-integration' }, + { label: 'LDAP Settings', url: 'https://erpnext.com/docs/user/manual/en/setting-up/integrations/ldap-integration' }, ] frappe.help.help_links['Form/Stripe Settings'] = [ - { label: 'Stripe Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/integrations/stripe-integration' }, + { label: 'Stripe Settings', url: 'https://erpnext.com/docs/user/manual/en/setting-up/integrations/stripe-integration' }, ] //Sales frappe.help.help_links['Form/Quotation'] = [ - { label: 'Quotation', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/quotation' }, - { label: 'Applying Discount', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/applying-discount' }, - { label: 'Sales Person', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions' }, - { label: 'Applying Margin', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/adding-margin' }, + { label: 'Quotation', url: 'https://erpnext.com/docs/user/manual/en/selling/quotation' }, + { label: 'Applying Discount', url: 'https://erpnext.com/docs/user/manual/en/selling/articles/applying-discount' }, + { label: 'Sales Person', url: 'https://erpnext.com/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions' }, + { label: 'Applying Margin', url: 'https://erpnext.com/docs/user/manual/en/selling/articles/adding-margin' }, ] frappe.help.help_links['List/Customer'] = [ - { label: 'Customer', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/customer' }, - { label: 'Credit Limit', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/credit-limit' }, + { label: 'Customer', url: 'https://erpnext.com/docs/user/manual/en/CRM/customer' }, + { label: 'Credit Limit', url: 'https://erpnext.com/docs/user/manual/en/accounts/credit-limit' }, ] frappe.help.help_links['Form/Customer'] = [ - { label: 'Customer', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/customer' }, - { label: 'Credit Limit', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/credit-limit' }, + { label: 'Customer', url: 'https://erpnext.com/docs/user/manual/en/CRM/customer' }, + { label: 'Credit Limit', url: 'https://erpnext.com/docs/user/manual/en/accounts/credit-limit' }, ] frappe.help.help_links['List/Sales Taxes and Charges Template'] = [ - { label: 'Setting Up Taxes', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/setting-up-taxes' }, + { label: 'Setting Up Taxes', url: 'https://erpnext.com/docs/user/manual/en/setting-up/setting-up-taxes' }, ] frappe.help.help_links['Form/Sales Taxes and Charges Template'] = [ - { label: 'Setting Up Taxes', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/setting-up-taxes' }, + { label: 'Setting Up Taxes', url: 'https://erpnext.com/docs/user/manual/en/setting-up/setting-up-taxes' }, ] frappe.help.help_links['List/Sales Order'] = [ - { label: 'Sales Order', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/sales-order' }, - { label: 'Recurring Sales Order', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/recurring-orders-and-invoices' }, - { label: 'Applying Discount', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/applying-discount' }, + { label: 'Sales Order', url: 'https://erpnext.com/docs/user/manual/en/selling/sales-order' }, + { label: 'Recurring Sales Order', url: 'https://erpnext.com/docs/user/manual/en/accounts/recurring-orders-and-invoices' }, + { label: 'Applying Discount', url: 'https://erpnext.com/docs/user/manual/en/selling/articles/applying-discount' }, ] frappe.help.help_links['Form/Sales Order'] = [ - { label: 'Sales Order', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/sales-order' }, - { label: 'Recurring Sales Order', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/recurring-orders-and-invoices' }, - { label: 'Applying Discount', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/applying-discount' }, - { label: 'Drop Shipping', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/drop-shipping' }, - { label: 'Sales Person', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions' }, - { label: 'Close Sales Order', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/close-sales-order' }, - { label: 'Applying Margin', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/adding-margin' }, + { label: 'Sales Order', url: 'https://erpnext.com/docs/user/manual/en/selling/sales-order' }, + { label: 'Recurring Sales Order', url: 'https://erpnext.com/docs/user/manual/en/accounts/recurring-orders-and-invoices' }, + { label: 'Applying Discount', url: 'https://erpnext.com/docs/user/manual/en/selling/articles/applying-discount' }, + { label: 'Drop Shipping', url: 'https://erpnext.com/docs/user/manual/en/selling/articles/drop-shipping' }, + { label: 'Sales Person', url: 'https://erpnext.com/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions' }, + { label: 'Close Sales Order', url: 'https://erpnext.com/docs/user/manual/en/selling/articles/close-sales-order' }, + { label: 'Applying Margin', url: 'https://erpnext.com/docs/user/manual/en/selling/articles/adding-margin' }, ] frappe.help.help_links['Form/Product Bundle'] = [ - { label: 'Product Bundle', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/setup/product-bundle' }, + { label: 'Product Bundle', url: 'https://erpnext.com/docs/user/manual/en/selling/setup/product-bundle' }, ] frappe.help.help_links['Form/Selling Settings'] = [ - { label: 'Selling Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/setup/selling-settings' }, + { label: 'Selling Settings', url: 'https://erpnext.com/docs/user/manual/en/selling/setup/selling-settings' }, ] //Buying frappe.help.help_links['List/Supplier'] = [ - { label: 'Supplier', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/supplier' }, + { label: 'Supplier', url: 'https://erpnext.com/docs/user/manual/en/buying/supplier' }, ] frappe.help.help_links['Form/Supplier'] = [ - { label: 'Supplier', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/supplier' }, + { label: 'Supplier', url: 'https://erpnext.com/docs/user/manual/en/buying/supplier' }, ] frappe.help.help_links['Form/Request for Quotation'] = [ - { label: 'Request for Quotation', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/request-for-quotation' }, - { label: 'RFQ Video', url: 'https://frappe.github.io/erpnext/user/videos/learn/request-for-quotation.html' }, + { label: 'Request for Quotation', url: 'https://erpnext.com/docs/user/manual/en/buying/request-for-quotation' }, + { label: 'RFQ Video', url: 'https://erpnext.com/docs/user/videos/learn/request-for-quotation.html' }, ] frappe.help.help_links['Form/Supplier Quotation'] = [ - { label: 'Supplier Quotation', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/supplier-quotation' }, + { label: 'Supplier Quotation', url: 'https://erpnext.com/docs/user/manual/en/buying/supplier-quotation' }, ] frappe.help.help_links['Form/Buying Settings'] = [ - { label: 'Buying Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/setup/buying-settings' }, + { label: 'Buying Settings', url: 'https://erpnext.com/docs/user/manual/en/buying/setup/buying-settings' }, ] frappe.help.help_links['List/Purchase Order'] = [ - { label: 'Purchase Order', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/purchase-order' }, - { label: 'Recurring Purchase Order', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/recurring-orders-and-invoices' }, + { label: 'Purchase Order', url: 'https://erpnext.com/docs/user/manual/en/buying/purchase-order' }, + { label: 'Recurring Purchase Order', url: 'https://erpnext.com/docs/user/manual/en/accounts/recurring-orders-and-invoices' }, ] frappe.help.help_links['Form/Purchase Order'] = [ - { label: 'Purchase Order', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/purchase-order' }, - { label: 'Item UoM', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/articles/purchasing-in-different-unit' }, - { label: 'Supplier Item Code', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item' }, - { label: 'Recurring Purchase Order', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/recurring-orders-and-invoices' }, - { label: 'Subcontracting', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/subcontracting' }, + { label: 'Purchase Order', url: 'https://erpnext.com/docs/user/manual/en/buying/purchase-order' }, + { label: 'Item UoM', url: 'https://erpnext.com/docs/user/manual/en/buying/articles/purchasing-in-different-unit' }, + { label: 'Supplier Item Code', url: 'https://erpnext.com/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item' }, + { label: 'Recurring Purchase Order', url: 'https://erpnext.com/docs/user/manual/en/accounts/recurring-orders-and-invoices' }, + { label: 'Subcontracting', url: 'https://erpnext.com/docs/user/manual/en/manufacturing/subcontracting' }, ] frappe.help.help_links['List/Purchase Taxes and Charges Template'] = [ - { label: 'Setting Up Taxes', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/setting-up-taxes' }, + { label: 'Setting Up Taxes', url: 'https://erpnext.com/docs/user/manual/en/setting-up/setting-up-taxes' }, ] frappe.help.help_links['List/POS Profile'] = [ - { label: 'POS Profile', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/pos-setting' }, + { label: 'POS Profile', url: 'https://erpnext.com/docs/user/manual/en/setting-up/pos-setting' }, ] frappe.help.help_links['List/Price List'] = [ - { label: 'Price List', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/price-lists' }, + { label: 'Price List', url: 'https://erpnext.com/docs/user/manual/en/setting-up/price-lists' }, ] frappe.help.help_links['List/Authorization Rule'] = [ - { label: 'Authorization Rule', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/authorization-rule' }, + { label: 'Authorization Rule', url: 'https://erpnext.com/docs/user/manual/en/setting-up/authorization-rule' }, ] frappe.help.help_links['Form/SMS Settings'] = [ - { label: 'SMS Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/sms-setting' }, + { label: 'SMS Settings', url: 'https://erpnext.com/docs/user/manual/en/setting-up/sms-setting' }, ] frappe.help.help_links['List/Stock Reconciliation'] = [ - { label: 'Stock Reconciliation', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item' }, + { label: 'Stock Reconciliation', url: 'https://erpnext.com/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item' }, ] frappe.help.help_links['Tree/Territory'] = [ - { label: 'Territory', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/territory' }, + { label: 'Territory', url: 'https://erpnext.com/docs/user/manual/en/setting-up/territory' }, ] frappe.help.help_links['Form/Dropbox Backup'] = [ - { label: 'Dropbox Backup', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/third-party-backups' }, - { label: 'Setting Up Dropbox Backup', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/setting-up-dropbox-backups' }, + { label: 'Dropbox Backup', url: 'https://erpnext.com/docs/user/manual/en/setting-up/third-party-backups' }, + { label: 'Setting Up Dropbox Backup', url: 'https://erpnext.com/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups' }, ] frappe.help.help_links['List/Workflow'] = [ - { label: 'Workflow', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/workflows' }, + { label: 'Workflow', url: 'https://erpnext.com/docs/user/manual/en/setting-up/workflows' }, ] frappe.help.help_links['List/Company'] = [ - { label: 'Company', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/company-setup' }, - { label: 'Managing Multiple Companies', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/managing-multiple-companies' }, - { label: 'Delete All Related Transactions for a Company', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions' }, + { label: 'Company', url: 'https://erpnext.com/docs/user/manual/en/setting-up/company-setup' }, + { label: 'Managing Multiple Companies', url: 'https://erpnext.com/docs/user/manual/en/setting-up/articles/managing-multiple-companies' }, + { label: 'Delete All Related Transactions for a Company', url: 'https://erpnext.com/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions' }, ] //Accounts frappe.help.help_links['modules/Accounts'] = [ - { label: 'Introduction to Accounts', url: 'http://frappe.github.io/erpnext/user/manual/en/accounts/' }, - { label: 'Chart of Accounts', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/chart-of-accounts.html' }, - { label: 'Multi Currency Accounting', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/multi-currency-accounting' }, + { label: 'Introduction to Accounts', url: 'http://erpnext.com/docs/user/manual/en/accounts/' }, + { label: 'Chart of Accounts', url: 'https://erpnext.com/docs/user/manual/en/accounts/chart-of-accounts.html' }, + { label: 'Multi Currency Accounting', url: 'https://erpnext.com/docs/user/manual/en/accounts/multi-currency-accounting' }, ] frappe.help.help_links['Tree/Account'] = [ - { label: 'Chart of Accounts', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/chart-of-accounts' }, - { label: 'Managing Tree Mastes', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/managing-tree-structure-masters' }, + { label: 'Chart of Accounts', url: 'https://erpnext.com/docs/user/manual/en/accounts/chart-of-accounts' }, + { label: 'Managing Tree Mastes', url: 'https://erpnext.com/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters' }, ] frappe.help.help_links['Form/Sales Invoice'] = [ - { label: 'Sales Invoice', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/sales-invoice' }, - { label: 'Accounts Opening Balance', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/opening-accounts' }, - { label: 'Sales Return', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/sales-return' }, - { label: 'Recurring Sales Invoice', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/recurring-orders-and-invoices' }, + { label: 'Sales Invoice', url: 'https://erpnext.com/docs/user/manual/en/accounts/sales-invoice' }, + { label: 'Accounts Opening Balance', url: 'https://erpnext.com/docs/user/manual/en/accounts/opening-accounts' }, + { label: 'Sales Return', url: 'https://erpnext.com/docs/user/manual/en/stock/sales-return' }, + { label: 'Recurring Sales Invoice', url: 'https://erpnext.com/docs/user/manual/en/accounts/recurring-orders-and-invoices' }, ] frappe.help.help_links['List/Sales Invoice'] = [ - { label: 'Sales Invoice', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/sales-invoice' }, - { label: 'Accounts Opening Balance', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/opening-accounts' }, - { label: 'Sales Return', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/sales-return' }, - { label: 'Recurring Sales Invoice', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/recurring-orders-and-invoices' }, + { label: 'Sales Invoice', url: 'https://erpnext.com/docs/user/manual/en/accounts/sales-invoice' }, + { label: 'Accounts Opening Balance', url: 'https://erpnext.com/docs/user/manual/en/accounts/opening-accounts' }, + { label: 'Sales Return', url: 'https://erpnext.com/docs/user/manual/en/stock/sales-return' }, + { label: 'Recurring Sales Invoice', url: 'https://erpnext.com/docs/user/manual/en/accounts/recurring-orders-and-invoices' }, ] frappe.help.help_links['pos'] = [ - { label: 'Point of Sale Invoice', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/point-of-sale-pos-invoice' }, + { label: 'Point of Sale Invoice', url: 'https://erpnext.com/docs/user/manual/en/accounts/point-of-sale-pos-invoice' }, ] frappe.help.help_links['List/POS Profile'] = [ - { label: 'Point of Sale Profile', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/pos-setting' }, + { label: 'Point of Sale Profile', url: 'https://erpnext.com/docs/user/manual/en/setting-up/pos-setting' }, ] frappe.help.help_links['List/Purchase Invoice'] = [ - { label: 'Purchase Invoice', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/purchase-invoice' }, - { label: 'Accounts Opening Balance', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/opening-accounts' }, - { label: 'Recurring Purchase Invoice', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/recurring-orders-and-invoices' }, + { label: 'Purchase Invoice', url: 'https://erpnext.com/docs/user/manual/en/accounts/purchase-invoice' }, + { label: 'Accounts Opening Balance', url: 'https://erpnext.com/docs/user/manual/en/accounts/opening-accounts' }, + { label: 'Recurring Purchase Invoice', url: 'https://erpnext.com/docs/user/manual/en/accounts/recurring-orders-and-invoices' }, ] frappe.help.help_links['List/Journal Entry'] = [ - { label: 'Journal Entry', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/journal-entry' }, - { label: 'Advance Payment Entry', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/advance-payment-entry' }, - { label: 'Accounts Opening Balance', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/opening-accounts' }, + { label: 'Journal Entry', url: 'https://erpnext.com/docs/user/manual/en/accounts/journal-entry' }, + { label: 'Advance Payment Entry', url: 'https://erpnext.com/docs/user/manual/en/accounts/advance-payment-entry' }, + { label: 'Accounts Opening Balance', url: 'https://erpnext.com/docs/user/manual/en/accounts/opening-accounts' }, ] frappe.help.help_links['List/Payment Entry'] = [ - { label: 'Payment Entry', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/payment-entry' }, + { label: 'Payment Entry', url: 'https://erpnext.com/docs/user/manual/en/accounts/payment-entry' }, ] frappe.help.help_links['List/Payment Request'] = [ - { label: 'Payment Request', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/payment-request' }, + { label: 'Payment Request', url: 'https://erpnext.com/docs/user/manual/en/accounts/payment-request' }, ] frappe.help.help_links['List/Asset'] = [ - { label: 'Managing Fixed Assets', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/managing-fixed-assets' }, + { label: 'Managing Fixed Assets', url: 'https://erpnext.com/docs/user/manual/en/accounts/managing-fixed-assets' }, ] frappe.help.help_links['List/Asset Category'] = [ - { label: 'Asset Category', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/managing-fixed-assets' }, + { label: 'Asset Category', url: 'https://erpnext.com/docs/user/manual/en/accounts/managing-fixed-assets' }, ] frappe.help.help_links['Tree/Cost Center'] = [ - { label: 'Budgeting', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/budgeting' }, + { label: 'Budgeting', url: 'https://erpnext.com/docs/user/manual/en/accounts/budgeting' }, ] frappe.help.help_links['List/Item'] = [ - { label: 'Item', url: 'http://frappe.github.io/erpnext/user/manual/en/stock/item' }, - { label: 'Item Price', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/item/item-price' }, - { label: 'Barcode', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/track-items-using-barcode' }, - { label: 'Item Wise Taxation', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/item-wise-taxation' }, - { label: 'Managing Fixed Assets', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/managing-fixed-assets' }, - { label: 'Item Codification', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/item/item-codification' }, - { label: 'Item Variants', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/item/item-variants' }, - { label: 'Item Valuation', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/item/item-valuation-fifo-and-moving-average' }, + { label: 'Item', url: 'http://erpnext.com/docs/user/manual/en/stock/item' }, + { label: 'Item Price', url: 'https://erpnext.com/docs/user/manual/en/stock/item/item-price' }, + { label: 'Barcode', url: 'https://erpnext.com/docs/user/manual/en/stock/articles/track-items-using-barcode' }, + { label: 'Item Wise Taxation', url: 'https://erpnext.com/docs/user/manual/en/accounts/item-wise-taxation' }, + { label: 'Managing Fixed Assets', url: 'https://erpnext.com/docs/user/manual/en/accounts/managing-fixed-assets' }, + { label: 'Item Codification', url: 'https://erpnext.com/docs/user/manual/en/stock/item/item-codification' }, + { label: 'Item Variants', url: 'https://erpnext.com/docs/user/manual/en/stock/item/item-variants' }, + { label: 'Item Valuation', url: 'https://erpnext.com/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average' }, ] frappe.help.help_links['Form/Item'] = [ - { label: 'Item', url: 'http://frappe.github.io/erpnext/user/manual/en/stock/item' }, - { label: 'Item Price', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/item/item-price' }, - { label: 'Barcode', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/track-items-using-barcode' }, - { label: 'Item Wise Taxation', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/item-wise-taxation' }, - { label: 'Managing Fixed Assets', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/managing-fixed-assets' }, - { label: 'Item Codification', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/item/item-codification' }, - { label: 'Item Variants', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/item/item-variants' }, - { label: 'Item Valuation', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/item/item-valuation-fifo-and-moving-average' }, + { label: 'Item', url: 'http://erpnext.com/docs/user/manual/en/stock/item' }, + { label: 'Item Price', url: 'https://erpnext.com/docs/user/manual/en/stock/item/item-price' }, + { label: 'Barcode', url: 'https://erpnext.com/docs/user/manual/en/stock/articles/track-items-using-barcode' }, + { label: 'Item Wise Taxation', url: 'https://erpnext.com/docs/user/manual/en/accounts/item-wise-taxation' }, + { label: 'Managing Fixed Assets', url: 'https://erpnext.com/docs/user/manual/en/accounts/managing-fixed-assets' }, + { label: 'Item Codification', url: 'https://erpnext.com/docs/user/manual/en/stock/item/item-codification' }, + { label: 'Item Variants', url: 'https://erpnext.com/docs/user/manual/en/stock/item/item-variants' }, + { label: 'Item Valuation', url: 'https://erpnext.com/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average' }, ] frappe.help.help_links['List/Purchase Receipt'] = [ - { label: 'Purchase Receipt', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/purchase-receipt' }, - { label: 'Barcode', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/track-items-using-barcode' }, + { label: 'Purchase Receipt', url: 'https://erpnext.com/docs/user/manual/en/stock/purchase-receipt' }, + { label: 'Barcode', url: 'https://erpnext.com/docs/user/manual/en/stock/articles/track-items-using-barcode' }, ] frappe.help.help_links['List/Delivery Note'] = [ - { label: 'Delivery Note', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/delivery-note' }, - { label: 'Barcode', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/track-items-using-barcode' }, - { label: 'Sales Return', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/sales-return' }, + { label: 'Delivery Note', url: 'https://erpnext.com/docs/user/manual/en/stock/delivery-note' }, + { label: 'Barcode', url: 'https://erpnext.com/docs/user/manual/en/stock/articles/track-items-using-barcode' }, + { label: 'Sales Return', url: 'https://erpnext.com/docs/user/manual/en/stock/sales-return' }, ] frappe.help.help_links['Form/Delivery Note'] = [ - { label: 'Delivery Note', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/delivery-note' }, - { label: 'Sales Return', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/sales-return' }, - { label: 'Barcode', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/track-items-using-barcode' }, - { label: 'Subcontracting', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/subcontracting' }, + { label: 'Delivery Note', url: 'https://erpnext.com/docs/user/manual/en/stock/delivery-note' }, + { label: 'Sales Return', url: 'https://erpnext.com/docs/user/manual/en/stock/sales-return' }, + { label: 'Barcode', url: 'https://erpnext.com/docs/user/manual/en/stock/articles/track-items-using-barcode' }, + { label: 'Subcontracting', url: 'https://erpnext.com/docs/user/manual/en/manufacturing/subcontracting' }, ] frappe.help.help_links['List/Installation Note'] = [ - { label: 'Installation Note', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/installation-note' }, + { label: 'Installation Note', url: 'https://erpnext.com/docs/user/manual/en/stock/installation-note' }, ] frappe.help.help_links['Tree'] = [ - { label: 'Managing Tree Structure Masters', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/managing-tree-structure-masters' }, + { label: 'Managing Tree Structure Masters', url: 'https://erpnext.com/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters' }, ] frappe.help.help_links['List/Budget'] = [ - { label: 'Budgeting', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/budgeting' }, + { label: 'Budgeting', url: 'https://erpnext.com/docs/user/manual/en/accounts/budgeting' }, ] //Stock frappe.help.help_links['List/Material Request'] = [ - { label: 'Material Request', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/material-request' }, - { label: 'Auto-creation of Material Request', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/auto-creation-of-material-request' }, + { label: 'Material Request', url: 'https://erpnext.com/docs/user/manual/en/stock/material-request' }, + { label: 'Auto-creation of Material Request', url: 'https://erpnext.com/docs/user/manual/en/stock/articles/auto-creation-of-material-request' }, ] frappe.help.help_links['Form/Material Request'] = [ - { label: 'Material Request', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/material-request' }, - { label: 'Auto-creation of Material Request', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/auto-creation-of-material-request' }, + { label: 'Material Request', url: 'https://erpnext.com/docs/user/manual/en/stock/material-request' }, + { label: 'Auto-creation of Material Request', url: 'https://erpnext.com/docs/user/manual/en/stock/articles/auto-creation-of-material-request' }, ] frappe.help.help_links['Form/Stock Entry'] = [ - { label: 'Stock Entry', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/stock-entry' }, - { label: 'Stock Entry Types', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/stock-entry-purpose' }, - { label: 'Repack Entry', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/repack-entry' }, - { label: 'Opening Stock', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/opening-stock' }, - { label: 'Subcontracting', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/subcontracting' }, + { label: 'Stock Entry', url: 'https://erpnext.com/docs/user/manual/en/stock/stock-entry' }, + { label: 'Stock Entry Types', url: 'https://erpnext.com/docs/user/manual/en/stock/articles/stock-entry-purpose' }, + { label: 'Repack Entry', url: 'https://erpnext.com/docs/user/manual/en/stock/articles/repack-entry' }, + { label: 'Opening Stock', url: 'https://erpnext.com/docs/user/manual/en/stock/opening-stock' }, + { label: 'Subcontracting', url: 'https://erpnext.com/docs/user/manual/en/manufacturing/subcontracting' }, ] frappe.help.help_links['List/Stock Entry'] = [ - { label: 'Stock Entry', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/stock-entry' }, + { label: 'Stock Entry', url: 'https://erpnext.com/docs/user/manual/en/stock/stock-entry' }, ] frappe.help.help_links['Tree/Warehouse'] = [ - { label: 'Warehouse', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/warehouse' }, + { label: 'Warehouse', url: 'https://erpnext.com/docs/user/manual/en/stock/warehouse' }, ] frappe.help.help_links['List/Serial No'] = [ - { label: 'Serial No', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/serial-no' }, + { label: 'Serial No', url: 'https://erpnext.com/docs/user/manual/en/stock/serial-no' }, ] frappe.help.help_links['Form/Serial No'] = [ - { label: 'Serial No', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/serial-no' }, + { label: 'Serial No', url: 'https://erpnext.com/docs/user/manual/en/stock/serial-no' }, ] frappe.help.help_links['Form/Batch'] = [ - { label: 'Batch', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/batch' }, + { label: 'Batch', url: 'https://erpnext.com/docs/user/manual/en/stock/batch' }, ] frappe.help.help_links['Form/Packing Slip'] = [ - { label: 'Packing Slip', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/tools/packing-slip' }, + { label: 'Packing Slip', url: 'https://erpnext.com/docs/user/manual/en/stock/tools/packing-slip' }, ] frappe.help.help_links['Form/Quality Inspection'] = [ - { label: 'Quality Inspection', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/tools/quality-inspection' }, + { label: 'Quality Inspection', url: 'https://erpnext.com/docs/user/manual/en/stock/tools/quality-inspection' }, ] frappe.help.help_links['Form/Landed Cost Voucher'] = [ - { label: 'Landed Cost Voucher', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/tools/landed-cost-voucher' }, + { label: 'Landed Cost Voucher', url: 'https://erpnext.com/docs/user/manual/en/stock/tools/landed-cost-voucher' }, ] frappe.help.help_links['Tree/Item Group'] = [ - { label: 'Item Group', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/setup/item-group' }, + { label: 'Item Group', url: 'https://erpnext.com/docs/user/manual/en/stock/setup/item-group' }, ] frappe.help.help_links['Form/Item Attribute'] = [ - { label: 'Item Attribute', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/setup/item-attribute' }, + { label: 'Item Attribute', url: 'https://erpnext.com/docs/user/manual/en/stock/setup/item-attribute' }, ] frappe.help.help_links['Form/UOM'] = [ - { label: 'Fractions in UOM', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/managing-fractions-in-uom' }, + { label: 'Fractions in UOM', url: 'https://erpnext.com/docs/user/manual/en/stock/articles/managing-fractions-in-uom' }, ] frappe.help.help_links['Form/Stock Reconciliation'] = [ - { label: 'Opening Stock Entry', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/opening-stock' }, + { label: 'Opening Stock Entry', url: 'https://erpnext.com/docs/user/manual/en/stock/opening-stock' }, ] //CRM frappe.help.help_links['Form/Lead'] = [ - { label: 'Lead', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/lead' }, + { label: 'Lead', url: 'https://erpnext.com/docs/user/manual/en/CRM/lead' }, ] frappe.help.help_links['Form/Opportunity'] = [ - { label: 'Opportunity', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/opportunity' }, + { label: 'Opportunity', url: 'https://erpnext.com/docs/user/manual/en/CRM/opportunity' }, ] frappe.help.help_links['Form/Address'] = [ - { label: 'Address', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/contact' }, + { label: 'Address', url: 'https://erpnext.com/docs/user/manual/en/CRM/contact' }, ] frappe.help.help_links['Form/Contact'] = [ - { label: 'Contact', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/contact' }, + { label: 'Contact', url: 'https://erpnext.com/docs/user/manual/en/CRM/contact' }, ] frappe.help.help_links['Form/Newsletter'] = [ - { label: 'Newsletter', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/newsletter' }, + { label: 'Newsletter', url: 'https://erpnext.com/docs/user/manual/en/CRM/newsletter' }, ] frappe.help.help_links['Form/Campaign'] = [ - { label: 'Campaign', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/setup/campaign' }, + { label: 'Campaign', url: 'https://erpnext.com/docs/user/manual/en/CRM/setup/campaign' }, ] frappe.help.help_links['Tree/Sales Person'] = [ - { label: 'Sales Person', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/setup/sales-person' }, + { label: 'Sales Person', url: 'https://erpnext.com/docs/user/manual/en/CRM/setup/sales-person' }, ] frappe.help.help_links['Form/Sales Person'] = [ - { label: 'Sales Person Target', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/setup/sales-person-target-allocation' }, + { label: 'Sales Person Target', url: 'https://erpnext.com/docs/user/manual/en/selling/setup/sales-person-target-allocation' }, ] //Support frappe.help.help_links['List/Feedback Trigger'] = [ - { label: 'Feedback Trigger', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/feedback/setting-up-feedback' }, + { label: 'Feedback Trigger', url: 'https://erpnext.com/docs/user/manual/en/setting-up/feedback/setting-up-feedback' }, ] frappe.help.help_links['List/Feedback Request'] = [ - { label: 'Feedback Request', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/feedback/submit-feedback' }, + { label: 'Feedback Request', url: 'https://erpnext.com/docs/user/manual/en/setting-up/feedback/submit-feedback' }, ] frappe.help.help_links['List/Feedback Request'] = [ - { label: 'Feedback Request', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/feedback/submit-feedback' }, + { label: 'Feedback Request', url: 'https://erpnext.com/docs/user/manual/en/setting-up/feedback/submit-feedback' }, ] //Manufacturing frappe.help.help_links['Form/BOM'] = [ - { label: 'Bill of Material', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/bill-of-materials' }, - { label: 'Nested BOM Structure', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/articles/nested-bom-structure' }, + { label: 'Bill of Material', url: 'https://erpnext.com/docs/user/manual/en/manufacturing/bill-of-materials' }, + { label: 'Nested BOM Structure', url: 'https://erpnext.com/docs/user/manual/en/manufacturing/articles/nested-bom-structure' }, ] frappe.help.help_links['Form/Work Order'] = [ - { label: 'Work Order', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/work-order' }, + { label: 'Work Order', url: 'https://erpnext.com/docs/user/manual/en/manufacturing/work-order' }, ] frappe.help.help_links['Form/Workstation'] = [ - { label: 'Workstation', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/workstation' }, + { label: 'Workstation', url: 'https://erpnext.com/docs/user/manual/en/manufacturing/workstation' }, ] frappe.help.help_links['Form/Operation'] = [ - { label: 'Operation', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/operation' }, + { label: 'Operation', url: 'https://erpnext.com/docs/user/manual/en/manufacturing/operation' }, ] frappe.help.help_links['Form/BOM Update Tool'] = [ - { label: 'BOM Update Tool', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/tools/bom-update-tool' }, + { label: 'BOM Update Tool', url: 'https://erpnext.com/docs/user/manual/en/manufacturing/tools/bom-update-tool' }, ] //Customize frappe.help.help_links['Form/Customize Form'] = [ - { label: 'Custom Field', url: 'https://frappe.github.io/erpnext/user/manual/en/customize-erpnext/custom-field' }, - { label: 'Customize Field', url: 'https://frappe.github.io/erpnext/user/manual/en/customize-erpnext/customize-form' }, + { label: 'Custom Field', url: 'https://erpnext.com/docs/user/manual/en/customize-erpnext/custom-field' }, + { label: 'Customize Field', url: 'https://erpnext.com/docs/user/manual/en/customize-erpnext/customize-form' }, ] frappe.help.help_links['Form/Custom Field'] = [ - { label: 'Custom Field', url: 'https://frappe.github.io/erpnext/user/manual/en/customize-erpnext/custom-field' }, + { label: 'Custom Field', url: 'https://erpnext.com/docs/user/manual/en/customize-erpnext/custom-field' }, ] frappe.help.help_links['Form/Custom Field'] = [ - { label: 'Custom Field', url: 'https://frappe.github.io/erpnext/user/manual/en/customize-erpnext/custom-field' }, + { label: 'Custom Field', url: 'https://erpnext.com/docs/user/manual/en/customize-erpnext/custom-field' }, ] \ No newline at end of file From f2d0be729978bc85ca9b79bcac755337699e468f Mon Sep 17 00:00:00 2001 From: scmmishra Date: Mon, 21 Jan 2019 19:35:46 +0530 Subject: [PATCH 24/86] [feat] Modified help config --- erpnext/public/js/conf.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/public/js/conf.js b/erpnext/public/js/conf.js index 32081550e6..7eb59e0489 100644 --- a/erpnext/public/js/conf.js +++ b/erpnext/public/js/conf.js @@ -14,7 +14,7 @@ $(document).bind('toolbar_setup', function() { $('.navbar-home').html(''); - $('[data-link="docs"]').attr("href", "https://frappe.github.io/erpnext/") + $('[data-link="docs"]').attr("href", "https://erpnext.com/docs") $('[data-link="issues"]').attr("href", "https://github.com/frappe/erpnext/issues") @@ -23,7 +23,8 @@ $(document).bind('toolbar_setup', function() { // additional help links for erpnext var $help_menu = $('.dropdown-help ul .documentation-links'); - + $('
  • '+__('Documentation')+'
    • ').insertBefore($help_menu); $('
  • '+__('User Forum')+'
    • ').insertBefore($help_menu); $('
  • Date: Tue, 22 Jan 2019 12:46:13 +0530 Subject: [PATCH 25/86] fix: add set query for payroll entry in JV --- .../doctype/journal_entry/journal_entry.js | 7 +++++++ erpnext/hr/doctype/payroll_entry/payroll_entry.py | 14 ++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js index 60c974f262..a37e7a03e0 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.js +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js @@ -145,6 +145,13 @@ erpnext.accounts.JournalEntry = frappe.ui.form.Controller.extend({ }; } + // payroll entry + if(jvd.reference_type==="Payroll Entry") { + return { + query: "erpnext.hr.doctype.payroll_entry.payroll_entry.get_payroll_entries_for_jv", + }; + } + var out = { filters: [ [jvd.reference_type, "docstatus", "=", 1] diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.py b/erpnext/hr/doctype/payroll_entry/payroll_entry.py index c9d6290f26..0f2e5f4fa1 100644 --- a/erpnext/hr/doctype/payroll_entry/payroll_entry.py +++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.py @@ -525,3 +525,17 @@ def payroll_entry_has_bank_entries(name): response['submitted'] = 1 if bank_entries else 0 return response + +def get_payroll_entries_for_jv(doctype, txt, searchfield, start, page_len, filters): + print(doctype) + return frappe.db.sql(""" + select name from `tabPayroll Entry` + where `{key}` LIKE %(txt)s + and name not in + (select reference_name from `tabJournal Entry Account` + where reference_type="Payroll Entry") + order by name limit %(start)s, %(page_len)s""" + .format(key=searchfield), { + 'txt': "%%%s%%" % frappe.db.escape(txt), + 'start': start, 'page_len': page_len + }) From 270c4c2a87716b82cd8894fdcd536217b560e893 Mon Sep 17 00:00:00 2001 From: Zlash65 Date: Tue, 22 Jan 2019 12:47:25 +0530 Subject: [PATCH 26/86] fix: push party filter only if applicable --- .../accounts/doctype/journal_entry/journal_entry.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js index a37e7a03e0..c0a9a965e2 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.js +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js @@ -175,9 +175,15 @@ erpnext.accounts.JournalEntry = frappe.ui.form.Controller.extend({ out.filters.push([jvd.reference_type, "per_billed", "<", 100]); } - if(jvd.party_type && jvd.party) { - out.filters.push([jvd.reference_type, - (jvd.reference_type.indexOf("Sales")===0 ? "customer" : "supplier"), "=", jvd.party]); + var party_field = ""; + if(jvd.reference_type.indexOf("Sales")===0) { + var party_field = "customer"; + } else if (jvd.reference_type.indexOf("Purchase")===0) { + var party_field = "supplier"; + } + + if (party_field) { + out.filters.push([jvd.reference_type, party_field, "=", jvd.party]); } return out; From f3c22f342ca623f280f77efc462258c62c1f11ea Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Tue, 22 Jan 2019 18:22:20 +0530 Subject: [PATCH 27/86] fix(unicode): Import unicode_literals in every file --- .../account/chart_of_accounts/chart_of_accounts.py | 1 + .../accounts_settings/test_accounts_settings.py | 1 + .../cash_flow_mapper/default_cash_flow_mapper.py | 2 ++ .../test_monthly_distribution.py | 1 + .../payment_order/payment_order_dashboard.py | 1 + .../doctype/purchase_invoice/purchase_invoice.py | 1 + .../purchase_invoice/purchase_invoice_dashboard.py | 1 + erpnext/accounts/doctype/sales_invoice/pos.py | 3 +-- .../sales_invoice/sales_invoice_dashboard.py | 1 + .../test_accounts_receivable.py | 1 + .../tds_computation_summary.py | 1 + erpnext/accounts/report/utils.py | 1 + erpnext/accounts/test/test_utils.py | 1 + erpnext/agriculture/doctype/crop/crop_dashboard.py | 1 + erpnext/assets/doctype/asset/asset_dashboard.py | 2 ++ .../purchase_order/purchase_order_dashboard.py | 1 + .../request_for_quotation_dashboard.py | 1 + .../buying/doctype/supplier/supplier_dashboard.py | 1 + .../supplier_quotation_dashboard.py | 1 + .../supplier_scorecard_dashboard.py | 1 + erpnext/config/crm.py | 1 + erpnext/config/maintenance.py | 1 + erpnext/config/website.py | 1 + erpnext/crm/doctype/lead/lead_dashboard.py | 1 + .../doctype/opportunity/opportunity_dashboard.py | 1 + erpnext/demo/setup/education.py | 3 ++- erpnext/demo/setup/healthcare.py | 1 + erpnext/domains/agriculture.py | 2 ++ erpnext/domains/distribution.py | 2 ++ erpnext/domains/education.py | 2 ++ erpnext/domains/healthcare.py | 2 ++ erpnext/domains/hospitality.py | 2 ++ erpnext/domains/manufacturing.py | 2 ++ erpnext/domains/non_profit.py | 2 ++ erpnext/domains/retail.py | 2 ++ erpnext/domains/services.py | 2 ++ erpnext/education/__init__.py | 1 + .../education/doctype/student/student_dashboard.py | 1 + .../issue_to_task/__init__.py | 1 + .../milestone_to_project/__init__.py | 2 ++ .../doctype/amazon_mws_settings/amazon_mws_api.py | 1 + .../doctype/amazon_mws_settings/xml_utils.py | 1 + .../doctype/shopify_settings/sync_customer.py | 1 + .../doctype/shopify_settings/sync_product.py | 1 + erpnext/erpnext_integrations/utils.py | 1 + .../healthcare_practitioner_dashboard.py | 1 + .../inpatient_record/inpatient_record_dashboard.py | 1 + .../doctype/patient/patient_dashboard.py | 1 + .../patient_appointment_dashboard.py | 1 + .../patient_encounter_dashboard.py | 1 + .../attendance_request_dashboard.py | 2 ++ erpnext/hr/doctype/employee/employee_dashboard.py | 1 + .../employee_grade/employee_grade_dashboard.py | 2 ++ .../doctype/holiday_list/holiday_list_dashboard.py | 2 ++ .../leave_block_list/leave_block_list_dashboard.py | 2 ++ .../doctype/leave_period/leave_period_dashboard.py | 1 + .../doctype/leave_policy/leave_policy_dashboard.py | 2 ++ .../hr/doctype/leave_type/leave_type_dashboard.py | 2 ++ erpnext/hr/doctype/loan/loan_dashboard.py | 1 + .../payroll_entry/payroll_entry_dashboard.py | 1 + .../salary_structure/salary_structure_dashboard.py | 1 + .../training_program/training_program_dashboard.py | 1 + erpnext/hr/doctype/vehicle/vehicle_dashboard.py | 1 + .../doctype/job_card/job_card_dashboard.py | 1 + .../doctype/operation/test_operation.py | 1 + .../production_plan/production_plan_dashboard.py | 1 + .../doctype/work_order/work_order_dashboard.py | 1 + .../non_profit/doctype/member/member_dashboard.py | 1 + .../patches/v10_0/copy_projects_renamed_fields.py | 1 + erpnext/patches/v10_0/delete_hub_documents.py | 1 + .../v10_0/rename_offer_letter_to_job_offer.py | 1 + erpnext/patches/v10_0/set_discount_amount.py | 1 + erpnext/patches/v10_0/set_student_party_type.py | 1 + ...leaves_of_all_department_members_in_calendar.py | 1 + .../v10_0/update_asset_calculate_depreciation.py | 1 + .../patches/v10_0/update_hub_connector_domain.py | 1 + .../patches/v10_0/update_lft_rgt_for_employee.py | 1 + .../update_reserved_qty_for_purchase_order.py | 1 + .../v10_0/update_status_in_purchase_receipt.py | 1 + .../v10_0/update_territory_and_customer_group.py | 1 + .../add_default_dispatch_notification_template.py | 1 + .../v11_0/add_default_email_template_for_leave.py | 1 + .../v11_0/add_expense_claim_default_account.py | 1 + .../v11_0/add_healthcare_service_unit_tree_root.py | 1 + .../v11_0/add_index_on_nestedset_doctypes.py | 1 + erpnext/patches/v11_0/add_market_segments.py | 1 + erpnext/patches/v11_0/add_sales_stages.py | 1 + .../v11_0/change_healthcare_desktop_icons.py | 1 + .../check_buying_selling_in_currency_exchange.py | 1 + .../patches/v11_0/create_default_success_action.py | 1 + .../create_department_records_for_each_company.py | 1 + .../patches/v11_0/drop_column_max_days_allowed.py | 1 + erpnext/patches/v11_0/ewaybill_fields_gst_india.py | 1 + erpnext/patches/v11_0/hr_ux_cleanups.py | 1 + erpnext/patches/v11_0/inter_state_field_for_gst.py | 1 + .../v11_0/move_leave_approvers_from_employee.py | 1 + erpnext/patches/v11_0/rebuild_tree_for_company.py | 1 + .../v11_0/redesign_healthcare_billing_work_flow.py | 1 + erpnext/patches/v11_0/remove_land_unit_icon.py | 2 ++ erpnext/patches/v11_0/remove_subscriber_doctype.py | 1 + ...dditional_salary_component_additional_salary.py | 1 + .../v11_0/rename_asset_adjustment_doctype.py | 1 + .../patches/v11_0/rename_employee_loan_to_loan.py | 1 + .../patches/v11_0/rename_field_max_days_allowed.py | 1 + .../v11_0/rename_healthcare_doctype_and_fields.py | 1 + erpnext/patches/v11_0/rename_healthcare_fields.py | 1 + .../v11_0/rename_members_with_naming_series.py | 1 + .../v11_0/reset_publish_in_hub_for_all_items.py | 1 + .../v11_0/set_default_email_template_in_hr.py | 1 + .../patches/v11_0/set_department_for_doctypes.py | 1 + erpnext/patches/v11_0/set_missing_gst_hsn_code.py | 1 + .../v11_0/set_salary_component_properties.py | 1 + ...set_update_field_and_value_in_workflow_state.py | 1 + .../v11_0/set_user_permissions_for_department.py | 1 + .../skip_user_permission_check_for_department.py | 1 + erpnext/patches/v11_0/uom_conversion_data.py | 1 + .../patches/v11_0/update_brand_in_item_price.py | 3 ++- erpnext/patches/v11_0/update_hub_url.py | 1 + erpnext/patches/v11_0/update_sales_partner_type.py | 1 + erpnext/patches/v11_0/update_total_qty_field.py | 1 + erpnext/patches/v4_4/make_email_accounts.py | 1 + .../patches/v5_0/convert_stock_reconciliation.py | 1 + erpnext/patches/v5_0/execute_on_doctype_update.py | 1 + .../v5_0/fix_taxes_and_totals_in_party_currency.py | 14 +++++++------- erpnext/patches/v5_0/item_patches.py | 1 + erpnext/patches/v5_0/new_crm_module.py | 1 + erpnext/patches/v5_0/newsletter.py | 1 + erpnext/patches/v5_0/portal_fixes.py | 1 + erpnext/patches/v5_0/project_costing.py | 1 + .../patches/v5_0/recalculate_total_amount_in_jv.py | 1 + erpnext/patches/v5_0/remove_birthday_events.py | 1 + erpnext/patches/v5_0/rename_customer_issue.py | 1 + erpnext/patches/v5_0/rename_pos_setting.py | 1 + erpnext/patches/v5_0/rename_table_fieldnames.py | 1 + .../v5_0/rename_taxes_and_charges_master.py | 1 + erpnext/patches/v5_0/set_default_company_in_bom.py | 1 + erpnext/patches/v5_0/set_footer_address.py | 1 + erpnext/patches/v5_0/stock_entry_update_value.py | 1 + .../v5_0/taxes_and_totals_in_party_currency.py | 14 +++++++------- .../patches/v5_0/update_dn_against_doc_fields.py | 1 + .../v5_0/update_frozen_accounts_permission_role.py | 1 + .../v5_0/update_item_and_description_again.py | 1 + .../patches/v5_0/update_item_desc_in_invoice.py | 3 ++- .../v5_0/update_item_description_and_image.py | 1 + erpnext/patches/v5_0/update_item_name_in_bom.py | 1 + .../update_material_transfer_for_manufacture.py | 1 + ...pdate_material_transferred_for_manufacturing.py | 1 + ...material_transferred_for_manufacturing_again.py | 1 + .../patches/v5_0/update_operation_description.py | 3 ++- ..._tax_amount_after_discount_in_purchase_cycle.py | 7 ++++--- erpnext/patches/v5_1/rename_roles.py | 1 + erpnext/patches/v5_4/cleanup_journal_entry.py | 1 + ...update_item_description_based_on_item_master.py | 1 + erpnext/patches/v6_0/default_activity_rate.py | 1 + erpnext/patches/v6_0/set_default_title.py | 1 + .../patches/v6_10/email_digest_default_quote.py | 1 + erpnext/patches/v6_10/fix_jv_total_amount.py | 1 + erpnext/patches/v6_12/set_overdue_tasks.py | 1 + .../patches/v6_2/remove_newsletter_duplicates.py | 1 + erpnext/patches/v6_24/set_recurring_id.py | 1 + .../patches/v6_3/convert_applicable_territory.py | 1 + erpnext/patches/v6_4/email_digest_update.py | 1 + .../v6_4/fix_sales_order_maintenance_status.py | 1 + .../v6_4/fix_status_in_sales_and_purchase_order.py | 1 + erpnext/patches/v6_4/make_image_thumbnail.py | 2 +- erpnext/patches/v6_4/set_user_in_contact.py | 1 + erpnext/patches/v6_8/make_webform_standard.py | 1 + erpnext/patches/v6_8/move_drop_ship_to_po_items.py | 1 + .../patches/v7_0/calculate_total_costing_amount.py | 1 + .../patches/v7_0/convert_timelog_to_timesheet.py | 1 + .../v7_0/convert_timelogbatch_to_timesheet.py | 1 + erpnext/patches/v7_0/create_budget_record.py | 1 + erpnext/patches/v7_0/fix_duplicate_icons.py | 1 + ...ge_account_type_stock_and_warehouse_to_stock.py | 1 + ...om_salesinvoiceitem_to_salesinvoicetimesheet.py | 1 + erpnext/patches/v7_0/re_route.py | 1 + .../patches/v7_0/remove_doctypes_and_reports.py | 1 + erpnext/patches/v7_0/remove_features_setup.py | 1 + erpnext/patches/v7_0/rename_prevdoc_fields.py | 1 + erpnext/patches/v7_0/rename_salary_components.py | 1 + erpnext/patches/v7_0/rename_time_sheet_doctype.py | 1 + erpnext/patches/v7_0/set_is_group_for_warehouse.py | 1 + erpnext/patches/v7_0/update_home_page.py | 1 + .../patches/v7_0/update_mins_to_first_response.py | 1 + erpnext/patches/v7_0/update_party_status.py | 1 + ...e_prevdoc_values_for_supplier_quotation_item.py | 1 + erpnext/patches/v7_0/update_project_in_gl_entry.py | 1 + .../patches/v7_1/add_field_for_task_dependent.py | 1 + .../v7_1/fix_link_for_customer_from_lead.py | 1 + .../v7_1/set_budget_against_as_cost_center.py | 1 + erpnext/patches/v7_1/set_currency_exchange_date.py | 1 + erpnext/patches/v7_1/set_student_guardian.py | 1 + .../v7_1/set_total_amount_currency_in_je.py | 1 + erpnext/patches/v7_1/update_bom_base_currency.py | 1 + erpnext/patches/v7_1/update_component_type.py | 1 + erpnext/patches/v7_1/update_lead_source.py | 1 + erpnext/patches/v7_1/update_portal_roles.py | 1 + .../arrear_leave_encashment_as_salary_component.py | 1 + erpnext/patches/v7_2/contact_address_links.py | 1 + erpnext/patches/v7_2/mark_students_active.py | 1 + erpnext/patches/v7_2/rename_att_date_attendance.py | 1 + erpnext/patches/v7_2/rename_evaluation_criteria.py | 1 + erpnext/patches/v7_2/stock_uom_in_selling.py | 1 + .../patches/v7_2/update_abbr_in_salary_slips.py | 1 + erpnext/patches/v7_2/update_assessment_modules.py | 1 + .../patches/v7_2/update_attendance_docstatus.py | 1 + .../v7_2/update_guardian_name_in_student_master.py | 1 + erpnext/patches/v7_2/update_salary_slips.py | 1 + erpnext/patches/v7_2/update_website_for_variant.py | 1 + erpnext/patches/v8_0/addresses_linked_to_lead.py | 1 + erpnext/patches/v8_1/add_hsn_sac_codes.py | 1 + .../v8_1/add_indexes_in_transaction_doctypes.py | 1 + .../allow_invoice_copy_to_edit_after_submit.py | 1 + erpnext/patches/v8_1/gst_fixes.py | 1 + .../patches/v8_1/set_delivery_date_in_so_item.py | 1 + erpnext/patches/v8_1/setup_gst_india.py | 1 + erpnext/patches/v8_1/update_gst_state.py | 1 + .../v8_5/fix_tax_breakup_for_non_invoice_docs.py | 1 + .../v8_5/remove_project_type_property_setter.py | 1 + .../v8_5/update_customer_group_in_POS_profile.py | 1 + erpnext/patches/v8_6/rename_bom_update_tool.py | 2 ++ .../patches/v8_7/fix_purchase_receipt_status.py | 1 + erpnext/patches/v8_7/sync_india_custom_fields.py | 1 + ...lete_gst_doctypes_for_outside_india_accounts.py | 1 + ...remove_employee_from_salary_structure_parent.py | 1 + erpnext/patches/v8_9/set_default_customer_group.py | 1 + erpnext/patches/v8_9/set_member_party_type.py | 1 + ...e_non_existing_warehouse_from_stock_settings.py | 1 + .../patches/v9_0/revert_manufacturing_user_role.py | 1 + .../patches/v9_0/set_variant_item_description.py | 1 + .../v9_2/delete_healthcare_domain_default_items.py | 1 + erpnext/patches/v9_2/delete_process_payroll.py | 1 + .../patches/v9_2/remove_company_from_patient.py | 1 + .../v9_2/rename_translated_domains_in_en.py | 1 + .../v9_2/repost_reserved_qty_for_production.py | 1 + .../v9_2/set_item_name_in_production_order.py | 1 + erpnext/portal/utils.py | 1 + .../projects/doctype/project/project_dashboard.py | 1 + erpnext/regional/__init__.py | 1 + erpnext/regional/france/utils.py | 1 + erpnext/regional/india/__init__.py | 2 ++ erpnext/regional/india/utils.py | 1 + erpnext/regional/united_arab_emirates/utils.py | 1 + .../doctype/restaurant/restaurant_dashboard.py | 1 + .../selling/doctype/customer/customer_dashboard.py | 1 + .../doctype/quotation/quotation_dashboard.py | 1 + .../doctype/sales_order/sales_order_dashboard.py | 1 + .../test_pending_so_items_for_purchase_request.py | 1 + .../report/sales_analytics/test_analytics.py | 1 + erpnext/setup/doctype/company/company_dashboard.py | 1 + .../doctype/sales_person/sales_person_dashboard.py | 1 + erpnext/setup/setup_wizard/data/industry_type.py | 1 + erpnext/setup/setup_wizard/utils.py | 1 + .../delivery_note/delivery_note_dashboard.py | 1 + erpnext/stock/doctype/item/item_dashboard.py | 1 + .../doctype/item_attribute/test_item_attribute.py | 1 + .../material_request/material_request_dashboard.py | 1 + .../purchase_receipt/purchase_receipt_dashboard.py | 1 + .../purchase_receipt/test_purchase_receipt.py | 5 ++--- .../quality_inspection/test_quality_inspection.py | 1 + .../stock/doctype/stock_entry/stock_entry_utils.py | 1 + erpnext/stock/reorder_item.py | 3 ++- erpnext/templates/pages/non_profit/join_chapter.py | 1 + .../templates/pages/non_profit/leave_chapter.py | 1 + .../templates/pages/regional/india/update_gstin.py | 1 + erpnext/tests/test_init.py | 1 + erpnext/tests/test_regional.py | 1 + erpnext/tests/test_woocommerce.py | 1 + erpnext/utilities/__init__.py | 2 +- erpnext/utilities/activation.py | 1 + erpnext/utilities/user_progress.py | 1 + erpnext/utilities/user_progress_utils.py | 1 + erpnext/www/payment_setup_certification.py | 1 + setup.py | 1 + 274 files changed, 316 insertions(+), 29 deletions(-) diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py index 9b812a8b56..bcb163fc19 100644 --- a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py +++ b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py @@ -1,5 +1,6 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe, os, json diff --git a/erpnext/accounts/doctype/accounts_settings/test_accounts_settings.py b/erpnext/accounts/doctype/accounts_settings/test_accounts_settings.py index bf1e967bdb..014cf45e51 100644 --- a/erpnext/accounts/doctype/accounts_settings/test_accounts_settings.py +++ b/erpnext/accounts/doctype/accounts_settings/test_accounts_settings.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import unittest import frappe diff --git a/erpnext/accounts/doctype/cash_flow_mapper/default_cash_flow_mapper.py b/erpnext/accounts/doctype/cash_flow_mapper/default_cash_flow_mapper.py index 6e7b687c04..43ebcb0cac 100644 --- a/erpnext/accounts/doctype/cash_flow_mapper/default_cash_flow_mapper.py +++ b/erpnext/accounts/doctype/cash_flow_mapper/default_cash_flow_mapper.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + DEFAULT_MAPPERS = [ { 'doctype': 'Cash Flow Mapper', diff --git a/erpnext/accounts/doctype/monthly_distribution/test_monthly_distribution.py b/erpnext/accounts/doctype/monthly_distribution/test_monthly_distribution.py index 834d105d69..efbf4eb105 100644 --- a/erpnext/accounts/doctype/monthly_distribution/test_monthly_distribution.py +++ b/erpnext/accounts/doctype/monthly_distribution/test_monthly_distribution.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and Contributors # See license.txt +from __future__ import unicode_literals import frappe import unittest diff --git a/erpnext/accounts/doctype/payment_order/payment_order_dashboard.py b/erpnext/accounts/doctype/payment_order/payment_order_dashboard.py index 80ac69fe8e..6b93f926cd 100644 --- a/erpnext/accounts/doctype/payment_order/payment_order_dashboard.py +++ b/erpnext/accounts/doctype/payment_order/payment_order_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index d28dc936bb..9138739253 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -1,5 +1,6 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe, erpnext diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py index f101b6aa7e..173939df00 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py index 287da08ef5..d6e60d1277 100755 --- a/erpnext/accounts/doctype/sales_invoice/pos.py +++ b/erpnext/accounts/doctype/sales_invoice/pos.py @@ -1,7 +1,6 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt - - +from __future__ import unicode_literals import json diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py index 71fce77695..28da815655 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py index f911eaa5c1..43786a4446 100644 --- a/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py +++ b/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe import frappe.defaults import unittest diff --git a/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py b/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py index d81a8f3c9f..3869d685a1 100644 --- a/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py +++ b/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe import _ from frappe.utils import flt diff --git a/erpnext/accounts/report/utils.py b/erpnext/accounts/report/utils.py index e33bd832af..a8ae94f879 100644 --- a/erpnext/accounts/report/utils.py +++ b/erpnext/accounts/report/utils.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from erpnext import get_company_currency, get_default_company from erpnext.setup.utils import get_exchange_rate diff --git a/erpnext/accounts/test/test_utils.py b/erpnext/accounts/test/test_utils.py index 0fca470fe5..628c8ce646 100644 --- a/erpnext/accounts/test/test_utils.py +++ b/erpnext/accounts/test/test_utils.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import unittest from erpnext.accounts.party import get_party_shipping_address from frappe.test_runner import make_test_objects diff --git a/erpnext/agriculture/doctype/crop/crop_dashboard.py b/erpnext/agriculture/doctype/crop/crop_dashboard.py index 715f92b6eb..9a8f26fe90 100644 --- a/erpnext/agriculture/doctype/crop/crop_dashboard.py +++ b/erpnext/agriculture/doctype/crop/crop_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/assets/doctype/asset/asset_dashboard.py b/erpnext/assets/doctype/asset/asset_dashboard.py index 89699f3edb..b48989923e 100644 --- a/erpnext/assets/doctype/asset/asset_dashboard.py +++ b/erpnext/assets/doctype/asset/asset_dashboard.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + def get_data(): return { 'fieldname': 'asset_name', diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py b/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py index cce4b2747b..ab514dac30 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation_dashboard.py b/erpnext/buying/doctype/request_for_quotation/request_for_quotation_dashboard.py index 9582523001..6efbc78225 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation_dashboard.py +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/buying/doctype/supplier/supplier_dashboard.py b/erpnext/buying/doctype/supplier/supplier_dashboard.py index f971776948..aea1e2d38c 100644 --- a/erpnext/buying/doctype/supplier/supplier_dashboard.py +++ b/erpnext/buying/doctype/supplier/supplier_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py b/erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py index 0387437b32..6b40305e01 100644 --- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py +++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py index ff7f119253..3d2305e285 100644 --- a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +++ b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/config/crm.py b/erpnext/config/crm.py index dd67005ecf..5ac46bd7b8 100644 --- a/erpnext/config/crm.py +++ b/erpnext/config/crm.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/config/maintenance.py b/erpnext/config/maintenance.py index 7a44f55667..97be47cdd1 100644 --- a/erpnext/config/maintenance.py +++ b/erpnext/config/maintenance.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/config/website.py b/erpnext/config/website.py index 237c49c9af..59e7d404d4 100644 --- a/erpnext/config/website.py +++ b/erpnext/config/website.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/crm/doctype/lead/lead_dashboard.py b/erpnext/crm/doctype/lead/lead_dashboard.py index b87fc0ea4a..e8472aafc2 100644 --- a/erpnext/crm/doctype/lead/lead_dashboard.py +++ b/erpnext/crm/doctype/lead/lead_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/crm/doctype/opportunity/opportunity_dashboard.py b/erpnext/crm/doctype/opportunity/opportunity_dashboard.py index bd4a6a265f..9ed616afd2 100644 --- a/erpnext/crm/doctype/opportunity/opportunity_dashboard.py +++ b/erpnext/crm/doctype/opportunity/opportunity_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/demo/setup/education.py b/erpnext/demo/setup/education.py index 0403c06411..cf9451d5da 100644 --- a/erpnext/demo/setup/education.py +++ b/erpnext/demo/setup/education.py @@ -1,5 +1,6 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe, json from frappe.utils.make_random import get_random @@ -162,7 +163,7 @@ def make_assessment_groups(): def get_json_path(doctype): return frappe.get_app_path('erpnext', 'demo', 'data', frappe.scrub(doctype) + '.json') - + def weighted_choice(weights): totals = [] running_total = 0 diff --git a/erpnext/demo/setup/healthcare.py b/erpnext/demo/setup/healthcare.py index 3ddb2ae19d..aa389e56b4 100644 --- a/erpnext/demo/setup/healthcare.py +++ b/erpnext/demo/setup/healthcare.py @@ -1,5 +1,6 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe, json from frappe.utils.make_random import get_random diff --git a/erpnext/domains/agriculture.py b/erpnext/domains/agriculture.py index 594624778d..8c7427ab2d 100644 --- a/erpnext/domains/agriculture.py +++ b/erpnext/domains/agriculture.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + data = { 'desktop_icons': [ 'Agriculture Task', diff --git a/erpnext/domains/distribution.py b/erpnext/domains/distribution.py index 020ab3b83b..3661260f9b 100644 --- a/erpnext/domains/distribution.py +++ b/erpnext/domains/distribution.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + data = { 'desktop_icons': [ 'Item', diff --git a/erpnext/domains/education.py b/erpnext/domains/education.py index 0631f299ad..c640576457 100644 --- a/erpnext/domains/education.py +++ b/erpnext/domains/education.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + data = { 'desktop_icons': [ 'Student', diff --git a/erpnext/domains/healthcare.py b/erpnext/domains/healthcare.py index 4e783c7920..8bd4c76290 100644 --- a/erpnext/domains/healthcare.py +++ b/erpnext/domains/healthcare.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + data = { 'desktop_icons': [ 'Patient', diff --git a/erpnext/domains/hospitality.py b/erpnext/domains/hospitality.py index 09b98c288b..2a2d0c60ef 100644 --- a/erpnext/domains/hospitality.py +++ b/erpnext/domains/hospitality.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + data = { 'desktop_icons': [ 'Restaurant', diff --git a/erpnext/domains/manufacturing.py b/erpnext/domains/manufacturing.py index 7f328b1d95..259ee9238e 100644 --- a/erpnext/domains/manufacturing.py +++ b/erpnext/domains/manufacturing.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + data = { 'desktop_icons': [ 'Item', diff --git a/erpnext/domains/non_profit.py b/erpnext/domains/non_profit.py index 81aff02fa6..b6772c5315 100644 --- a/erpnext/domains/non_profit.py +++ b/erpnext/domains/non_profit.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + data = { 'desktop_icons': [ 'Non Profit', diff --git a/erpnext/domains/retail.py b/erpnext/domains/retail.py index 07b2e2781e..73607615f3 100644 --- a/erpnext/domains/retail.py +++ b/erpnext/domains/retail.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + data = { 'desktop_icons': [ 'POS', diff --git a/erpnext/domains/services.py b/erpnext/domains/services.py index 1fb0e19edd..7a4ffc4993 100644 --- a/erpnext/domains/services.py +++ b/erpnext/domains/services.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + data = { 'desktop_icons': [ 'Project', diff --git a/erpnext/education/__init__.py b/erpnext/education/__init__.py index 13bc12d6a9..c0589bb489 100644 --- a/erpnext/education/__init__.py +++ b/erpnext/education/__init__.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe import _ diff --git a/erpnext/education/doctype/student/student_dashboard.py b/erpnext/education/doctype/student/student_dashboard.py index b36599c2db..d86f4f231c 100644 --- a/erpnext/education/doctype/student/student_dashboard.py +++ b/erpnext/education/doctype/student/student_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/erpnext_integrations/data_migration_mapping/issue_to_task/__init__.py b/erpnext/erpnext_integrations/data_migration_mapping/issue_to_task/__init__.py index 23acd2855c..aeb5352a22 100644 --- a/erpnext/erpnext_integrations/data_migration_mapping/issue_to_task/__init__.py +++ b/erpnext/erpnext_integrations/data_migration_mapping/issue_to_task/__init__.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def pre_process(issue): diff --git a/erpnext/erpnext_integrations/data_migration_mapping/milestone_to_project/__init__.py b/erpnext/erpnext_integrations/data_migration_mapping/milestone_to_project/__init__.py index 212f81b5f9..9d3f02eaaf 100644 --- a/erpnext/erpnext_integrations/data_migration_mapping/milestone_to_project/__init__.py +++ b/erpnext/erpnext_integrations/data_migration_mapping/milestone_to_project/__init__.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + def pre_process(milestone): return { 'title': milestone.title, diff --git a/erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_mws_api.py b/erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_mws_api.py index bf6d85b911..fd364e87fb 100755 --- a/erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_mws_api.py +++ b/erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_mws_api.py @@ -4,6 +4,7 @@ # Basic interface to Amazon MWS # Based on http://code.google.com/p/amazon-mws-python # Extended to include finances object +from __future__ import unicode_literals import urllib import hashlib diff --git a/erpnext/erpnext_integrations/doctype/amazon_mws_settings/xml_utils.py b/erpnext/erpnext_integrations/doctype/amazon_mws_settings/xml_utils.py index 985ac083e5..58db669411 100644 --- a/erpnext/erpnext_integrations/doctype/amazon_mws_settings/xml_utils.py +++ b/erpnext/erpnext_integrations/doctype/amazon_mws_settings/xml_utils.py @@ -6,6 +6,7 @@ Borrowed from https://github.com/timotheus/ebaysdk-python @author: pierre """ +from __future__ import unicode_literals import xml.etree.ElementTree as ET import re diff --git a/erpnext/erpnext_integrations/doctype/shopify_settings/sync_customer.py b/erpnext/erpnext_integrations/doctype/shopify_settings/sync_customer.py index 02e1fc9a69..4b284b2e9d 100644 --- a/erpnext/erpnext_integrations/doctype/shopify_settings/sync_customer.py +++ b/erpnext/erpnext_integrations/doctype/shopify_settings/sync_customer.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe import _ diff --git a/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py b/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py index ff1edea713..5570e6903a 100644 --- a/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py +++ b/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe import _ from frappe.utils import cstr, cint, get_request_session diff --git a/erpnext/erpnext_integrations/utils.py b/erpnext/erpnext_integrations/utils.py index 2c0368609d..9065779097 100644 --- a/erpnext/erpnext_integrations/utils.py +++ b/erpnext/erpnext_integrations/utils.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe import _ import base64, hashlib, hmac diff --git a/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py b/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py index 635464edd9..70c0b3c098 100644 --- a/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py +++ b/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py b/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py index 0dc89701a8..92cc6103f4 100644 --- a/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +++ b/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/healthcare/doctype/patient/patient_dashboard.py b/erpnext/healthcare/doctype/patient/patient_dashboard.py index 46b10136a3..e3def72334 100644 --- a/erpnext/healthcare/doctype/patient/patient_dashboard.py +++ b/erpnext/healthcare/doctype/patient/patient_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py b/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py index a030f19e95..085c4f6cbf 100644 --- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py b/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py index ec3521175b..b08b172bba 100644 --- a/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +++ b/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/hr/doctype/attendance_request/attendance_request_dashboard.py b/erpnext/hr/doctype/attendance_request/attendance_request_dashboard.py index cc5f62930d..cfdd6d3aef 100644 --- a/erpnext/hr/doctype/attendance_request/attendance_request_dashboard.py +++ b/erpnext/hr/doctype/attendance_request/attendance_request_dashboard.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + def get_data(): return { 'fieldname': 'attendance_request', diff --git a/erpnext/hr/doctype/employee/employee_dashboard.py b/erpnext/hr/doctype/employee/employee_dashboard.py index e62f59f49f..46461da1a5 100644 --- a/erpnext/hr/doctype/employee/employee_dashboard.py +++ b/erpnext/hr/doctype/employee/employee_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/hr/doctype/employee_grade/employee_grade_dashboard.py b/erpnext/hr/doctype/employee_grade/employee_grade_dashboard.py index 2ac66981bf..f2656e9a2b 100644 --- a/erpnext/hr/doctype/employee_grade/employee_grade_dashboard.py +++ b/erpnext/hr/doctype/employee_grade/employee_grade_dashboard.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + def get_data(): return { 'transactions': [ diff --git a/erpnext/hr/doctype/holiday_list/holiday_list_dashboard.py b/erpnext/hr/doctype/holiday_list/holiday_list_dashboard.py index 30828a31c0..d1599a4f47 100644 --- a/erpnext/hr/doctype/holiday_list/holiday_list_dashboard.py +++ b/erpnext/hr/doctype/holiday_list/holiday_list_dashboard.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + def get_data(): return { 'fieldname': 'holiday_list', diff --git a/erpnext/hr/doctype/leave_block_list/leave_block_list_dashboard.py b/erpnext/hr/doctype/leave_block_list/leave_block_list_dashboard.py index 37a3474dc4..2aa54984ec 100644 --- a/erpnext/hr/doctype/leave_block_list/leave_block_list_dashboard.py +++ b/erpnext/hr/doctype/leave_block_list/leave_block_list_dashboard.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + def get_data(): return { 'fieldname': 'leave_block_list', diff --git a/erpnext/hr/doctype/leave_period/leave_period_dashboard.py b/erpnext/hr/doctype/leave_period/leave_period_dashboard.py index 5214a58fbf..1572de3cb7 100644 --- a/erpnext/hr/doctype/leave_period/leave_period_dashboard.py +++ b/erpnext/hr/doctype/leave_period/leave_period_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/hr/doctype/leave_policy/leave_policy_dashboard.py b/erpnext/hr/doctype/leave_policy/leave_policy_dashboard.py index a12ba7f62d..f97d2855a4 100644 --- a/erpnext/hr/doctype/leave_policy/leave_policy_dashboard.py +++ b/erpnext/hr/doctype/leave_policy/leave_policy_dashboard.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + def get_data(): return { 'fieldname': 'leave_policy', diff --git a/erpnext/hr/doctype/leave_type/leave_type_dashboard.py b/erpnext/hr/doctype/leave_type/leave_type_dashboard.py index 75e0c08c82..5cae9a8809 100644 --- a/erpnext/hr/doctype/leave_type/leave_type_dashboard.py +++ b/erpnext/hr/doctype/leave_type/leave_type_dashboard.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + def get_data(): return { 'fieldname': 'leave_type', diff --git a/erpnext/hr/doctype/loan/loan_dashboard.py b/erpnext/hr/doctype/loan/loan_dashboard.py index c621a7fc4b..7256d9424a 100644 --- a/erpnext/hr/doctype/loan/loan_dashboard.py +++ b/erpnext/hr/doctype/loan/loan_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry_dashboard.py b/erpnext/hr/doctype/payroll_entry/payroll_entry_dashboard.py index c4fa7f6dd5..7af507d119 100644 --- a/erpnext/hr/doctype/payroll_entry/payroll_entry_dashboard.py +++ b/erpnext/hr/doctype/payroll_entry/payroll_entry_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/hr/doctype/salary_structure/salary_structure_dashboard.py b/erpnext/hr/doctype/salary_structure/salary_structure_dashboard.py index 7a29878ac3..3803c1d3ea 100644 --- a/erpnext/hr/doctype/salary_structure/salary_structure_dashboard.py +++ b/erpnext/hr/doctype/salary_structure/salary_structure_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/hr/doctype/training_program/training_program_dashboard.py b/erpnext/hr/doctype/training_program/training_program_dashboard.py index a314081c6b..441a71bba7 100644 --- a/erpnext/hr/doctype/training_program/training_program_dashboard.py +++ b/erpnext/hr/doctype/training_program/training_program_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/hr/doctype/vehicle/vehicle_dashboard.py b/erpnext/hr/doctype/vehicle/vehicle_dashboard.py index 2c1c4c31aa..d27c7ac009 100644 --- a/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +++ b/erpnext/hr/doctype/vehicle/vehicle_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ data = { diff --git a/erpnext/manufacturing/doctype/job_card/job_card_dashboard.py b/erpnext/manufacturing/doctype/job_card/job_card_dashboard.py index a9811fcf95..d48bccf9d4 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card_dashboard.py +++ b/erpnext/manufacturing/doctype/job_card/job_card_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/manufacturing/doctype/operation/test_operation.py b/erpnext/manufacturing/doctype/operation/test_operation.py index 401ac748f3..17d206a4e1 100644 --- a/erpnext/manufacturing/doctype/operation/test_operation.py +++ b/erpnext/manufacturing/doctype/operation/test_operation.py @@ -1,5 +1,6 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # See license.txt +from __future__ import unicode_literals import frappe import unittest diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py b/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py index 8611372dfc..91c28555d6 100644 --- a/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +++ b/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/manufacturing/doctype/work_order/work_order_dashboard.py b/erpnext/manufacturing/doctype/work_order/work_order_dashboard.py index 02fbfcdeab..3fe5282582 100644 --- a/erpnext/manufacturing/doctype/work_order/work_order_dashboard.py +++ b/erpnext/manufacturing/doctype/work_order/work_order_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/non_profit/doctype/member/member_dashboard.py b/erpnext/non_profit/doctype/member/member_dashboard.py index c44a9a8422..945fb7b7d3 100644 --- a/erpnext/non_profit/doctype/member/member_dashboard.py +++ b/erpnext/non_profit/doctype/member/member_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/patches/v10_0/copy_projects_renamed_fields.py b/erpnext/patches/v10_0/copy_projects_renamed_fields.py index 58e32b0de8..80db3bdd1e 100644 --- a/erpnext/patches/v10_0/copy_projects_renamed_fields.py +++ b/erpnext/patches/v10_0/copy_projects_renamed_fields.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.model.utils.rename_field import rename_field diff --git a/erpnext/patches/v10_0/delete_hub_documents.py b/erpnext/patches/v10_0/delete_hub_documents.py index 6dcfec7ca8..f6a1499895 100644 --- a/erpnext/patches/v10_0/delete_hub_documents.py +++ b/erpnext/patches/v10_0/delete_hub_documents.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.model.utils.rename_field import rename_field diff --git a/erpnext/patches/v10_0/rename_offer_letter_to_job_offer.py b/erpnext/patches/v10_0/rename_offer_letter_to_job_offer.py index f888ef6b63..2e3095153a 100644 --- a/erpnext/patches/v10_0/rename_offer_letter_to_job_offer.py +++ b/erpnext/patches/v10_0/rename_offer_letter_to_job_offer.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v10_0/set_discount_amount.py b/erpnext/patches/v10_0/set_discount_amount.py index eb8bb2d48f..d5e2c5a84b 100644 --- a/erpnext/patches/v10_0/set_discount_amount.py +++ b/erpnext/patches/v10_0/set_discount_amount.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe diff --git a/erpnext/patches/v10_0/set_student_party_type.py b/erpnext/patches/v10_0/set_student_party_type.py index 6ac1451623..08376ae894 100644 --- a/erpnext/patches/v10_0/set_student_party_type.py +++ b/erpnext/patches/v10_0/set_student_party_type.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v10_0/show_leaves_of_all_department_members_in_calendar.py b/erpnext/patches/v10_0/show_leaves_of_all_department_members_in_calendar.py index 1ae8b4a54e..7e2ff7a8a7 100644 --- a/erpnext/patches/v10_0/show_leaves_of_all_department_members_in_calendar.py +++ b/erpnext/patches/v10_0/show_leaves_of_all_department_members_in_calendar.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v10_0/update_asset_calculate_depreciation.py b/erpnext/patches/v10_0/update_asset_calculate_depreciation.py index 44b8c7f320..b947a40b4a 100644 --- a/erpnext/patches/v10_0/update_asset_calculate_depreciation.py +++ b/erpnext/patches/v10_0/update_asset_calculate_depreciation.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v10_0/update_hub_connector_domain.py b/erpnext/patches/v10_0/update_hub_connector_domain.py index 808ae77129..baf580a369 100644 --- a/erpnext/patches/v10_0/update_hub_connector_domain.py +++ b/erpnext/patches/v10_0/update_hub_connector_domain.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v10_0/update_lft_rgt_for_employee.py b/erpnext/patches/v10_0/update_lft_rgt_for_employee.py index 82fbeaaeaf..46ca786e0d 100644 --- a/erpnext/patches/v10_0/update_lft_rgt_for_employee.py +++ b/erpnext/patches/v10_0/update_lft_rgt_for_employee.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.utils.nestedset import rebuild_tree diff --git a/erpnext/patches/v10_0/update_reserved_qty_for_purchase_order.py b/erpnext/patches/v10_0/update_reserved_qty_for_purchase_order.py index b0df91890b..7b2c36698a 100644 --- a/erpnext/patches/v10_0/update_reserved_qty_for_purchase_order.py +++ b/erpnext/patches/v10_0/update_reserved_qty_for_purchase_order.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from erpnext.stock.utils import get_bin diff --git a/erpnext/patches/v10_0/update_status_in_purchase_receipt.py b/erpnext/patches/v10_0/update_status_in_purchase_receipt.py index 69e2bb881b..a0bdd9e2cc 100644 --- a/erpnext/patches/v10_0/update_status_in_purchase_receipt.py +++ b/erpnext/patches/v10_0/update_status_in_purchase_receipt.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v10_0/update_territory_and_customer_group.py b/erpnext/patches/v10_0/update_territory_and_customer_group.py index c02d3276aa..8f0c230717 100644 --- a/erpnext/patches/v10_0/update_territory_and_customer_group.py +++ b/erpnext/patches/v10_0/update_territory_and_customer_group.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.model.rename_doc import get_fetch_fields diff --git a/erpnext/patches/v11_0/add_default_dispatch_notification_template.py b/erpnext/patches/v11_0/add_default_dispatch_notification_template.py index 08006ad01b..f4c1895539 100644 --- a/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +++ b/erpnext/patches/v11_0/add_default_dispatch_notification_template.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import os import frappe diff --git a/erpnext/patches/v11_0/add_default_email_template_for_leave.py b/erpnext/patches/v11_0/add_default_email_template_for_leave.py index bd86ae29e3..f722be26b4 100644 --- a/erpnext/patches/v11_0/add_default_email_template_for_leave.py +++ b/erpnext/patches/v11_0/add_default_email_template_for_leave.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe, os from frappe import _ diff --git a/erpnext/patches/v11_0/add_expense_claim_default_account.py b/erpnext/patches/v11_0/add_expense_claim_default_account.py index 685020222f..eecf75568a 100644 --- a/erpnext/patches/v11_0/add_expense_claim_default_account.py +++ b/erpnext/patches/v11_0/add_expense_claim_default_account.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py b/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py index 029ea8738b..d956052f1a 100644 --- a/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py +++ b/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe import _ diff --git a/erpnext/patches/v11_0/add_index_on_nestedset_doctypes.py b/erpnext/patches/v11_0/add_index_on_nestedset_doctypes.py index 064e036742..5a30c780f8 100644 --- a/erpnext/patches/v11_0/add_index_on_nestedset_doctypes.py +++ b/erpnext/patches/v11_0/add_index_on_nestedset_doctypes.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v11_0/add_market_segments.py b/erpnext/patches/v11_0/add_market_segments.py index 0e7a23ad66..ed47d4293f 100644 --- a/erpnext/patches/v11_0/add_market_segments.py +++ b/erpnext/patches/v11_0/add_market_segments.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe import _ diff --git a/erpnext/patches/v11_0/add_sales_stages.py b/erpnext/patches/v11_0/add_sales_stages.py index 69182c2179..ac2ae1511a 100644 --- a/erpnext/patches/v11_0/add_sales_stages.py +++ b/erpnext/patches/v11_0/add_sales_stages.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe import _ from erpnext.setup.setup_wizard.operations.install_fixtures import add_sale_stages diff --git a/erpnext/patches/v11_0/change_healthcare_desktop_icons.py b/erpnext/patches/v11_0/change_healthcare_desktop_icons.py index ed7df503e5..0b77395865 100644 --- a/erpnext/patches/v11_0/change_healthcare_desktop_icons.py +++ b/erpnext/patches/v11_0/change_healthcare_desktop_icons.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe import _ diff --git a/erpnext/patches/v11_0/check_buying_selling_in_currency_exchange.py b/erpnext/patches/v11_0/check_buying_selling_in_currency_exchange.py index ee336be3b5..462f830c18 100644 --- a/erpnext/patches/v11_0/check_buying_selling_in_currency_exchange.py +++ b/erpnext/patches/v11_0/check_buying_selling_in_currency_exchange.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v11_0/create_default_success_action.py b/erpnext/patches/v11_0/create_default_success_action.py index 29687d2692..31feff25b9 100644 --- a/erpnext/patches/v11_0/create_default_success_action.py +++ b/erpnext/patches/v11_0/create_default_success_action.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from erpnext.setup.install import create_default_success_action diff --git a/erpnext/patches/v11_0/create_department_records_for_each_company.py b/erpnext/patches/v11_0/create_department_records_for_each_company.py index eb48eed7a6..1257f1918b 100644 --- a/erpnext/patches/v11_0/create_department_records_for_each_company.py +++ b/erpnext/patches/v11_0/create_department_records_for_each_company.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe import _ from frappe.utils.nestedset import rebuild_tree diff --git a/erpnext/patches/v11_0/drop_column_max_days_allowed.py b/erpnext/patches/v11_0/drop_column_max_days_allowed.py index f663674d1e..591c521efb 100644 --- a/erpnext/patches/v11_0/drop_column_max_days_allowed.py +++ b/erpnext/patches/v11_0/drop_column_max_days_allowed.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v11_0/ewaybill_fields_gst_india.py b/erpnext/patches/v11_0/ewaybill_fields_gst_india.py index fc552a99e2..9925b70a96 100644 --- a/erpnext/patches/v11_0/ewaybill_fields_gst_india.py +++ b/erpnext/patches/v11_0/ewaybill_fields_gst_india.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from erpnext.regional.india.setup import make_custom_fields diff --git a/erpnext/patches/v11_0/hr_ux_cleanups.py b/erpnext/patches/v11_0/hr_ux_cleanups.py index acaf83d980..80476c8a74 100644 --- a/erpnext/patches/v11_0/hr_ux_cleanups.py +++ b/erpnext/patches/v11_0/hr_ux_cleanups.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v11_0/inter_state_field_for_gst.py b/erpnext/patches/v11_0/inter_state_field_for_gst.py index 7f5c3aa067..232d44256f 100644 --- a/erpnext/patches/v11_0/inter_state_field_for_gst.py +++ b/erpnext/patches/v11_0/inter_state_field_for_gst.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from erpnext.regional.india.setup import make_custom_fields diff --git a/erpnext/patches/v11_0/move_leave_approvers_from_employee.py b/erpnext/patches/v11_0/move_leave_approvers_from_employee.py index 304bf7d3bb..edab34cc58 100644 --- a/erpnext/patches/v11_0/move_leave_approvers_from_employee.py +++ b/erpnext/patches/v11_0/move_leave_approvers_from_employee.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe import _ from frappe.model.utils.rename_field import rename_field diff --git a/erpnext/patches/v11_0/rebuild_tree_for_company.py b/erpnext/patches/v11_0/rebuild_tree_for_company.py index 0fc4780a30..4cb74c7256 100644 --- a/erpnext/patches/v11_0/rebuild_tree_for_company.py +++ b/erpnext/patches/v11_0/rebuild_tree_for_company.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.utils.nestedset import rebuild_tree diff --git a/erpnext/patches/v11_0/redesign_healthcare_billing_work_flow.py b/erpnext/patches/v11_0/redesign_healthcare_billing_work_flow.py index eef6722a18..7c8a822fa2 100644 --- a/erpnext/patches/v11_0/redesign_healthcare_billing_work_flow.py +++ b/erpnext/patches/v11_0/redesign_healthcare_billing_work_flow.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.custom.doctype.custom_field.custom_field import create_custom_fields from erpnext.domains.healthcare import data diff --git a/erpnext/patches/v11_0/remove_land_unit_icon.py b/erpnext/patches/v11_0/remove_land_unit_icon.py index 98051cc7f1..f28c16f0c7 100644 --- a/erpnext/patches/v11_0/remove_land_unit_icon.py +++ b/erpnext/patches/v11_0/remove_land_unit_icon.py @@ -1,6 +1,8 @@ # Copyright (c) 2018, Frappe and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals + # imports - module imports import frappe diff --git a/erpnext/patches/v11_0/remove_subscriber_doctype.py b/erpnext/patches/v11_0/remove_subscriber_doctype.py index 4e50c35cd2..4839a20f91 100644 --- a/erpnext/patches/v11_0/remove_subscriber_doctype.py +++ b/erpnext/patches/v11_0/remove_subscriber_doctype.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.model.utils.rename_field import rename_field diff --git a/erpnext/patches/v11_0/rename_additional_salary_component_additional_salary.py b/erpnext/patches/v11_0/rename_additional_salary_component_additional_salary.py index 8fa876dd74..8eb7016744 100644 --- a/erpnext/patches/v11_0/rename_additional_salary_component_additional_salary.py +++ b/erpnext/patches/v11_0/rename_additional_salary_component_additional_salary.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe # this patch should have been included with this PR https://github.com/frappe/erpnext/pull/14302 diff --git a/erpnext/patches/v11_0/rename_asset_adjustment_doctype.py b/erpnext/patches/v11_0/rename_asset_adjustment_doctype.py index e32149ec44..c03ab0b711 100644 --- a/erpnext/patches/v11_0/rename_asset_adjustment_doctype.py +++ b/erpnext/patches/v11_0/rename_asset_adjustment_doctype.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe from frappe.model.rename_doc import rename_doc diff --git a/erpnext/patches/v11_0/rename_employee_loan_to_loan.py b/erpnext/patches/v11_0/rename_employee_loan_to_loan.py index e674137130..b2ff6b8c5d 100644 --- a/erpnext/patches/v11_0/rename_employee_loan_to_loan.py +++ b/erpnext/patches/v11_0/rename_employee_loan_to_loan.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.model.utils.rename_field import rename_field diff --git a/erpnext/patches/v11_0/rename_field_max_days_allowed.py b/erpnext/patches/v11_0/rename_field_max_days_allowed.py index 730b271420..4e99fac822 100644 --- a/erpnext/patches/v11_0/rename_field_max_days_allowed.py +++ b/erpnext/patches/v11_0/rename_field_max_days_allowed.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.model.utils.rename_field import rename_field diff --git a/erpnext/patches/v11_0/rename_healthcare_doctype_and_fields.py b/erpnext/patches/v11_0/rename_healthcare_doctype_and_fields.py index ba18de8174..8fdac07658 100644 --- a/erpnext/patches/v11_0/rename_healthcare_doctype_and_fields.py +++ b/erpnext/patches/v11_0/rename_healthcare_doctype_and_fields.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.model.rename_doc import rename_doc from frappe.model.utils.rename_field import rename_field diff --git a/erpnext/patches/v11_0/rename_healthcare_fields.py b/erpnext/patches/v11_0/rename_healthcare_fields.py index d47a3c38fd..9aeb433cff 100644 --- a/erpnext/patches/v11_0/rename_healthcare_fields.py +++ b/erpnext/patches/v11_0/rename_healthcare_fields.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.model.utils.rename_field import rename_field from frappe.modules import scrub, get_doctype_module diff --git a/erpnext/patches/v11_0/rename_members_with_naming_series.py b/erpnext/patches/v11_0/rename_members_with_naming_series.py index 7fa1b09e7b..84f5518926 100644 --- a/erpnext/patches/v11_0/rename_members_with_naming_series.py +++ b/erpnext/patches/v11_0/rename_members_with_naming_series.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v11_0/reset_publish_in_hub_for_all_items.py b/erpnext/patches/v11_0/reset_publish_in_hub_for_all_items.py index fac772ccdd..56e95e0328 100644 --- a/erpnext/patches/v11_0/reset_publish_in_hub_for_all_items.py +++ b/erpnext/patches/v11_0/reset_publish_in_hub_for_all_items.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v11_0/set_default_email_template_in_hr.py b/erpnext/patches/v11_0/set_default_email_template_in_hr.py index a4bc3559f8..e895eaeb65 100644 --- a/erpnext/patches/v11_0/set_default_email_template_in_hr.py +++ b/erpnext/patches/v11_0/set_default_email_template_in_hr.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v11_0/set_department_for_doctypes.py b/erpnext/patches/v11_0/set_department_for_doctypes.py index b1098abb57..175d2a189f 100644 --- a/erpnext/patches/v11_0/set_department_for_doctypes.py +++ b/erpnext/patches/v11_0/set_department_for_doctypes.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe # Set department value based on employee value diff --git a/erpnext/patches/v11_0/set_missing_gst_hsn_code.py b/erpnext/patches/v11_0/set_missing_gst_hsn_code.py index 3c2cea2230..4353ef80e2 100644 --- a/erpnext/patches/v11_0/set_missing_gst_hsn_code.py +++ b/erpnext/patches/v11_0/set_missing_gst_hsn_code.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from erpnext.controllers.taxes_and_totals import get_itemised_tax_breakup_html diff --git a/erpnext/patches/v11_0/set_salary_component_properties.py b/erpnext/patches/v11_0/set_salary_component_properties.py index a45c38fe09..fa3605ba5f 100644 --- a/erpnext/patches/v11_0/set_salary_component_properties.py +++ b/erpnext/patches/v11_0/set_salary_component_properties.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v11_0/set_update_field_and_value_in_workflow_state.py b/erpnext/patches/v11_0/set_update_field_and_value_in_workflow_state.py index ca8f0dc924..d0cabb3835 100644 --- a/erpnext/patches/v11_0/set_update_field_and_value_in_workflow_state.py +++ b/erpnext/patches/v11_0/set_update_field_and_value_in_workflow_state.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.model.workflow import get_workflow_name diff --git a/erpnext/patches/v11_0/set_user_permissions_for_department.py b/erpnext/patches/v11_0/set_user_permissions_for_department.py index a18f3ff1be..7bd8577f9c 100644 --- a/erpnext/patches/v11_0/set_user_permissions_for_department.py +++ b/erpnext/patches/v11_0/set_user_permissions_for_department.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v11_0/skip_user_permission_check_for_department.py b/erpnext/patches/v11_0/skip_user_permission_check_for_department.py index 7f7cfc1327..0f7fad7e49 100644 --- a/erpnext/patches/v11_0/skip_user_permission_check_for_department.py +++ b/erpnext/patches/v11_0/skip_user_permission_check_for_department.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.desk.form.linked_with import get_linked_doctypes diff --git a/erpnext/patches/v11_0/uom_conversion_data.py b/erpnext/patches/v11_0/uom_conversion_data.py index 9cd574390e..91470b3558 100644 --- a/erpnext/patches/v11_0/uom_conversion_data.py +++ b/erpnext/patches/v11_0/uom_conversion_data.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe, json def execute(): diff --git a/erpnext/patches/v11_0/update_brand_in_item_price.py b/erpnext/patches/v11_0/update_brand_in_item_price.py index a19a6c47b6..a8d3fab481 100644 --- a/erpnext/patches/v11_0/update_brand_in_item_price.py +++ b/erpnext/patches/v11_0/update_brand_in_item_price.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe def execute(): @@ -10,5 +11,5 @@ def execute(): set `tabItem Price`.brand = `tabItem`.brand where - `tabItem Price`.item_code = `tabItem`.name + `tabItem Price`.item_code = `tabItem`.name and `tabItem`.brand is not null and `tabItem`.brand != ''""") \ No newline at end of file diff --git a/erpnext/patches/v11_0/update_hub_url.py b/erpnext/patches/v11_0/update_hub_url.py index 40181a2e90..6c6ca3c5c2 100644 --- a/erpnext/patches/v11_0/update_hub_url.py +++ b/erpnext/patches/v11_0/update_hub_url.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v11_0/update_sales_partner_type.py b/erpnext/patches/v11_0/update_sales_partner_type.py index 508c51a376..b393926b23 100644 --- a/erpnext/patches/v11_0/update_sales_partner_type.py +++ b/erpnext/patches/v11_0/update_sales_partner_type.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe import _ diff --git a/erpnext/patches/v11_0/update_total_qty_field.py b/erpnext/patches/v11_0/update_total_qty_field.py index 8f086992b6..fcb76af459 100644 --- a/erpnext/patches/v11_0/update_total_qty_field.py +++ b/erpnext/patches/v11_0/update_total_qty_field.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v4_4/make_email_accounts.py b/erpnext/patches/v4_4/make_email_accounts.py index d055fce969..57df1ae491 100644 --- a/erpnext/patches/v4_4/make_email_accounts.py +++ b/erpnext/patches/v4_4/make_email_accounts.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.model import default_fields diff --git a/erpnext/patches/v5_0/convert_stock_reconciliation.py b/erpnext/patches/v5_0/convert_stock_reconciliation.py index 8a0b93d9d8..75d1da752f 100644 --- a/erpnext/patches/v5_0/convert_stock_reconciliation.py +++ b/erpnext/patches/v5_0/convert_stock_reconciliation.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe, json def execute(): diff --git a/erpnext/patches/v5_0/execute_on_doctype_update.py b/erpnext/patches/v5_0/execute_on_doctype_update.py index 9641320d46..70b1d8ded6 100644 --- a/erpnext/patches/v5_0/execute_on_doctype_update.py +++ b/erpnext/patches/v5_0/execute_on_doctype_update.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v5_0/fix_taxes_and_totals_in_party_currency.py b/erpnext/patches/v5_0/fix_taxes_and_totals_in_party_currency.py index 062159b410..30dc0f8db4 100644 --- a/erpnext/patches/v5_0/fix_taxes_and_totals_in_party_currency.py +++ b/erpnext/patches/v5_0/fix_taxes_and_totals_in_party_currency.py @@ -1,27 +1,27 @@ - # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe from frappe.model.meta import get_field_precision def execute(): - if not frappe.db.sql("""select name from `tabPatch Log` + if not frappe.db.sql("""select name from `tabPatch Log` where patch = 'erpnext.patches.v5_0.taxes_and_totals_in_party_currency'"""): return selling_doctypes = ["Quotation", "Sales Order", "Delivery Note", "Sales Invoice"] buying_doctypes = ["Supplier Quotation", "Purchase Order", "Purchase Receipt", "Purchase Invoice"] - + for dt in selling_doctypes: update_values(dt, "Sales Taxes and Charges") for dt in buying_doctypes: update_values(dt, "Purchase Taxes and Charges") - + def update_values(dt, tax_table): rate_field_precision = get_field_precision(frappe.get_meta(dt + " Item").get_field("rate")) tax_amount_precision = get_field_precision(frappe.get_meta(tax_table).get_field("tax_amount")) - + # update net_total, discount_on frappe.db.sql(""" UPDATE @@ -33,7 +33,7 @@ def update_values(dt, tax_table): and ifnull(base_total_taxes_and_charges, 0) != 0 and ifnull(total_taxes_and_charges, 0) = 0 """.format(dt, tax_amount_precision)) - + # update net_amount frappe.db.sql(""" UPDATE @@ -61,6 +61,6 @@ def update_values(dt, tax_table): and par.docstatus < 2 and ((ifnull(tax.base_tax_amount, 0) != 0 and ifnull(tax.tax_amount, 0) = 0) or (ifnull(tax.base_total, 0) != 0 and ifnull(tax.total, 0) = 0) - or (ifnull(tax.base_tax_amount_after_discount_amount, 0) != 0 and + or (ifnull(tax.base_tax_amount_after_discount_amount, 0) != 0 and ifnull(tax.tax_amount_after_discount_amount, 0) = 0)) """.format(dt, tax_table, tax_amount_precision)) \ No newline at end of file diff --git a/erpnext/patches/v5_0/item_patches.py b/erpnext/patches/v5_0/item_patches.py index 37992adec6..e223e09f5b 100644 --- a/erpnext/patches/v5_0/item_patches.py +++ b/erpnext/patches/v5_0/item_patches.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v5_0/new_crm_module.py b/erpnext/patches/v5_0/new_crm_module.py index f7e0793fd1..f5dda1f273 100644 --- a/erpnext/patches/v5_0/new_crm_module.py +++ b/erpnext/patches/v5_0/new_crm_module.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import json import frappe diff --git a/erpnext/patches/v5_0/newsletter.py b/erpnext/patches/v5_0/newsletter.py index fcf95ca4c6..63e3312413 100644 --- a/erpnext/patches/v5_0/newsletter.py +++ b/erpnext/patches/v5_0/newsletter.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe import frappe.permissions diff --git a/erpnext/patches/v5_0/portal_fixes.py b/erpnext/patches/v5_0/portal_fixes.py index 260222e6cb..1fefd99167 100644 --- a/erpnext/patches/v5_0/portal_fixes.py +++ b/erpnext/patches/v5_0/portal_fixes.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe import erpnext.setup.install diff --git a/erpnext/patches/v5_0/project_costing.py b/erpnext/patches/v5_0/project_costing.py index 33bb9c1630..e2d65d0594 100644 --- a/erpnext/patches/v5_0/project_costing.py +++ b/erpnext/patches/v5_0/project_costing.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v5_0/recalculate_total_amount_in_jv.py b/erpnext/patches/v5_0/recalculate_total_amount_in_jv.py index 89bd5808a8..d5af43c541 100644 --- a/erpnext/patches/v5_0/recalculate_total_amount_in_jv.py +++ b/erpnext/patches/v5_0/recalculate_total_amount_in_jv.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe from frappe.utils import money_in_words diff --git a/erpnext/patches/v5_0/remove_birthday_events.py b/erpnext/patches/v5_0/remove_birthday_events.py index 589792a04a..3ead8669b8 100644 --- a/erpnext/patches/v5_0/remove_birthday_events.py +++ b/erpnext/patches/v5_0/remove_birthday_events.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v5_0/rename_customer_issue.py b/erpnext/patches/v5_0/rename_customer_issue.py index 5b16fd2145..1bd69ceec1 100644 --- a/erpnext/patches/v5_0/rename_customer_issue.py +++ b/erpnext/patches/v5_0/rename_customer_issue.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v5_0/rename_pos_setting.py b/erpnext/patches/v5_0/rename_pos_setting.py index ad579b61ff..bf10333564 100644 --- a/erpnext/patches/v5_0/rename_pos_setting.py +++ b/erpnext/patches/v5_0/rename_pos_setting.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v5_0/rename_table_fieldnames.py b/erpnext/patches/v5_0/rename_table_fieldnames.py index e93070f950..59f534303f 100644 --- a/erpnext/patches/v5_0/rename_table_fieldnames.py +++ b/erpnext/patches/v5_0/rename_table_fieldnames.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe from frappe.model.utils.rename_field import rename_field from frappe.modules import scrub, get_doctype_module diff --git a/erpnext/patches/v5_0/rename_taxes_and_charges_master.py b/erpnext/patches/v5_0/rename_taxes_and_charges_master.py index f5fcb3af31..e26f48cda1 100644 --- a/erpnext/patches/v5_0/rename_taxes_and_charges_master.py +++ b/erpnext/patches/v5_0/rename_taxes_and_charges_master.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe diff --git a/erpnext/patches/v5_0/set_default_company_in_bom.py b/erpnext/patches/v5_0/set_default_company_in_bom.py index 0b2c921151..a5cd761119 100644 --- a/erpnext/patches/v5_0/set_default_company_in_bom.py +++ b/erpnext/patches/v5_0/set_default_company_in_bom.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v5_0/set_footer_address.py b/erpnext/patches/v5_0/set_footer_address.py index a3324a0455..8120d834e1 100644 --- a/erpnext/patches/v5_0/set_footer_address.py +++ b/erpnext/patches/v5_0/set_footer_address.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v5_0/stock_entry_update_value.py b/erpnext/patches/v5_0/stock_entry_update_value.py index 9abd315ff1..ba1af310f5 100644 --- a/erpnext/patches/v5_0/stock_entry_update_value.py +++ b/erpnext/patches/v5_0/stock_entry_update_value.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v5_0/taxes_and_totals_in_party_currency.py b/erpnext/patches/v5_0/taxes_and_totals_in_party_currency.py index f4ed66bcf6..76d10820b5 100644 --- a/erpnext/patches/v5_0/taxes_and_totals_in_party_currency.py +++ b/erpnext/patches/v5_0/taxes_and_totals_in_party_currency.py @@ -1,7 +1,7 @@ - # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe from frappe.model.meta import get_field_precision from frappe.custom.doctype.property_setter.property_setter import make_property_setter @@ -20,20 +20,20 @@ def update_values(dt, tax_table): frappe.reload_doctype(dt) frappe.reload_doctype(dt + " Item") frappe.reload_doctype(tax_table) - + net_total_precision = get_field_precision(frappe.get_meta(dt).get_field("net_total")) for field in ("total", "base_total", "base_net_total"): make_property_setter(dt, field, "precision", net_total_precision, "Select") - + rate_field_precision = get_field_precision(frappe.get_meta(dt + " Item").get_field("rate")) for field in ("net_rate", "base_net_rate", "net_amount", "base_net_amount", "base_rate", "base_amount"): make_property_setter(dt + " Item", field, "precision", rate_field_precision, "Select") - + tax_amount_precision = get_field_precision(frappe.get_meta(tax_table).get_field("tax_amount")) - for field in ("base_tax_amount", "total", "base_total", "tax_amount_after_discount_amount", + for field in ("base_tax_amount", "total", "base_total", "tax_amount_after_discount_amount", "base_tax_amount_after_discount_amount"): make_property_setter(tax_table, field, "precision", tax_amount_precision, "Select") - + # update net_total, discount_on frappe.db.sql(""" UPDATE @@ -46,7 +46,7 @@ def update_values(dt, tax_table): WHERE docstatus < 2 """.format(dt, net_total_precision)) - + # update net_amount frappe.db.sql(""" UPDATE diff --git a/erpnext/patches/v5_0/update_dn_against_doc_fields.py b/erpnext/patches/v5_0/update_dn_against_doc_fields.py index 0fb508583a..56f4f484b1 100644 --- a/erpnext/patches/v5_0/update_dn_against_doc_fields.py +++ b/erpnext/patches/v5_0/update_dn_against_doc_fields.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v5_0/update_frozen_accounts_permission_role.py b/erpnext/patches/v5_0/update_frozen_accounts_permission_role.py index 14426f5e80..b52785ae60 100644 --- a/erpnext/patches/v5_0/update_frozen_accounts_permission_role.py +++ b/erpnext/patches/v5_0/update_frozen_accounts_permission_role.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v5_0/update_item_and_description_again.py b/erpnext/patches/v5_0/update_item_and_description_again.py index 622274807a..35dedcc072 100644 --- a/erpnext/patches/v5_0/update_item_and_description_again.py +++ b/erpnext/patches/v5_0/update_item_and_description_again.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe from frappe.utils import cstr import re diff --git a/erpnext/patches/v5_0/update_item_desc_in_invoice.py b/erpnext/patches/v5_0/update_item_desc_in_invoice.py index 1f74184a98..dba35d5693 100644 --- a/erpnext/patches/v5_0/update_item_desc_in_invoice.py +++ b/erpnext/patches/v5_0/update_item_desc_in_invoice.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe from frappe.website.utils import find_first_image from frappe.utils import cstr @@ -29,7 +30,7 @@ def execute(): image = item_details.get(d.item_code).image else: desc, image = extract_image_and_description(cstr(d.description)) - + if not image: item_detail = item_details.get(d.item_code) if item_detail: diff --git a/erpnext/patches/v5_0/update_item_description_and_image.py b/erpnext/patches/v5_0/update_item_description_and_image.py index a18df2f653..75df39ee39 100644 --- a/erpnext/patches/v5_0/update_item_description_and_image.py +++ b/erpnext/patches/v5_0/update_item_description_and_image.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe from frappe.website.utils import find_first_image from frappe.utils import cstr diff --git a/erpnext/patches/v5_0/update_item_name_in_bom.py b/erpnext/patches/v5_0/update_item_name_in_bom.py index f4e29907f1..5781542a2a 100644 --- a/erpnext/patches/v5_0/update_item_name_in_bom.py +++ b/erpnext/patches/v5_0/update_item_name_in_bom.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v5_0/update_material_transfer_for_manufacture.py b/erpnext/patches/v5_0/update_material_transfer_for_manufacture.py index b858bd8074..f31c9fed4d 100644 --- a/erpnext/patches/v5_0/update_material_transfer_for_manufacture.py +++ b/erpnext/patches/v5_0/update_material_transfer_for_manufacture.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v5_0/update_material_transferred_for_manufacturing.py b/erpnext/patches/v5_0/update_material_transferred_for_manufacturing.py index 2133d1c050..2a09aa29af 100644 --- a/erpnext/patches/v5_0/update_material_transferred_for_manufacturing.py +++ b/erpnext/patches/v5_0/update_material_transferred_for_manufacturing.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v5_0/update_material_transferred_for_manufacturing_again.py b/erpnext/patches/v5_0/update_material_transferred_for_manufacturing_again.py index 187f4ea0bd..5847c83d38 100644 --- a/erpnext/patches/v5_0/update_material_transferred_for_manufacturing_again.py +++ b/erpnext/patches/v5_0/update_material_transferred_for_manufacturing_again.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v5_0/update_operation_description.py b/erpnext/patches/v5_0/update_operation_description.py index ae7b6326cb..4ce32f35f1 100644 --- a/erpnext/patches/v5_0/update_operation_description.py +++ b/erpnext/patches/v5_0/update_operation_description.py @@ -1,10 +1,11 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe import frappe.permissions def execute(): if "opn_description" in frappe.db.get_table_columns("BOM Operation"): - frappe.db.sql("""update `tabBOM Operation` set description = opn_description + frappe.db.sql("""update `tabBOM Operation` set description = opn_description where ifnull(description, '') = ''""") \ No newline at end of file diff --git a/erpnext/patches/v5_0/update_tax_amount_after_discount_in_purchase_cycle.py b/erpnext/patches/v5_0/update_tax_amount_after_discount_in_purchase_cycle.py index 987247c2f3..53df9422b3 100644 --- a/erpnext/patches/v5_0/update_tax_amount_after_discount_in_purchase_cycle.py +++ b/erpnext/patches/v5_0/update_tax_amount_after_discount_in_purchase_cycle.py @@ -1,16 +1,17 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe def execute(): frappe.db.sql(""" - update + update `tabPurchase Taxes and Charges` set tax_amount_after_discount_amount = tax_amount, base_tax_amount_after_discount_amount = base_tax_amount where - ifnull(tax_amount_after_discount_amount, 0) = 0 - and ifnull(base_tax_amount_after_discount_amount, 0) = 0 + ifnull(tax_amount_after_discount_amount, 0) = 0 + and ifnull(base_tax_amount_after_discount_amount, 0) = 0 """) \ No newline at end of file diff --git a/erpnext/patches/v5_1/rename_roles.py b/erpnext/patches/v5_1/rename_roles.py index 26208aa1e5..e19c22a614 100644 --- a/erpnext/patches/v5_1/rename_roles.py +++ b/erpnext/patches/v5_1/rename_roles.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v5_4/cleanup_journal_entry.py b/erpnext/patches/v5_4/cleanup_journal_entry.py index 9100b8f4a8..6860e6ad09 100644 --- a/erpnext/patches/v5_4/cleanup_journal_entry.py +++ b/erpnext/patches/v5_4/cleanup_journal_entry.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from pymysql import InternalError diff --git a/erpnext/patches/v5_7/update_item_description_based_on_item_master.py b/erpnext/patches/v5_7/update_item_description_based_on_item_master.py index 6851e67475..2045358ddb 100644 --- a/erpnext/patches/v5_7/update_item_description_based_on_item_master.py +++ b/erpnext/patches/v5_7/update_item_description_based_on_item_master.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v6_0/default_activity_rate.py b/erpnext/patches/v6_0/default_activity_rate.py index 44fda3415c..cfbfb723bc 100644 --- a/erpnext/patches/v6_0/default_activity_rate.py +++ b/erpnext/patches/v6_0/default_activity_rate.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v6_0/set_default_title.py b/erpnext/patches/v6_0/set_default_title.py index 83b6b59897..cceff3f480 100644 --- a/erpnext/patches/v6_0/set_default_title.py +++ b/erpnext/patches/v6_0/set_default_title.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v6_10/email_digest_default_quote.py b/erpnext/patches/v6_10/email_digest_default_quote.py index 003b317ad8..6139f1a88a 100644 --- a/erpnext/patches/v6_10/email_digest_default_quote.py +++ b/erpnext/patches/v6_10/email_digest_default_quote.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v6_10/fix_jv_total_amount.py b/erpnext/patches/v6_10/fix_jv_total_amount.py index 3797ff441d..42cb9e9e15 100644 --- a/erpnext/patches/v6_10/fix_jv_total_amount.py +++ b/erpnext/patches/v6_10/fix_jv_total_amount.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe # patch all for-print field (total amount) in Journal Entry in 2015 diff --git a/erpnext/patches/v6_12/set_overdue_tasks.py b/erpnext/patches/v6_12/set_overdue_tasks.py index 39d601aa00..7dbb8ba8b6 100644 --- a/erpnext/patches/v6_12/set_overdue_tasks.py +++ b/erpnext/patches/v6_12/set_overdue_tasks.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v6_2/remove_newsletter_duplicates.py b/erpnext/patches/v6_2/remove_newsletter_duplicates.py index dc5b77851e..f9d15475d1 100644 --- a/erpnext/patches/v6_2/remove_newsletter_duplicates.py +++ b/erpnext/patches/v6_2/remove_newsletter_duplicates.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v6_24/set_recurring_id.py b/erpnext/patches/v6_24/set_recurring_id.py index 85a39e3371..527a2fd3d9 100644 --- a/erpnext/patches/v6_24/set_recurring_id.py +++ b/erpnext/patches/v6_24/set_recurring_id.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v6_3/convert_applicable_territory.py b/erpnext/patches/v6_3/convert_applicable_territory.py index b1793db5cb..231a483ea2 100644 --- a/erpnext/patches/v6_3/convert_applicable_territory.py +++ b/erpnext/patches/v6_3/convert_applicable_territory.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v6_4/email_digest_update.py b/erpnext/patches/v6_4/email_digest_update.py index a1624276fe..8342b7fce6 100644 --- a/erpnext/patches/v6_4/email_digest_update.py +++ b/erpnext/patches/v6_4/email_digest_update.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v6_4/fix_sales_order_maintenance_status.py b/erpnext/patches/v6_4/fix_sales_order_maintenance_status.py index dbd34d54d1..50aa9e542e 100644 --- a/erpnext/patches/v6_4/fix_sales_order_maintenance_status.py +++ b/erpnext/patches/v6_4/fix_sales_order_maintenance_status.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v6_4/fix_status_in_sales_and_purchase_order.py b/erpnext/patches/v6_4/fix_status_in_sales_and_purchase_order.py index 867a5b2182..746a99004a 100644 --- a/erpnext/patches/v6_4/fix_status_in_sales_and_purchase_order.py +++ b/erpnext/patches/v6_4/fix_status_in_sales_and_purchase_order.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v6_4/make_image_thumbnail.py b/erpnext/patches/v6_4/make_image_thumbnail.py index 3315acc896..2c86e8af86 100644 --- a/erpnext/patches/v6_4/make_image_thumbnail.py +++ b/erpnext/patches/v6_4/make_image_thumbnail.py @@ -1,4 +1,4 @@ -from __future__ import print_function +from __future__ import print_function, unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v6_4/set_user_in_contact.py b/erpnext/patches/v6_4/set_user_in_contact.py index 41f76af94d..7e8a6eecd5 100644 --- a/erpnext/patches/v6_4/set_user_in_contact.py +++ b/erpnext/patches/v6_4/set_user_in_contact.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v6_8/make_webform_standard.py b/erpnext/patches/v6_8/make_webform_standard.py index 8633ba694e..2cc16a286f 100644 --- a/erpnext/patches/v6_8/make_webform_standard.py +++ b/erpnext/patches/v6_8/make_webform_standard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v6_8/move_drop_ship_to_po_items.py b/erpnext/patches/v6_8/move_drop_ship_to_po_items.py index 06d158e4ec..7184deeccc 100644 --- a/erpnext/patches/v6_8/move_drop_ship_to_po_items.py +++ b/erpnext/patches/v6_8/move_drop_ship_to_po_items.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v7_0/calculate_total_costing_amount.py b/erpnext/patches/v7_0/calculate_total_costing_amount.py index 11fdff9abd..8ed60a2955 100644 --- a/erpnext/patches/v7_0/calculate_total_costing_amount.py +++ b/erpnext/patches/v7_0/calculate_total_costing_amount.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.utils import flt diff --git a/erpnext/patches/v7_0/convert_timelog_to_timesheet.py b/erpnext/patches/v7_0/convert_timelog_to_timesheet.py index 4177e07630..3af6622d96 100644 --- a/erpnext/patches/v7_0/convert_timelog_to_timesheet.py +++ b/erpnext/patches/v7_0/convert_timelog_to_timesheet.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v7_0/convert_timelogbatch_to_timesheet.py b/erpnext/patches/v7_0/convert_timelogbatch_to_timesheet.py index 83c738ef07..e78f163e07 100644 --- a/erpnext/patches/v7_0/convert_timelogbatch_to_timesheet.py +++ b/erpnext/patches/v7_0/convert_timelogbatch_to_timesheet.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.utils import cint diff --git a/erpnext/patches/v7_0/create_budget_record.py b/erpnext/patches/v7_0/create_budget_record.py index 607ef69096..fd8bec9f32 100644 --- a/erpnext/patches/v7_0/create_budget_record.py +++ b/erpnext/patches/v7_0/create_budget_record.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from erpnext.accounts.doctype.budget.budget import DuplicateBudgetError diff --git a/erpnext/patches/v7_0/fix_duplicate_icons.py b/erpnext/patches/v7_0/fix_duplicate_icons.py index f6d227d304..9f442029b5 100644 --- a/erpnext/patches/v7_0/fix_duplicate_icons.py +++ b/erpnext/patches/v7_0/fix_duplicate_icons.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.desk.doctype.desktop_icon.desktop_icon import (sync_desktop_icons, diff --git a/erpnext/patches/v7_0/merge_account_type_stock_and_warehouse_to_stock.py b/erpnext/patches/v7_0/merge_account_type_stock_and_warehouse_to_stock.py index 6141792b8f..02808a742f 100644 --- a/erpnext/patches/v7_0/merge_account_type_stock_and_warehouse_to_stock.py +++ b/erpnext/patches/v7_0/merge_account_type_stock_and_warehouse_to_stock.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v7_0/move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet.py b/erpnext/patches/v7_0/move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet.py index 727a44ee28..998c4b674b 100644 --- a/erpnext/patches/v7_0/move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet.py +++ b/erpnext/patches/v7_0/move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v7_0/re_route.py b/erpnext/patches/v7_0/re_route.py index 1db492094b..3cec6f39b2 100644 --- a/erpnext/patches/v7_0/re_route.py +++ b/erpnext/patches/v7_0/re_route.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe.patches.v7_0.re_route import update_routes def execute(): diff --git a/erpnext/patches/v7_0/remove_doctypes_and_reports.py b/erpnext/patches/v7_0/remove_doctypes_and_reports.py index 03461dee1f..746cae0e1c 100644 --- a/erpnext/patches/v7_0/remove_doctypes_and_reports.py +++ b/erpnext/patches/v7_0/remove_doctypes_and_reports.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v7_0/remove_features_setup.py b/erpnext/patches/v7_0/remove_features_setup.py index 596f7a9dcf..49393cc248 100644 --- a/erpnext/patches/v7_0/remove_features_setup.py +++ b/erpnext/patches/v7_0/remove_features_setup.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from erpnext.setup.install import create_compact_item_print_custom_field diff --git a/erpnext/patches/v7_0/rename_prevdoc_fields.py b/erpnext/patches/v7_0/rename_prevdoc_fields.py index d189056b0c..ded4ad4aae 100644 --- a/erpnext/patches/v7_0/rename_prevdoc_fields.py +++ b/erpnext/patches/v7_0/rename_prevdoc_fields.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe import json from frappe.model.utils.rename_field import update_reports, rename_field, update_property_setters diff --git a/erpnext/patches/v7_0/rename_salary_components.py b/erpnext/patches/v7_0/rename_salary_components.py index 8409ca842d..de92fc6083 100644 --- a/erpnext/patches/v7_0/rename_salary_components.py +++ b/erpnext/patches/v7_0/rename_salary_components.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.model.utils.rename_field import update_property_setters diff --git a/erpnext/patches/v7_0/rename_time_sheet_doctype.py b/erpnext/patches/v7_0/rename_time_sheet_doctype.py index a00804518b..f80a8301d7 100644 --- a/erpnext/patches/v7_0/rename_time_sheet_doctype.py +++ b/erpnext/patches/v7_0/rename_time_sheet_doctype.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v7_0/set_is_group_for_warehouse.py b/erpnext/patches/v7_0/set_is_group_for_warehouse.py index d3aca216cb..3e69616b80 100644 --- a/erpnext/patches/v7_0/set_is_group_for_warehouse.py +++ b/erpnext/patches/v7_0/set_is_group_for_warehouse.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v7_0/update_home_page.py b/erpnext/patches/v7_0/update_home_page.py index ed88e203e6..909825c572 100644 --- a/erpnext/patches/v7_0/update_home_page.py +++ b/erpnext/patches/v7_0/update_home_page.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe import erpnext diff --git a/erpnext/patches/v7_0/update_mins_to_first_response.py b/erpnext/patches/v7_0/update_mins_to_first_response.py index a89a9c8129..1df4b42ced 100644 --- a/erpnext/patches/v7_0/update_mins_to_first_response.py +++ b/erpnext/patches/v7_0/update_mins_to_first_response.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.core.doctype.communication.email import update_mins_to_first_communication diff --git a/erpnext/patches/v7_0/update_party_status.py b/erpnext/patches/v7_0/update_party_status.py index 9ca3d02b9d..0c6b4ea598 100644 --- a/erpnext/patches/v7_0/update_party_status.py +++ b/erpnext/patches/v7_0/update_party_status.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v7_0/update_prevdoc_values_for_supplier_quotation_item.py b/erpnext/patches/v7_0/update_prevdoc_values_for_supplier_quotation_item.py index 1c41ec8e80..e90de50c1e 100644 --- a/erpnext/patches/v7_0/update_prevdoc_values_for_supplier_quotation_item.py +++ b/erpnext/patches/v7_0/update_prevdoc_values_for_supplier_quotation_item.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v7_0/update_project_in_gl_entry.py b/erpnext/patches/v7_0/update_project_in_gl_entry.py index 7f9923b396..d99e9a41e3 100644 --- a/erpnext/patches/v7_0/update_project_in_gl_entry.py +++ b/erpnext/patches/v7_0/update_project_in_gl_entry.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v7_1/add_field_for_task_dependent.py b/erpnext/patches/v7_1/add_field_for_task_dependent.py index 96daa13918..65b1c74e87 100644 --- a/erpnext/patches/v7_1/add_field_for_task_dependent.py +++ b/erpnext/patches/v7_1/add_field_for_task_dependent.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v7_1/fix_link_for_customer_from_lead.py b/erpnext/patches/v7_1/fix_link_for_customer_from_lead.py index cbb3ea4092..33f809fe37 100644 --- a/erpnext/patches/v7_1/fix_link_for_customer_from_lead.py +++ b/erpnext/patches/v7_1/fix_link_for_customer_from_lead.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v7_1/set_budget_against_as_cost_center.py b/erpnext/patches/v7_1/set_budget_against_as_cost_center.py index 1d334a5012..dd9a432cf0 100644 --- a/erpnext/patches/v7_1/set_budget_against_as_cost_center.py +++ b/erpnext/patches/v7_1/set_budget_against_as_cost_center.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v7_1/set_currency_exchange_date.py b/erpnext/patches/v7_1/set_currency_exchange_date.py index 630b7d4229..2a2d420f21 100644 --- a/erpnext/patches/v7_1/set_currency_exchange_date.py +++ b/erpnext/patches/v7_1/set_currency_exchange_date.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v7_1/set_student_guardian.py b/erpnext/patches/v7_1/set_student_guardian.py index 0942505b56..093c0bf6d9 100644 --- a/erpnext/patches/v7_1/set_student_guardian.py +++ b/erpnext/patches/v7_1/set_student_guardian.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v7_1/set_total_amount_currency_in_je.py b/erpnext/patches/v7_1/set_total_amount_currency_in_je.py index eb4a347a32..8426ddcd7d 100644 --- a/erpnext/patches/v7_1/set_total_amount_currency_in_je.py +++ b/erpnext/patches/v7_1/set_total_amount_currency_in_je.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from erpnext import get_default_currency diff --git a/erpnext/patches/v7_1/update_bom_base_currency.py b/erpnext/patches/v7_1/update_bom_base_currency.py index c8af0333cb..9a59209ea5 100644 --- a/erpnext/patches/v7_1/update_bom_base_currency.py +++ b/erpnext/patches/v7_1/update_bom_base_currency.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from erpnext import get_default_currency diff --git a/erpnext/patches/v7_1/update_component_type.py b/erpnext/patches/v7_1/update_component_type.py index aecbc9fac2..552fc89467 100644 --- a/erpnext/patches/v7_1/update_component_type.py +++ b/erpnext/patches/v7_1/update_component_type.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.utils import flt diff --git a/erpnext/patches/v7_1/update_lead_source.py b/erpnext/patches/v7_1/update_lead_source.py index 7fd4c14ed1..517e66c4bc 100644 --- a/erpnext/patches/v7_1/update_lead_source.py +++ b/erpnext/patches/v7_1/update_lead_source.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe import _ diff --git a/erpnext/patches/v7_1/update_portal_roles.py b/erpnext/patches/v7_1/update_portal_roles.py index 72e9434c26..482586b8ef 100644 --- a/erpnext/patches/v7_1/update_portal_roles.py +++ b/erpnext/patches/v7_1/update_portal_roles.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v7_2/arrear_leave_encashment_as_salary_component.py b/erpnext/patches/v7_2/arrear_leave_encashment_as_salary_component.py index 13a2bb8d5a..3b9642dd3b 100644 --- a/erpnext/patches/v7_2/arrear_leave_encashment_as_salary_component.py +++ b/erpnext/patches/v7_2/arrear_leave_encashment_as_salary_component.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v7_2/contact_address_links.py b/erpnext/patches/v7_2/contact_address_links.py index cf23e88798..200434c208 100644 --- a/erpnext/patches/v7_2/contact_address_links.py +++ b/erpnext/patches/v7_2/contact_address_links.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.core.doctype.dynamic_link.dynamic_link import deduplicate_dynamic_links from frappe.utils import update_progress_bar diff --git a/erpnext/patches/v7_2/mark_students_active.py b/erpnext/patches/v7_2/mark_students_active.py index 0a2f2d3c10..7289e4a915 100644 --- a/erpnext/patches/v7_2/mark_students_active.py +++ b/erpnext/patches/v7_2/mark_students_active.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v7_2/rename_att_date_attendance.py b/erpnext/patches/v7_2/rename_att_date_attendance.py index b2658ba7f1..7f06d8f123 100644 --- a/erpnext/patches/v7_2/rename_att_date_attendance.py +++ b/erpnext/patches/v7_2/rename_att_date_attendance.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.model.utils.rename_field import update_reports, update_users_report_view_settings, update_property_setters diff --git a/erpnext/patches/v7_2/rename_evaluation_criteria.py b/erpnext/patches/v7_2/rename_evaluation_criteria.py index d74976084b..c6520b1b72 100644 --- a/erpnext/patches/v7_2/rename_evaluation_criteria.py +++ b/erpnext/patches/v7_2/rename_evaluation_criteria.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.model.utils.rename_field import rename_field diff --git a/erpnext/patches/v7_2/stock_uom_in_selling.py b/erpnext/patches/v7_2/stock_uom_in_selling.py index 875fc4e6b9..d029555747 100644 --- a/erpnext/patches/v7_2/stock_uom_in_selling.py +++ b/erpnext/patches/v7_2/stock_uom_in_selling.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v7_2/update_abbr_in_salary_slips.py b/erpnext/patches/v7_2/update_abbr_in_salary_slips.py index aa6965f17c..19dcb5e3b2 100644 --- a/erpnext/patches/v7_2/update_abbr_in_salary_slips.py +++ b/erpnext/patches/v7_2/update_abbr_in_salary_slips.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v7_2/update_assessment_modules.py b/erpnext/patches/v7_2/update_assessment_modules.py index 37ae7c77f8..2b5e774d46 100644 --- a/erpnext/patches/v7_2/update_assessment_modules.py +++ b/erpnext/patches/v7_2/update_assessment_modules.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.model.utils.rename_field import rename_field diff --git a/erpnext/patches/v7_2/update_attendance_docstatus.py b/erpnext/patches/v7_2/update_attendance_docstatus.py index 863c0c02bb..a69052657d 100644 --- a/erpnext/patches/v7_2/update_attendance_docstatus.py +++ b/erpnext/patches/v7_2/update_attendance_docstatus.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v7_2/update_guardian_name_in_student_master.py b/erpnext/patches/v7_2/update_guardian_name_in_student_master.py index 163e7c3d19..9f589ef00e 100644 --- a/erpnext/patches/v7_2/update_guardian_name_in_student_master.py +++ b/erpnext/patches/v7_2/update_guardian_name_in_student_master.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.model.utils.rename_field import rename_field diff --git a/erpnext/patches/v7_2/update_salary_slips.py b/erpnext/patches/v7_2/update_salary_slips.py index c6bca8e7b9..11a52f9587 100644 --- a/erpnext/patches/v7_2/update_salary_slips.py +++ b/erpnext/patches/v7_2/update_salary_slips.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from erpnext.hr.doctype.payroll_entry.payroll_entry import get_month_details from frappe.utils import cint diff --git a/erpnext/patches/v7_2/update_website_for_variant.py b/erpnext/patches/v7_2/update_website_for_variant.py index 639569883e..e8eef6e7da 100644 --- a/erpnext/patches/v7_2/update_website_for_variant.py +++ b/erpnext/patches/v7_2/update_website_for_variant.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v8_0/addresses_linked_to_lead.py b/erpnext/patches/v8_0/addresses_linked_to_lead.py index c485b5b10a..b5f2234228 100644 --- a/erpnext/patches/v8_0/addresses_linked_to_lead.py +++ b/erpnext/patches/v8_0/addresses_linked_to_lead.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v8_1/add_hsn_sac_codes.py b/erpnext/patches/v8_1/add_hsn_sac_codes.py index 0b54f15d3b..0fce96a8d4 100644 --- a/erpnext/patches/v8_1/add_hsn_sac_codes.py +++ b/erpnext/patches/v8_1/add_hsn_sac_codes.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from erpnext.regional.india.setup import setup diff --git a/erpnext/patches/v8_1/add_indexes_in_transaction_doctypes.py b/erpnext/patches/v8_1/add_indexes_in_transaction_doctypes.py index 2fa0221ed7..4631602606 100644 --- a/erpnext/patches/v8_1/add_indexes_in_transaction_doctypes.py +++ b/erpnext/patches/v8_1/add_indexes_in_transaction_doctypes.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v8_1/allow_invoice_copy_to_edit_after_submit.py b/erpnext/patches/v8_1/allow_invoice_copy_to_edit_after_submit.py index 1fb297f288..4c606af424 100644 --- a/erpnext/patches/v8_1/allow_invoice_copy_to_edit_after_submit.py +++ b/erpnext/patches/v8_1/allow_invoice_copy_to_edit_after_submit.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v8_1/gst_fixes.py b/erpnext/patches/v8_1/gst_fixes.py index b47879c08d..22fa53ba37 100644 --- a/erpnext/patches/v8_1/gst_fixes.py +++ b/erpnext/patches/v8_1/gst_fixes.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.custom.doctype.custom_field.custom_field import create_custom_field from erpnext.regional.india.setup import update_address_template diff --git a/erpnext/patches/v8_1/set_delivery_date_in_so_item.py b/erpnext/patches/v8_1/set_delivery_date_in_so_item.py index 2e81571072..af2d28b857 100644 --- a/erpnext/patches/v8_1/set_delivery_date_in_so_item.py +++ b/erpnext/patches/v8_1/set_delivery_date_in_so_item.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v8_1/setup_gst_india.py b/erpnext/patches/v8_1/setup_gst_india.py index 5370fa2aa5..e8b017d864 100644 --- a/erpnext/patches/v8_1/setup_gst_india.py +++ b/erpnext/patches/v8_1/setup_gst_india.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.email import sendmail_to_system_managers diff --git a/erpnext/patches/v8_1/update_gst_state.py b/erpnext/patches/v8_1/update_gst_state.py index 5fb9be0445..7aaf2d5ff3 100644 --- a/erpnext/patches/v8_1/update_gst_state.py +++ b/erpnext/patches/v8_1/update_gst_state.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from erpnext.regional.india import states diff --git a/erpnext/patches/v8_5/fix_tax_breakup_for_non_invoice_docs.py b/erpnext/patches/v8_5/fix_tax_breakup_for_non_invoice_docs.py index fe9befe265..82beba3770 100644 --- a/erpnext/patches/v8_5/fix_tax_breakup_for_non_invoice_docs.py +++ b/erpnext/patches/v8_5/fix_tax_breakup_for_non_invoice_docs.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from erpnext.regional.india.setup import make_custom_fields from erpnext.controllers.taxes_and_totals import get_itemised_tax_breakup_html diff --git a/erpnext/patches/v8_5/remove_project_type_property_setter.py b/erpnext/patches/v8_5/remove_project_type_property_setter.py index 03d128d3ec..70a08f5377 100644 --- a/erpnext/patches/v8_5/remove_project_type_property_setter.py +++ b/erpnext/patches/v8_5/remove_project_type_property_setter.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v8_5/update_customer_group_in_POS_profile.py b/erpnext/patches/v8_5/update_customer_group_in_POS_profile.py index 9a5fef90c8..2661914401 100644 --- a/erpnext/patches/v8_5/update_customer_group_in_POS_profile.py +++ b/erpnext/patches/v8_5/update_customer_group_in_POS_profile.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v8_6/rename_bom_update_tool.py b/erpnext/patches/v8_6/rename_bom_update_tool.py index 45a4ddc788..ef5f335e45 100644 --- a/erpnext/patches/v8_6/rename_bom_update_tool.py +++ b/erpnext/patches/v8_6/rename_bom_update_tool.py @@ -1,4 +1,6 @@ +from __future__ import unicode_literals import frappe + def execute(): frappe.delete_doc_if_exists("DocType", "BOM Replace Tool") diff --git a/erpnext/patches/v8_7/fix_purchase_receipt_status.py b/erpnext/patches/v8_7/fix_purchase_receipt_status.py index f7037dd7df..99ecb44214 100644 --- a/erpnext/patches/v8_7/fix_purchase_receipt_status.py +++ b/erpnext/patches/v8_7/fix_purchase_receipt_status.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v8_7/sync_india_custom_fields.py b/erpnext/patches/v8_7/sync_india_custom_fields.py index 323b5bcd3e..c684b24b2b 100644 --- a/erpnext/patches/v8_7/sync_india_custom_fields.py +++ b/erpnext/patches/v8_7/sync_india_custom_fields.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from erpnext.regional.india.setup import make_custom_fields diff --git a/erpnext/patches/v8_9/delete_gst_doctypes_for_outside_india_accounts.py b/erpnext/patches/v8_9/delete_gst_doctypes_for_outside_india_accounts.py index 2b4ac58a67..f67af90555 100644 --- a/erpnext/patches/v8_9/delete_gst_doctypes_for_outside_india_accounts.py +++ b/erpnext/patches/v8_9/delete_gst_doctypes_for_outside_india_accounts.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v8_9/remove_employee_from_salary_structure_parent.py b/erpnext/patches/v8_9/remove_employee_from_salary_structure_parent.py index 4ab9cf3ec8..808ae6d527 100644 --- a/erpnext/patches/v8_9/remove_employee_from_salary_structure_parent.py +++ b/erpnext/patches/v8_9/remove_employee_from_salary_structure_parent.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v8_9/set_default_customer_group.py b/erpnext/patches/v8_9/set_default_customer_group.py index e6351c41fd..cbbe09daf5 100644 --- a/erpnext/patches/v8_9/set_default_customer_group.py +++ b/erpnext/patches/v8_9/set_default_customer_group.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v8_9/set_member_party_type.py b/erpnext/patches/v8_9/set_member_party_type.py index 2934c70ad5..33bbc11a93 100644 --- a/erpnext/patches/v8_9/set_member_party_type.py +++ b/erpnext/patches/v8_9/set_member_party_type.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v9_0/remove_non_existing_warehouse_from_stock_settings.py b/erpnext/patches/v9_0/remove_non_existing_warehouse_from_stock_settings.py index 33dc5192d1..c685bbc681 100644 --- a/erpnext/patches/v9_0/remove_non_existing_warehouse_from_stock_settings.py +++ b/erpnext/patches/v9_0/remove_non_existing_warehouse_from_stock_settings.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v9_0/revert_manufacturing_user_role.py b/erpnext/patches/v9_0/revert_manufacturing_user_role.py index 5bfa8c3f9a..f38b7f29ce 100644 --- a/erpnext/patches/v9_0/revert_manufacturing_user_role.py +++ b/erpnext/patches/v9_0/revert_manufacturing_user_role.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v9_0/set_variant_item_description.py b/erpnext/patches/v9_0/set_variant_item_description.py index c844571506..82d6148508 100644 --- a/erpnext/patches/v9_0/set_variant_item_description.py +++ b/erpnext/patches/v9_0/set_variant_item_description.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.utils import cstr diff --git a/erpnext/patches/v9_2/delete_healthcare_domain_default_items.py b/erpnext/patches/v9_2/delete_healthcare_domain_default_items.py index 187cbd3f9a..54ae18b8e2 100644 --- a/erpnext/patches/v9_2/delete_healthcare_domain_default_items.py +++ b/erpnext/patches/v9_2/delete_healthcare_domain_default_items.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.utils import getdate diff --git a/erpnext/patches/v9_2/delete_process_payroll.py b/erpnext/patches/v9_2/delete_process_payroll.py index e9e1b99c06..91c49f577f 100644 --- a/erpnext/patches/v9_2/delete_process_payroll.py +++ b/erpnext/patches/v9_2/delete_process_payroll.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v9_2/remove_company_from_patient.py b/erpnext/patches/v9_2/remove_company_from_patient.py index 1ce344501d..1a50088f23 100644 --- a/erpnext/patches/v9_2/remove_company_from_patient.py +++ b/erpnext/patches/v9_2/remove_company_from_patient.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v9_2/rename_translated_domains_in_en.py b/erpnext/patches/v9_2/rename_translated_domains_in_en.py index fc3d01cc60..aec5d438ec 100644 --- a/erpnext/patches/v9_2/rename_translated_domains_in_en.py +++ b/erpnext/patches/v9_2/rename_translated_domains_in_en.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe import _ diff --git a/erpnext/patches/v9_2/repost_reserved_qty_for_production.py b/erpnext/patches/v9_2/repost_reserved_qty_for_production.py index c4eab19d2e..040e655bd8 100644 --- a/erpnext/patches/v9_2/repost_reserved_qty_for_production.py +++ b/erpnext/patches/v9_2/repost_reserved_qty_for_production.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/patches/v9_2/set_item_name_in_production_order.py b/erpnext/patches/v9_2/set_item_name_in_production_order.py index 18b5b8cdc6..1f490e62c8 100644 --- a/erpnext/patches/v9_2/set_item_name_in_production_order.py +++ b/erpnext/patches/v9_2/set_item_name_in_production_order.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/erpnext/portal/utils.py b/erpnext/portal/utils.py index 93fe5da693..2e710c75f3 100644 --- a/erpnext/portal/utils.py +++ b/erpnext/portal/utils.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def set_default_role(doc, method): diff --git a/erpnext/projects/doctype/project/project_dashboard.py b/erpnext/projects/doctype/project/project_dashboard.py index 485aae77e7..39cf016d61 100644 --- a/erpnext/projects/doctype/project/project_dashboard.py +++ b/erpnext/projects/doctype/project/project_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/regional/__init__.py b/erpnext/regional/__init__.py index 1bd3357a81..dc14d04960 100644 --- a/erpnext/regional/__init__.py +++ b/erpnext/regional/__init__.py @@ -1,6 +1,7 @@ # Copyright (c) 2018, Frappe Technologies and contributors # For license information, please see license.txt +from __future__ import unicode_literals import frappe from frappe import _ from erpnext import get_region diff --git a/erpnext/regional/france/utils.py b/erpnext/regional/france/utils.py index 9e9f0ad9be..e4b72f6586 100644 --- a/erpnext/regional/france/utils.py +++ b/erpnext/regional/france/utils.py @@ -1,6 +1,7 @@ # Copyright (c) 2018, Frappe Technologies and contributors # For license information, please see license.txt +from __future__ import unicode_literals import frappe from frappe import _ from erpnext import get_region diff --git a/erpnext/regional/india/__init__.py b/erpnext/regional/india/__init__.py index 4a9a211b41..46c874b252 100644 --- a/erpnext/regional/india/__init__.py +++ b/erpnext/regional/india/__init__.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + states = [ '', 'Andaman and Nicobar Islands', diff --git a/erpnext/regional/india/utils.py b/erpnext/regional/india/utils.py index a1fba072b2..fd9ac4c81b 100644 --- a/erpnext/regional/india/utils.py +++ b/erpnext/regional/india/utils.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe, re from frappe import _ from frappe.utils import cstr, flt, date_diff, getdate diff --git a/erpnext/regional/united_arab_emirates/utils.py b/erpnext/regional/united_arab_emirates/utils.py index 61ffadb443..a01c6ceec3 100644 --- a/erpnext/regional/united_arab_emirates/utils.py +++ b/erpnext/regional/united_arab_emirates/utils.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe.utils import flt from erpnext.controllers.taxes_and_totals import get_itemised_tax diff --git a/erpnext/restaurant/doctype/restaurant/restaurant_dashboard.py b/erpnext/restaurant/doctype/restaurant/restaurant_dashboard.py index 1f84ccf1d8..ec62ba22b4 100644 --- a/erpnext/restaurant/doctype/restaurant/restaurant_dashboard.py +++ b/erpnext/restaurant/doctype/restaurant/restaurant_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/selling/doctype/customer/customer_dashboard.py b/erpnext/selling/doctype/customer/customer_dashboard.py index bf01363bd6..f2f430a61e 100644 --- a/erpnext/selling/doctype/customer/customer_dashboard.py +++ b/erpnext/selling/doctype/customer/customer_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/selling/doctype/quotation/quotation_dashboard.py b/erpnext/selling/doctype/quotation/quotation_dashboard.py index d32fd0cfed..f1ac951ef9 100644 --- a/erpnext/selling/doctype/quotation/quotation_dashboard.py +++ b/erpnext/selling/doctype/quotation/quotation_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/selling/doctype/sales_order/sales_order_dashboard.py b/erpnext/selling/doctype/sales_order/sales_order_dashboard.py index 35c643de6c..aab6db2584 100644 --- a/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +++ b/erpnext/selling/doctype/sales_order/sales_order_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/selling/report/pending_so_items_for_purchase_request/test_pending_so_items_for_purchase_request.py b/erpnext/selling/report/pending_so_items_for_purchase_request/test_pending_so_items_for_purchase_request.py index f2b7701b10..f2518f09f8 100644 --- a/erpnext/selling/report/pending_so_items_for_purchase_request/test_pending_so_items_for_purchase_request.py +++ b/erpnext/selling/report/pending_so_items_for_purchase_request/test_pending_so_items_for_purchase_request.py @@ -1,6 +1,7 @@ # Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors # For license information, please see license.txt +from __future__ import unicode_literals import unittest from frappe.utils import nowdate, add_months from erpnext.selling.report.pending_so_items_for_purchase_request.pending_so_items_for_purchase_request\ diff --git a/erpnext/selling/report/sales_analytics/test_analytics.py b/erpnext/selling/report/sales_analytics/test_analytics.py index 5d68b06b6d..4d81a1e4dd 100644 --- a/erpnext/selling/report/sales_analytics/test_analytics.py +++ b/erpnext/selling/report/sales_analytics/test_analytics.py @@ -1,6 +1,7 @@ # Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors # For license information, please see license.txt +from __future__ import unicode_literals import frappe import frappe.defaults import unittest diff --git a/erpnext/setup/doctype/company/company_dashboard.py b/erpnext/setup/doctype/company/company_dashboard.py index 5efcf3839f..9b483dd55e 100644 --- a/erpnext/setup/doctype/company/company_dashboard.py +++ b/erpnext/setup/doctype/company/company_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/setup/doctype/sales_person/sales_person_dashboard.py b/erpnext/setup/doctype/sales_person/sales_person_dashboard.py index 42528d8832..3d0b2ff7f8 100644 --- a/erpnext/setup/doctype/sales_person/sales_person_dashboard.py +++ b/erpnext/setup/doctype/sales_person/sales_person_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/setup/setup_wizard/data/industry_type.py b/erpnext/setup/setup_wizard/data/industry_type.py index 74a10ff56a..4fa9f8abb1 100644 --- a/erpnext/setup/setup_wizard/data/industry_type.py +++ b/erpnext/setup/setup_wizard/data/industry_type.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_industry_types(): diff --git a/erpnext/setup/setup_wizard/utils.py b/erpnext/setup/setup_wizard/utils.py index d821a12989..e82bc96d93 100644 --- a/erpnext/setup/setup_wizard/utils.py +++ b/erpnext/setup/setup_wizard/utils.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import json, os from frappe.desk.page.setup_wizard.setup_wizard import setup_complete diff --git a/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py b/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py index 63c32a4b93..beeb9ebb05 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py +++ b/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/stock/doctype/item/item_dashboard.py b/erpnext/stock/doctype/item/item_dashboard.py index c571355cad..8e4f74ddbb 100644 --- a/erpnext/stock/doctype/item/item_dashboard.py +++ b/erpnext/stock/doctype/item/item_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/stock/doctype/item_attribute/test_item_attribute.py b/erpnext/stock/doctype/item_attribute/test_item_attribute.py index 6357b52569..61e53d24a4 100644 --- a/erpnext/stock/doctype/item_attribute/test_item_attribute.py +++ b/erpnext/stock/doctype/item_attribute/test_item_attribute.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and Contributors # See license.txt +from __future__ import unicode_literals import frappe import unittest diff --git a/erpnext/stock/doctype/material_request/material_request_dashboard.py b/erpnext/stock/doctype/material_request/material_request_dashboard.py index 6cfb8af0a2..adfab86cc4 100644 --- a/erpnext/stock/doctype/material_request/material_request_dashboard.py +++ b/erpnext/stock/doctype/material_request/material_request_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py index a517703c9a..3832c827e2 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe import _ def get_data(): diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py index a4eb2bb15d..472083b5a1 100644 --- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py @@ -1,8 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt - - +from __future__ import unicode_literals import unittest import frappe, erpnext import frappe.defaults @@ -352,7 +351,7 @@ class TestPurchaseReceipt(unittest.TestCase): set_perpetual_inventory(1, "_Test Company") pr = make_purchase_receipt(cost_center=cost_center) - + stock_in_hand_account = get_inventory_account(pr.company, pr.get("items")[0].warehouse) gl_entries = get_gl_entries("Purchase Receipt", pr.name) diff --git a/erpnext/stock/doctype/quality_inspection/test_quality_inspection.py b/erpnext/stock/doctype/quality_inspection/test_quality_inspection.py index 0f0b4016e2..bb535c1f6a 100644 --- a/erpnext/stock/doctype/quality_inspection/test_quality_inspection.py +++ b/erpnext/stock/doctype/quality_inspection/test_quality_inspection.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and Contributors # See license.txt +from __future__ import unicode_literals import frappe import unittest from frappe.utils import nowdate diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_utils.py b/erpnext/stock/doctype/stock_entry/stock_entry_utils.py index 6b4ca18191..7a3433819d 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry_utils.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry_utils.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # See license.txt +from __future__ import unicode_literals import frappe, erpnext from frappe.utils import cint, flt diff --git a/erpnext/stock/reorder_item.py b/erpnext/stock/reorder_item.py index 1578bb68ce..39fb024023 100644 --- a/erpnext/stock/reorder_item.py +++ b/erpnext/stock/reorder_item.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe import erpnext from frappe.utils import flt, nowdate, add_days, cint @@ -138,7 +139,7 @@ def create_material_request(material_requests): if request_type == 'Purchase': uom = item.purchase_uom or item.stock_uom if uom != item.stock_uom: - conversion_factor = frappe.db.get_value("UOM Conversion Detail", + conversion_factor = frappe.db.get_value("UOM Conversion Detail", {'parent': item.name, 'uom': uom}, 'conversion_factor') or 1.0 mr.append("items", { diff --git a/erpnext/templates/pages/non_profit/join_chapter.py b/erpnext/templates/pages/non_profit/join_chapter.py index 121f4440eb..aa54a58eeb 100644 --- a/erpnext/templates/pages/non_profit/join_chapter.py +++ b/erpnext/templates/pages/non_profit/join_chapter.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def get_context(context): diff --git a/erpnext/templates/pages/non_profit/leave_chapter.py b/erpnext/templates/pages/non_profit/leave_chapter.py index da2d819eb7..21cb722b88 100644 --- a/erpnext/templates/pages/non_profit/leave_chapter.py +++ b/erpnext/templates/pages/non_profit/leave_chapter.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def get_context(context): diff --git a/erpnext/templates/pages/regional/india/update_gstin.py b/erpnext/templates/pages/regional/india/update_gstin.py index 5493e544b7..f555db0d72 100644 --- a/erpnext/templates/pages/regional/india/update_gstin.py +++ b/erpnext/templates/pages/regional/india/update_gstin.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe import _ from six import iteritems diff --git a/erpnext/tests/test_init.py b/erpnext/tests/test_init.py index 43340ce37a..abc04a8808 100644 --- a/erpnext/tests/test_init.py +++ b/erpnext/tests/test_init.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import unittest import frappe diff --git a/erpnext/tests/test_regional.py b/erpnext/tests/test_regional.py index 7bd6fa8238..282fc6454b 100644 --- a/erpnext/tests/test_regional.py +++ b/erpnext/tests/test_regional.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import unittest, frappe, erpnext @erpnext.allow_regional diff --git a/erpnext/tests/test_woocommerce.py b/erpnext/tests/test_woocommerce.py index 0347e953f4..373d0a0ca4 100644 --- a/erpnext/tests/test_woocommerce.py +++ b/erpnext/tests/test_woocommerce.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import unittest, frappe, requests, os, time, erpnext from erpnext.erpnext_integrations.connectors.woocommerce_connection import order diff --git a/erpnext/utilities/__init__.py b/erpnext/utilities/__init__.py index 7912a59aa8..618cc985ae 100644 --- a/erpnext/utilities/__init__.py +++ b/erpnext/utilities/__init__.py @@ -1,5 +1,5 @@ ## temp utility -from __future__ import print_function +from __future__ import print_function, unicode_literals import frappe from erpnext.utilities.activation import get_level from frappe.utils import cstr diff --git a/erpnext/utilities/activation.py b/erpnext/utilities/activation.py index 8ad042b74a..16391e073e 100644 --- a/erpnext/utilities/activation.py +++ b/erpnext/utilities/activation.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe, erpnext from frappe import _ diff --git a/erpnext/utilities/user_progress.py b/erpnext/utilities/user_progress.py index 2901d52276..402f1bb367 100644 --- a/erpnext/utilities/user_progress.py +++ b/erpnext/utilities/user_progress.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe, erpnext from frappe import _ from erpnext.setup.doctype.setup_progress.setup_progress import get_action_completed_state diff --git a/erpnext/utilities/user_progress_utils.py b/erpnext/utilities/user_progress_utils.py index a665c5dbbd..b7c24a71ba 100644 --- a/erpnext/utilities/user_progress_utils.py +++ b/erpnext/utilities/user_progress_utils.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe, erpnext import json diff --git a/erpnext/www/payment_setup_certification.py b/erpnext/www/payment_setup_certification.py index 185c220942..3ec8ca013e 100644 --- a/erpnext/www/payment_setup_certification.py +++ b/erpnext/www/payment_setup_certification.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe import foundation diff --git a/setup.py b/setup.py index 71107a9a2f..a864e73831 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +from __future__ import unicode_literals from setuptools import setup, find_packages import re, ast From 8c2a2c8f604c09114df41eaf739535e1628f08df Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 23 Jan 2019 10:33:47 +0530 Subject: [PATCH 28/86] fix(accounts): Validate gst accounts defined in GST Settings in eway bill report --- .../regional/report/eway_bill/eway_bill.py | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/erpnext/regional/report/eway_bill/eway_bill.py b/erpnext/regional/report/eway_bill/eway_bill.py index 1b5de274c5..5b9896be2a 100644 --- a/erpnext/regional/report/eway_bill/eway_bill.py +++ b/erpnext/regional/report/eway_bill/eway_bill.py @@ -16,7 +16,7 @@ def execute(filters=None): return columns, data def get_data(filters): - + conditions = get_conditions(filters) data = frappe.db.sql(""" @@ -25,7 +25,7 @@ def get_data(filters): FROM `tabDelivery Note` AS dn join `tabDelivery Note Item` AS dni on (dni.parent = dn.name) WHERE - dn.docstatus < 2 + dn.docstatus < 2 %s """ % conditions, as_dict=1) unit = { @@ -40,14 +40,14 @@ def get_data(filters): 'Set': "SETS" } - # Regular expression set to remove all the special characters + # Regular expression set to remove all the special characters special_characters = "[$%^*()+\\[\]{};':\"\\|<>.?]" for row in data: set_defaults(row) set_taxes(row, filters) set_address_details(row, special_characters) - + # Eway Bill accepts date as dd/mm/yyyy and not dd-mm-yyyy row.posting_date = '/'.join(str(row.posting_date).replace("-", "/").split('/')[::-1]) row.lr_date = '/'.join(str(row.lr_date).replace("-", "/").split('/')[::-1]) @@ -66,7 +66,7 @@ def get_data(filters): return data def get_conditions(filters): - + conditions = "" conditions += filters.get('company') and " AND dn.company = '%s' " % filters.get('company') or "" @@ -92,7 +92,7 @@ def set_address_details(row, special_characters): row.update({'from_pin_code': pincode and pincode.replace(" ", "") or ''}) row.update({'from_state': state and state.upper() or ''}) row.update({'dispatch_state': row.from_state}) - + if row.get('shipping_address_name'): address_line1, address_line2, city, pincode, state = frappe.db.get_value("Address", row.get('shipping_address_name'), ['address_line1', 'address_line2', 'city', 'pincode', 'state']) @@ -104,20 +104,23 @@ def set_address_details(row, special_characters): row.update({'ship_to_state': row.to_state}) def set_taxes(row, filters): - taxes = frappe.get_list("Sales Taxes and Charges", + taxes = frappe.get_list("Sales Taxes and Charges", filters={ 'parent': row.dn_id - }, + }, fields=('item_wise_tax_detail', 'account_head')) account_list = ["cgst_account", "sgst_account", "igst_account", "cess_account"] taxes_list = frappe.get_list("GST Account", filters={ - "parent": "GST Settings", + "parent": "GST Settings", "company": filters.company }, fields=account_list) + if not taxes_list: + frappe.throw(_("Please set GST Accounts in GST Settings")) + item_tax_rate = {} for tax in taxes: From 141c543f9765b11df09fef4e57157b2aae5fd172 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 23 Jan 2019 12:14:55 +0530 Subject: [PATCH 29/86] Update journal_entry.js --- .../doctype/journal_entry/journal_entry.js | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js index c0a9a965e2..0aa62d510c 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.js +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js @@ -174,16 +174,18 @@ erpnext.accounts.JournalEntry = frappe.ui.form.Controller.extend({ out.filters.push([jvd.reference_type, "per_billed", "<", 100]); } + + if(jvd.party_type && jvd.party) { + var party_field = ""; + if(jvd.reference_type.indexOf("Sales")===0) { + var party_field = "customer"; + } else if (jvd.reference_type.indexOf("Purchase")===0) { + var party_field = "supplier"; + } - var party_field = ""; - if(jvd.reference_type.indexOf("Sales")===0) { - var party_field = "customer"; - } else if (jvd.reference_type.indexOf("Purchase")===0) { - var party_field = "supplier"; - } - - if (party_field) { - out.filters.push([jvd.reference_type, party_field, "=", jvd.party]); + if (party_field) { + out.filters.push([jvd.reference_type, party_field, "=", jvd.party]); + } } return out; From 06607fda4e4d5a55c8107e30de5568d7d522e8fa Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 23 Jan 2019 12:15:48 +0530 Subject: [PATCH 30/86] fix: removed print statement --- erpnext/hr/doctype/payroll_entry/payroll_entry.py | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.py b/erpnext/hr/doctype/payroll_entry/payroll_entry.py index 0f2e5f4fa1..734509592f 100644 --- a/erpnext/hr/doctype/payroll_entry/payroll_entry.py +++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.py @@ -527,7 +527,6 @@ def payroll_entry_has_bank_entries(name): return response def get_payroll_entries_for_jv(doctype, txt, searchfield, start, page_len, filters): - print(doctype) return frappe.db.sql(""" select name from `tabPayroll Entry` where `{key}` LIKE %(txt)s From 037d0f8ba6956ec099cddaa3746063f90cd674bd Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Wed, 23 Jan 2019 14:11:25 +0530 Subject: [PATCH 31/86] fix(buying): make supplier scorecard usable --- .../supplier_scorecard/supplier_scorecard.js | 101 +++++----------- .../supplier_scorecard.json | 67 ++++++----- .../supplier_scorecard/supplier_scorecard.py | 9 +- .../supplier_scorecard_criteria.json | 70 ++++++------ .../supplier_scorecard_criteria.py | 19 +-- .../supplier_scorecard_period.js | 10 +- .../supplier_scorecard_period.json | 42 ++++++- .../supplier_scorecard_period.py | 40 +++---- .../supplier_scorecard_scoring_criteria.json | 108 +++++++----------- .../supplier_scorecard_scoring_standing.json | 4 +- .../supplier_scorecard_scoring_variable.json | 104 ++++++----------- .../supplier_scorecard_standing.json | 4 +- .../supplier_scorecard_variable.json | 6 +- .../supplier_scorecard_variable.py | 7 -- 14 files changed, 244 insertions(+), 347 deletions(-) diff --git a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.js b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.js index e7a704a28a..5f5f54b79f 100644 --- a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.js +++ b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.js @@ -13,15 +13,23 @@ frappe.ui.form.on("Supplier Scorecard", { }, onload: function(frm) { if (frm.doc.__unsaved == 1) { - loadAllCriteria(frm); loadAllStandings(frm); } - }, - refresh: function(frm) { - if (frm.dashboard.hasOwnProperty('heatmap')) { - frm.dashboard.heatmap.setLegend([0,20,40,60,80,101],["#991600","#169900"]); - } + load_criteria: function(frm) { + frappe.call({ + method: "erpnext.buying.doctype.supplier_scorecard_criteria.supplier_scorecard_criteria.get_criteria_list", + callback: function(r) { + frm.set_value('criteria', []); + for (var i = 0; i < r.message.length; i++) + { + var row = frm.add_child("criteria"); + row.criteria_name = r.message[i].name; + frm.script_manager.trigger("criteria_name", row.doctype, row.name); + } + refresh_field("criteria"); + } + }); } }); @@ -29,8 +37,8 @@ frappe.ui.form.on("Supplier Scorecard", { frappe.ui.form.on("Supplier Scorecard Scoring Standing", { standing_name: function(frm, cdt, cdn) { - if (frm.doc.standing_name != undefined) { - var d = frappe.get_doc(cdt, cdn); + var d = frappe.get_doc(cdt, cdn); + if (d.standing_name) { return frm.call({ method: "erpnext.buying.doctype.supplier_scorecard_standing.supplier_scorecard_standing.get_scoring_standing", child: d, @@ -42,86 +50,29 @@ frappe.ui.form.on("Supplier Scorecard Scoring Standing", { } }); -frappe.ui.form.on("Supplier Scorecard Scoring Variable", { - - variable_label: function(frm, cdt, cdn) { - if (frm.doc.variable_label != undefined) { - var d = frappe.get_doc(cdt, cdn); - return frm.call({ - method: "erpnext.buying.doctype.supplier_scorecard_variable.supplier_scorecard_variable.get_scoring_variable", - child: d, - args: { - variable_label: d.variable_label - } - }); - } - } -}); - frappe.ui.form.on("Supplier Scorecard Scoring Criteria", { criteria_name: function(frm, cdt, cdn) { - if (frm.doc.criteria_name != undefined) { - var d = frappe.get_doc(cdt, cdn); - frm.call({ - method: "erpnext.buying.doctype.supplier_scorecard_criteria.supplier_scorecard_criteria.get_variables", + var d = frappe.get_doc(cdt, cdn); + if (d.criteria_name) { + return frm.call({ + method: "frappe.client.get", args: { - criteria_name: d.criteria_name + fieldname: "weight", + doctype: "Supplier Scorecard Criteria", + filters: {name: d.criteria_name} }, callback: function(r) { - for (var i = 0; i < r.message.length; i++) - { - var exists = false; - for (var j = 0; j < frm.doc.variables.length; j++) - { - if(!frm.doc.variables[j].hasOwnProperty("variable_label")) { - frm.get_field("variables").grid.grid_rows[j].remove(); - } - else if(frm.doc.variables[j].variable_label === r.message[i]) { - exists = true; - } - } - if (!exists){ - var new_row = frm.add_child("variables"); - new_row.variable_label = r.message[i]; - frm.script_manager.trigger("variable_label", new_row.doctype, new_row.name); - } - + if(r.message){ + d.weight = r.message.weight; + frm.refresh_field('criteria', 'weight'); } - refresh_field("variables"); - } - }); - return frm.call({ - method: "erpnext.buying.doctype.supplier_scorecard_criteria.supplier_scorecard_criteria.get_scoring_criteria", - child: d, - args: { - criteria_name: d.criteria_name } }); } } }); -var loadAllCriteria = function(frm) { - frappe.call({ - method: "erpnext.buying.doctype.supplier_scorecard_criteria.supplier_scorecard_criteria.get_criteria_list", - callback: function(r) { - for (var j = 0; j < frm.doc.criteria.length; j++) - { - if(!frm.doc.criteria[j].hasOwnProperty("criteria_name")) { - frm.get_field("criteria").grid.grid_rows[j].remove(); - } - } - for (var i = 0; i < r.message.length; i++) - { - var new_row = frm.add_child("criteria"); - new_row.criteria_name = r.message[i].name; - frm.script_manager.trigger("criteria_name", new_row.doctype, new_row.name); - } - refresh_field("criteria"); - } - }); -}; var loadAllStandings = function(frm) { frappe.call({ method: "erpnext.buying.doctype.supplier_scorecard_standing.supplier_scorecard_standing.get_standings_list", diff --git a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.json b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.json index d7f24c9082..703ec3a0aa 100644 --- a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.json +++ b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.json @@ -4,7 +4,7 @@ "allow_import": 0, "allow_rename": 0, "autoname": "field:supplier", - "beta": 1, + "beta": 0, "creation": "2017-05-29 01:40:54.786555", "custom": 0, "docstatus": 0, @@ -182,7 +182,7 @@ "label": "Evaluation Period", "length": 0, "no_copy": 0, - "options": "Per Month\nPer Week\nPer Year", + "options": "Per Week\nPer Month\nPer Year", "permlevel": 0, "precision": "", "print_hide": 0, @@ -318,6 +318,36 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "load_criteria", + "fieldtype": "Button", + "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": "Load All Criteria", + "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, + "unique": 0 + }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -349,37 +379,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "variables", - "fieldtype": "Table", - "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": "Supplier Variables", - "length": 0, - "no_copy": 0, - "options": "Supplier Scorecard Scoring Variable", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -662,7 +661,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-07-12 07:33:11.874949", + "modified": "2019-01-22 11:42:19.918990", "modified_by": "Administrator", "module": "Buying", "name": "Supplier Scorecard", diff --git a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py index e13d22ab57..9e201e3192 100644 --- a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +++ b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py @@ -54,6 +54,7 @@ class SupplierScorecard(Document): `tabSupplier Scorecard Period` scp WHERE scp.scorecard = %(sc)s + AND scp.docstatus = 1 ORDER BY scp.end_date DESC""", {"sc": self.name}, as_dict=1) @@ -110,7 +111,8 @@ def get_timeline_data(doctype, name): FROM `tabSupplier Scorecard Period` sc WHERE - sc.scorecard = %(scs)s""", + sc.scorecard = %(scs)s + AND sc.docstatus = 1""", {"scs": scs.name}, as_dict=1) for sc in scorecards: @@ -162,6 +164,7 @@ def make_all_scorecards(docname): `tabSupplier Scorecard Period` scp WHERE scp.scorecard = %(sc)s + AND scp.docstatus = 1 AND ( (scp.start_date > %(end_date)s AND scp.end_date < %(start_date)s) @@ -170,12 +173,12 @@ def make_all_scorecards(docname): AND scp.end_date > %(start_date)s)) ORDER BY scp.end_date DESC""", - {"sc": docname, "start_date": start_date, "end_date": end_date, "supplier": supplier}, as_dict=1) + {"sc": docname, "start_date": start_date, "end_date": end_date}, as_dict=1) if len(scorecards) == 0: period_card = make_supplier_scorecard(docname, None) period_card.start_date = start_date period_card.end_date = end_date - period_card.save() + period_card.submit() scp_count = scp_count + 1 if start_date < first_start_date: first_start_date = start_date diff --git a/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.json b/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.json index 229c386120..2623585aea 100644 --- a/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.json +++ b/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.json @@ -4,7 +4,7 @@ "allow_import": 0, "allow_rename": 0, "autoname": "field:criteria_name", - "beta": 1, + "beta": 0, "creation": "2017-05-29 01:32:43.064891", "custom": 0, "docstatus": 0, @@ -43,36 +43,6 @@ "set_only_once": 0, "unique": 1 }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "weight", - "fieldtype": "Percent", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Criteria Weight", - "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": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -87,7 +57,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_global_search": 0, - "in_list_view": 0, + "in_list_view": 1, "in_standard_filter": 0, "label": "Max Score", "length": 0, @@ -114,10 +84,10 @@ "fieldtype": "Small Text", "hidden": 0, "ignore_user_permissions": 0, - "ignore_xss_filter": 0, + "ignore_xss_filter": 1, "in_filter": 0, "in_global_search": 0, - "in_list_view": 0, + "in_list_view": 1, "in_standard_filter": 0, "label": "Criteria Formula", "length": 0, @@ -133,6 +103,36 @@ "search_index": 0, "set_only_once": 0, "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "weight", + "fieldtype": "Percent", + "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": "Criteria Weight", + "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, + "unique": 0 } ], "has_web_view": 0, @@ -145,7 +145,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-07-17 10:30:47.458285", + "modified": "2019-01-22 10:47:00.000822", "modified_by": "Administrator", "module": "Buying", "name": "Supplier Scorecard Criteria", diff --git a/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py b/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py index 8514022b78..b23d321a2a 100644 --- a/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +++ b/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py @@ -36,15 +36,6 @@ class SupplierScorecardCriteria(Document): except Exception: frappe.throw(_("Error evaluating the criteria formula")) - - -@frappe.whitelist() -def get_scoring_criteria(criteria_name): - criteria = frappe.get_doc("Supplier Scorecard Criteria", criteria_name) - - return criteria - - @frappe.whitelist() def get_criteria_list(): criteria = frappe.db.sql(""" @@ -56,7 +47,6 @@ def get_criteria_list(): return criteria -@frappe.whitelist() def get_variables(criteria_name): criteria = frappe.get_doc("Supplier Scorecard Criteria", criteria_name) return _get_variables(criteria) @@ -69,21 +59,16 @@ def _get_variables(criteria): for dummy1, match in enumerate(mylist): for dummy2 in range(0, len(match.groups())): try: - #var = frappe.get_doc("Supplier Scorecard Variable", {'param_name' : d}) var = frappe.db.sql(""" SELECT - scv.name + scv.variable_label, scv.description, scv.param_name, scv.path FROM `tabSupplier Scorecard Variable` scv WHERE param_name=%(param)s""", - {'param':match.group(1)},)[0][0] + {'param':match.group(1)}, as_dict=1)[0] my_variables.append(var) except Exception: - # Ignore the ones where the variable can't be found frappe.throw(_('Unable to find variable: ') + str(match.group(1)), InvalidFormulaVariable) - #pass - - #frappe.msgprint(str(my_variables)) return my_variables diff --git a/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.js b/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.js index c51e8ab2df..a4cdeb3195 100644 --- a/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.js +++ b/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.js @@ -6,9 +6,11 @@ frappe.ui.form.on("Supplier Scorecard Period", { onload: function(frm) { - frm.get_field("variables").grid.toggle_display("value", true); - frm.get_field("criteria").grid.toggle_display("score", true); - - + let criteria_grid = frm.get_field("criteria").grid; + criteria_grid.toggle_enable("criteria_name", false); + criteria_grid.toggle_enable("weight", false); + criteria_grid.toggle_display("max_score", true); + criteria_grid.toggle_display("formula", true); + criteria_grid.toggle_display("score", true); } }); diff --git a/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.json b/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.json index 0cf651454b..e76f614983 100644 --- a/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.json +++ b/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.json @@ -4,7 +4,7 @@ "allow_import": 0, "allow_rename": 0, "autoname": "naming_series:", - "beta": 1, + "beta": 0, "creation": "2017-05-30 00:38:18.773013", "custom": 0, "docstatus": 0, @@ -281,7 +281,7 @@ "read_only": 0, "remember_last_selected_value": 0, "report_hide": 0, - "reqd": 1, + "reqd": 0, "search_index": 0, "set_only_once": 0, "unique": 0 @@ -346,6 +346,36 @@ "search_index": 0, "set_only_once": 0, "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "amended_from", + "fieldtype": "Link", + "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": "Amended From", + "length": 0, + "no_copy": 1, + "options": "Supplier Scorecard Period", + "permlevel": 0, + "print_hide": 1, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 } ], "has_web_view": 0, @@ -354,11 +384,11 @@ "idx": 0, "image_view": 0, "in_create": 1, - "is_submittable": 0, + "is_submittable": 1, "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-07-12 07:33:26.130861", + "modified": "2019-01-23 13:58:26.137770", "modified_by": "Administrator", "module": "Buying", "name": "Supplier Scorecard Period", @@ -368,7 +398,7 @@ { "amend": 0, "apply_user_permissions": 0, - "cancel": 0, + "cancel": 1, "create": 1, "delete": 1, "email": 1, @@ -382,7 +412,7 @@ "role": "System Manager", "set_user_permissions": 0, "share": 1, - "submit": 0, + "submit": 1, "write": 1 } ], diff --git a/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py b/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py index 90b65bd35a..4410431b54 100644 --- a/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +++ b/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py @@ -8,6 +8,7 @@ from frappe import throw, _ from frappe.model.document import Document from frappe.model.mapper import get_mapped_doc import erpnext.buying.doctype.supplier_scorecard_variable.supplier_scorecard_variable as variable_functions +from erpnext.buying.doctype.supplier_scorecard_criteria.supplier_scorecard_criteria import get_variables class SupplierScorecardPeriod(Document): @@ -28,7 +29,6 @@ class SupplierScorecardPeriod(Document): def calculate_variables(self): for var in self.variables: - if '.' in var.path: method_to_call = import_string_path(var.path) var.value = method_to_call(self) @@ -39,14 +39,8 @@ class SupplierScorecardPeriod(Document): def calculate_criteria(self): - #Get the criteria for crit in self.criteria: - - #me = "" my_eval_statement = crit.formula.replace("\r", "").replace("\n", "") - #for let in my_eval_statement: - # me += let.encode('hex') + " " - #frappe.msgprint(me) for var in self.variables: if var.value: @@ -102,30 +96,28 @@ def import_string_path(path): return mod -def post_process(source, target): - pass - - @frappe.whitelist() def make_supplier_scorecard(source_name, target_doc=None): - #def update_item(obj, target, source_parent): - # target.qty = flt(obj.qty) - flt(obj.received_qty) - # target.stock_qty = (flt(obj.qty) - flt(obj.received_qty)) * flt(obj.conversion_factor) - # target.amount = (flt(obj.qty) - flt(obj.received_qty)) * flt(obj.rate) - # target.base_amount = (flt(obj.qty) - flt(obj.received_qty)) * \ - # flt(obj.rate) * flt(source_parent.conversion_rate) + def update_criteria_fields(obj, target, source_parent): + target.max_score, target.formula = frappe.db.get_value('Supplier Scorecard Criteria', + obj.criteria_name, ['max_score', 'formula']) + + def post_process(source, target): + variables = [] + for cr in target.criteria: + for var in get_variables(cr.criteria_name): + if var not in variables: + variables.append(var) + + target.extend('variables', variables) doc = get_mapped_doc("Supplier Scorecard", source_name, { "Supplier Scorecard": { "doctype": "Supplier Scorecard Period" }, - "Supplier Scorecard Scoring Variable": { - "doctype": "Supplier Scorecard Scoring Variable", - "add_if_empty": True - }, - "Supplier Scorecard Scoring Constraint": { - "doctype": "Supplier Scorecard Scoring Constraint", - "add_if_empty": True + "Supplier Scorecard Scoring Criteria": { + "doctype": "Supplier Scorecard Scoring Criteria", + "postprocess": update_criteria_fields, } }, target_doc, post_process) diff --git a/erpnext/buying/doctype/supplier_scorecard_scoring_criteria/supplier_scorecard_scoring_criteria.json b/erpnext/buying/doctype/supplier_scorecard_scoring_criteria/supplier_scorecard_scoring_criteria.json index 567738a6d0..5816856521 100644 --- a/erpnext/buying/doctype/supplier_scorecard_scoring_criteria/supplier_scorecard_scoring_criteria.json +++ b/erpnext/buying/doctype/supplier_scorecard_scoring_criteria/supplier_scorecard_scoring_criteria.json @@ -3,7 +3,7 @@ "allow_guest_to_view": 0, "allow_import": 0, "allow_rename": 0, - "beta": 1, + "beta": 0, "creation": "2017-05-29 01:32:17.988454", "custom": 0, "docstatus": 0, @@ -17,7 +17,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "columns": 3, + "columns": 5, "fieldname": "criteria_name", "fieldtype": "Link", "hidden": 0, @@ -43,14 +43,44 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 2, + "fieldname": "score", + "fieldtype": "Percent", + "hidden": 1, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Score", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "section_break_2", - "fieldtype": "Section Break", + "fieldname": "column_break_4", + "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -90,6 +120,7 @@ "label": "Criteria Weight", "length": 0, "no_copy": 0, + "options": "", "permlevel": 0, "precision": "", "print_hide": 0, @@ -102,35 +133,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "column_break_4", - "fieldtype": "Column Break", - "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, - "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, - "unique": 0 - }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -140,7 +142,7 @@ "default": "100", "fieldname": "max_score", "fieldtype": "Float", - "hidden": 0, + "hidden": 1, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, @@ -154,7 +156,7 @@ "precision": "", "print_hide": 0, "print_hide_if_no_value": 0, - "read_only": 0, + "read_only": 1, "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, @@ -199,7 +201,7 @@ "columns": 0, "fieldname": "formula", "fieldtype": "Small Text", - "hidden": 0, + "hidden": 1, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, @@ -213,37 +215,7 @@ "precision": "", "print_hide": 0, "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "score", - "fieldtype": "Percent", - "hidden": 1, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Score", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, + "read_only": 1, "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, @@ -262,7 +234,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-07-12 07:33:41.532361", + "modified": "2019-01-23 13:49:13.350095", "modified_by": "Administrator", "module": "Buying", "name": "Supplier Scorecard Scoring Criteria", diff --git a/erpnext/buying/doctype/supplier_scorecard_scoring_standing/supplier_scorecard_scoring_standing.json b/erpnext/buying/doctype/supplier_scorecard_scoring_standing/supplier_scorecard_scoring_standing.json index 1fc04bb120..e8498efb5e 100644 --- a/erpnext/buying/doctype/supplier_scorecard_scoring_standing/supplier_scorecard_scoring_standing.json +++ b/erpnext/buying/doctype/supplier_scorecard_scoring_standing/supplier_scorecard_scoring_standing.json @@ -3,7 +3,7 @@ "allow_guest_to_view": 0, "allow_import": 0, "allow_rename": 0, - "beta": 1, + "beta": 0, "creation": "2017-05-29 01:36:22.697234", "custom": 0, "docstatus": 0, @@ -473,7 +473,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-07-12 07:33:20.615684", + "modified": "2019-01-22 10:47:41.146704", "modified_by": "Administrator", "module": "Buying", "name": "Supplier Scorecard Scoring Standing", diff --git a/erpnext/buying/doctype/supplier_scorecard_scoring_variable/supplier_scorecard_scoring_variable.json b/erpnext/buying/doctype/supplier_scorecard_scoring_variable/supplier_scorecard_scoring_variable.json index f0e043e47a..5e4c5c1e3a 100644 --- a/erpnext/buying/doctype/supplier_scorecard_scoring_variable/supplier_scorecard_scoring_variable.json +++ b/erpnext/buying/doctype/supplier_scorecard_scoring_variable/supplier_scorecard_scoring_variable.json @@ -3,7 +3,7 @@ "allow_guest_to_view": 0, "allow_import": 0, "allow_rename": 0, - "beta": 1, + "beta": 0, "creation": "2017-05-29 01:30:06.105240", "custom": 0, "docstatus": 0, @@ -35,7 +35,7 @@ "precision": "", "print_hide": 0, "print_hide_if_no_value": 0, - "read_only": 0, + "read_only": 1, "remember_last_selected_value": 0, "report_hide": 0, "reqd": 1, @@ -65,7 +65,37 @@ "precision": "", "print_hide": 0, "print_hide_if_no_value": 0, - "read_only": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 2, + "fieldname": "value", + "fieldtype": "Float", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Value", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, @@ -73,36 +103,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "is_custom", - "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": "Custom?", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -111,7 +111,7 @@ "columns": 0, "fieldname": "param_name", "fieldtype": "Data", - "hidden": 0, + "hidden": 1, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, @@ -128,7 +128,7 @@ "read_only": 1, "remember_last_selected_value": 0, "report_hide": 0, - "reqd": 1, + "reqd": 0, "search_index": 0, "set_only_once": 0, "unique": 0 @@ -141,7 +141,7 @@ "columns": 0, "fieldname": "path", "fieldtype": "Data", - "hidden": 0, + "hidden": 1, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, @@ -158,36 +158,6 @@ "read_only": 1, "remember_last_selected_value": 0, "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 2, - "fieldname": "value", - "fieldtype": "Float", - "hidden": 1, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Value", - "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, @@ -204,7 +174,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-07-12 07:33:36.671502", + "modified": "2019-01-23 09:55:19.749828", "modified_by": "Administrator", "module": "Buying", "name": "Supplier Scorecard Scoring Variable", diff --git a/erpnext/buying/doctype/supplier_scorecard_standing/supplier_scorecard_standing.json b/erpnext/buying/doctype/supplier_scorecard_standing/supplier_scorecard_standing.json index b61b4edd72..b57881a096 100644 --- a/erpnext/buying/doctype/supplier_scorecard_standing/supplier_scorecard_standing.json +++ b/erpnext/buying/doctype/supplier_scorecard_standing/supplier_scorecard_standing.json @@ -4,7 +4,7 @@ "allow_import": 0, "allow_rename": 0, "autoname": "field:standing_name", - "beta": 1, + "beta": 0, "creation": "2017-05-29 01:36:47.893639", "custom": 0, "docstatus": 0, @@ -385,7 +385,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-07-12 07:33:16.560273", + "modified": "2019-01-22 10:47:49.195421", "modified_by": "Administrator", "module": "Buying", "name": "Supplier Scorecard Standing", diff --git a/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.json b/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.json index d24484025c..d372905297 100644 --- a/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.json +++ b/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.json @@ -4,7 +4,7 @@ "allow_import": 0, "allow_rename": 0, "autoname": "field:variable_label", - "beta": 1, + "beta": 0, "creation": "2017-05-29 01:30:34.688389", "custom": 0, "docstatus": 0, @@ -101,7 +101,7 @@ "reqd": 1, "search_index": 0, "set_only_once": 0, - "unique": 0 + "unique": 1 }, { "allow_bulk_edit": 0, @@ -203,7 +203,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-07-12 07:33:31.395262", + "modified": "2019-01-23 09:39:59.866398", "modified_by": "Administrator", "module": "Buying", "name": "Supplier Scorecard Variable", diff --git a/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py b/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py index 17c911a000..37fdc5724f 100644 --- a/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +++ b/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py @@ -27,13 +27,6 @@ class SupplierScorecardVariable(Document): if not hasattr(sys.modules[__name__], self.path): frappe.throw(_("Could not find path for " + self.path), VariablePathNotFound) - -@frappe.whitelist() -def get_scoring_variable(variable_label): - variable = frappe.get_doc("Supplier Scorecard Variable", variable_label) - - return variable - def get_total_workdays(scorecard): """ Gets the number of days in this period""" delta = getdate(scorecard.end_date) - getdate(scorecard.start_date) From 57d7c837aa55ccd1812c0c29d805cfc6955ce49f Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Wed, 23 Jan 2019 14:26:35 +0530 Subject: [PATCH 32/86] fix: supplier scorecard test --- .../test_supplier_scorecard.py | 62 +------------------ 1 file changed, 2 insertions(+), 60 deletions(-) diff --git a/erpnext/buying/doctype/supplier_scorecard/test_supplier_scorecard.py b/erpnext/buying/doctype/supplier_scorecard/test_supplier_scorecard.py index d64d3f683f..6e6eaed95d 100644 --- a/erpnext/buying/doctype/supplier_scorecard/test_supplier_scorecard.py +++ b/erpnext/buying/doctype/supplier_scorecard/test_supplier_scorecard.py @@ -21,12 +21,6 @@ class TestSupplierScorecard(unittest.TestCase): d.weight = 0 self.assertRaises(frappe.ValidationError,my_doc.insert) - def test_missing_variable(self): - delete_test_scorecards() - my_doc = make_supplier_scorecard() - del my_doc.variables - self.assertRaises(frappe.ValidationError,my_doc.insert) - def make_supplier_scorecard(): my_doc = frappe.get_doc(valid_scorecard[0]) @@ -118,56 +112,6 @@ valid_scorecard = [ } ], "prevent_pos":0, - "variables": [ - { - "param_name":"cost_of_on_time_shipments", - "doctype":"Supplier Scorecard Scoring Variable", - "parenttype":"Supplier Scorecard", - "variable_label":"Cost of On Time Shipments", - "path":"get_cost_of_on_time_shipments", - "parentfield":"variables" - }, - { - "param_name":"tot_cost_shipments", - "doctype":"Supplier Scorecard Scoring Variable", - "parenttype":"Supplier Scorecard", - "variable_label":"Total Cost of Shipments", - "path":"get_total_cost_of_shipments", - "parentfield":"variables" - }, - { - "param_name":"tot_days_late", - "doctype":"Supplier Scorecard Scoring Variable", - "parenttype":"Supplier Scorecard", - "variable_label":"Total Days Late", - "path":"get_total_days_late", - "parentfield":"variables" - }, - { - "param_name":"total_working_days", - "doctype":"Supplier Scorecard Scoring Variable", - "parenttype":"Supplier Scorecard", - "variable_label":"Total Working Days", - "path":"get_total_workdays", - "parentfield":"variables" - }, - { - "param_name":"on_time_shipment_num", - "doctype":"Supplier Scorecard Scoring Variable", - "parenttype":"Supplier Scorecard", - "variable_label":"# of On Time Shipments", - "path":"get_on_time_shipments", - "parentfield":"variables" - }, - { - "param_name":"total_shipments", - "doctype":"Supplier Scorecard Scoring Variable", - "parenttype":"Supplier Scorecard", - "variable_label":"Total Shipments", - "path":"get_total_shipments", - "parentfield":"variables" - } - ], "period":"Per Month", "doctype":"Supplier Scorecard", "warn_pos":0, @@ -177,14 +121,12 @@ valid_scorecard = [ { "weight":100.0, "doctype":"Supplier Scorecard Scoring Criteria", - "formula":"(({cost_of_on_time_shipments} / {tot_cost_shipments}) if {tot_cost_shipments} > 0 else 1 )* 100 ", - "criteria_name":"Delivery", - "max_score":100.0, + "criteria_name":"Delivery" } ], "supplier":"_Test Supplier", "name":"_Test Supplier", - "weighting_function":"{total_score} * max( 0, min ( 1 , (12 - {period_number}) / 12) )", + "weighting_function":"{total_score} * max( 0, min ( 1 , (12 - {period_number}) / 12) )" } ] From 9aeabce3d3e1148dfdd43daa174f88cbaae22742 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Wed, 23 Jan 2019 16:01:19 +0530 Subject: [PATCH 33/86] fix: trailing whitespace, duplication & more --- .../supplier_scorecard.json | 1298 ++++++++--------- .../supplier_scorecard_criteria.py | 1 - .../supplier_scorecard_period.py | 45 +- .../supplier_scorecard_scoring_criteria.json | 466 +++--- 4 files changed, 898 insertions(+), 912 deletions(-) diff --git a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.json b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.json index 703ec3a0aa..95dc7518f6 100644 --- a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.json +++ b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.json @@ -1,700 +1,700 @@ { - "allow_copy": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "autoname": "field:supplier", - "beta": 0, - "creation": "2017-05-29 01:40:54.786555", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "", - "editable_grid": 1, - "engine": "InnoDB", + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "autoname": "field:supplier", + "beta": 0, + "creation": "2017-05-29 01:40:54.786555", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", "fields": [ { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "supplier", - "fieldtype": "Link", - "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": "Supplier", - "length": 0, - "no_copy": 0, - "options": "Supplier", - "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, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "supplier", + "fieldtype": "Link", + "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": "Supplier", + "length": 0, + "no_copy": 0, + "options": "Supplier", + "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, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "supplier_score", - "fieldtype": "Data", - "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": "Supplier Score", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "supplier_score", + "fieldtype": "Data", + "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": "Supplier Score", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "indicator_color", - "fieldtype": "Data", - "hidden": 1, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Indicator Color", - "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, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "indicator_color", + "fieldtype": "Data", + "hidden": 1, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Indicator Color", + "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, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "status", - "fieldtype": "Data", - "hidden": 1, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Status", - "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, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "status", + "fieldtype": "Data", + "hidden": 1, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Status", + "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, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "column_break_2", - "fieldtype": "Column Break", - "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, - "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, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_2", + "fieldtype": "Column Break", + "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, + "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, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "Per Month", - "fieldname": "period", - "fieldtype": "Select", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Evaluation Period", - "length": 0, - "no_copy": 0, - "options": "Per Week\nPer Month\nPer Year", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "Per Month", + "fieldname": "period", + "fieldtype": "Select", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Evaluation Period", + "length": 0, + "no_copy": 0, + "options": "Per Week\nPer Month\nPer Year", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 1, - "columns": 0, - "fieldname": "scoring_setup", - "fieldtype": "Section Break", - "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": "Scoring Setup", - "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, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 1, + "columns": 0, + "fieldname": "scoring_setup", + "fieldtype": "Section Break", + "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": "Scoring Setup", + "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, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "{total_score} * max( 0, min ( 1 , (12 - {period_number}) / 12) )", - "description": "Scorecard variables can be used, as well as:\n{total_score} (the total score from that period),\n{period_number} (the number of periods to present day)\n", - "fieldname": "weighting_function", - "fieldtype": "Small Text", - "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": "Weighting Function", - "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, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "{total_score} * max( 0, min ( 1 , (12 - {period_number}) / 12) )", + "description": "Scorecard variables can be used, as well as:\n{total_score} (the total score from that period),\n{period_number} (the number of periods to present day)\n", + "fieldname": "weighting_function", + "fieldtype": "Small Text", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 1, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Weighting Function", + "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, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "standings", - "fieldtype": "Table", - "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": "Scoring Standings", - "length": 0, - "no_copy": 0, - "options": "Supplier Scorecard Scoring Standing", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "standings", + "fieldtype": "Table", + "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": "Scoring Standings", + "length": 0, + "no_copy": 0, + "options": "Supplier Scorecard Scoring Standing", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 1, - "columns": 0, - "fieldname": "criteria_setup", - "fieldtype": "Section Break", - "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": "Criteria Setup", - "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, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 1, + "columns": 0, + "fieldname": "criteria_setup", + "fieldtype": "Section Break", + "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": "Criteria Setup", + "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, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "load_criteria", - "fieldtype": "Button", - "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": "Load All Criteria", - "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, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "load_criteria", + "fieldtype": "Button", + "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": "Load All Criteria", + "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, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "criteria", - "fieldtype": "Table", - "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": "Scoring Criteria", - "length": 0, - "no_copy": 0, - "options": "Supplier Scorecard Scoring Criteria", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "criteria", + "fieldtype": "Table", + "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": "Scoring Criteria", + "length": 0, + "no_copy": 0, + "options": "Supplier Scorecard Scoring Criteria", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 1, - "collapsible_depends_on": "eval: doc.status != 'Unknown'", - "columns": 0, - "fieldname": "scorecard_actions", - "fieldtype": "Section Break", - "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": "Scorecard Actions", - "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, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 1, + "collapsible_depends_on": "eval: doc.status != 'Unknown'", + "columns": 0, + "fieldname": "scorecard_actions", + "fieldtype": "Section Break", + "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": "Scorecard Actions", + "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, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "warn_rfqs", - "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": "Warn for new Request for Quotations", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "warn_rfqs", + "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": "Warn for new Request for Quotations", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "warn_pos", - "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": "Warn for new Purchase Orders", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "warn_pos", + "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": "Warn for new Purchase Orders", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "prevent_rfqs", - "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": "Prevent RFQs", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "prevent_rfqs", + "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": "Prevent RFQs", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "prevent_pos", - "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": "Prevent POs", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "prevent_pos", + "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": "Prevent POs", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "column_break_16", - "fieldtype": "Column Break", - "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, - "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, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_16", + "fieldtype": "Column Break", + "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, + "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, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "notify_supplier", - "fieldtype": "Check", - "hidden": 1, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Notify Supplier", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "notify_supplier", + "fieldtype": "Check", + "hidden": 1, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Notify Supplier", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "notify_employee", - "fieldtype": "Check", - "hidden": 1, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Notify Employee", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "notify_employee", + "fieldtype": "Check", + "hidden": 1, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Notify Employee", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "employee", - "fieldtype": "Link", - "hidden": 1, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Employee", - "length": 0, - "no_copy": 0, - "options": "Employee", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "employee", + "fieldtype": "Link", + "hidden": 1, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Employee", + "length": 0, + "no_copy": 0, + "options": "Employee", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, "unique": 0 } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2019-01-22 11:42:19.918990", - "modified_by": "Administrator", - "module": "Buying", - "name": "Supplier Scorecard", - "name_case": "", - "owner": "Administrator", + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2019-01-22 11:42:19.918990", + "modified_by": "Administrator", + "module": "Buying", + "name": "Supplier Scorecard", + "name_case": "", + "owner": "Administrator", "permissions": [ { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "set_user_permissions": 0, - "share": 1, - "submit": 0, + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "set_user_permissions": 0, + "share": 1, + "submit": 0, "write": 1 } - ], - "quick_entry": 0, - "read_only": 0, - "read_only_onload": 0, - "show_name_in_global_search": 0, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 0, + ], + "quick_entry": 0, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 0, "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py b/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py index b23d321a2a..33a0dc7837 100644 --- a/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +++ b/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py @@ -30,7 +30,6 @@ class SupplierScorecardCriteria(Document): for dummy2 in range(0, len(match.groups())): test_formula = test_formula.replace('{' + match.group(1) + '}', "0") - test_formula = test_formula.replace('<','<').replace('>','>') try: frappe.safe_eval(test_formula, None, {'max':max, 'min': min}) except Exception: diff --git a/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py b/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py index 4410431b54..15ba3f93ba 100644 --- a/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +++ b/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py @@ -40,22 +40,8 @@ class SupplierScorecardPeriod(Document): def calculate_criteria(self): for crit in self.criteria: - my_eval_statement = crit.formula.replace("\r", "").replace("\n", "") - - for var in self.variables: - if var.value: - if var.param_name in my_eval_statement: - my_eval_statement = my_eval_statement.replace('{' + var.param_name + '}', "{:.2f}".format(var.value)) - else: - if var.param_name in my_eval_statement: - my_eval_statement = my_eval_statement.replace('{' + var.param_name + '}', '0.0') - - #frappe.msgprint(my_eval_statement ) - - my_eval_statement = my_eval_statement.replace('<','<').replace('>','>') - try: - crit.score = min(crit.max_score, max( 0 ,frappe.safe_eval(my_eval_statement, None, {'max':max, 'min': min}))) + crit.score = min(crit.max_score, max( 0 ,frappe.safe_eval(self.get_eval_statement(crit.formula), None, {'max':max, 'min': min}))) except Exception: frappe.throw(_("Could not solve criteria score function for {0}. Make sure the formula is valid.".format(crit.criteria_name)),frappe.ValidationError) crit.score = 0 @@ -67,26 +53,27 @@ class SupplierScorecardPeriod(Document): self.total_score = myscore def calculate_weighted_score(self, weighing_function): - my_eval_statement = weighing_function.replace("\r", "").replace("\n", "") - - for var in self.variables: - if var.value: - if var.param_name in my_eval_statement: - my_eval_statement = my_eval_statement.replace('{' + var.param_name + '}', "{:.2f}".format(var.value)) - else: - if var.param_name in my_eval_statement: - my_eval_statement = my_eval_statement.replace('{' + var.param_name + '}', '0.0') - - my_eval_statement = my_eval_statement.replace('<','<').replace('>','>') - try: - weighed_score = frappe.safe_eval(my_eval_statement, None, {'max':max, 'min': min}) + weighed_score = frappe.safe_eval(self.get_eval_statement(weighing_function), None, {'max':max, 'min': min}) except Exception: frappe.throw(_("Could not solve weighted score function. Make sure the formula is valid."),frappe.ValidationError) weighed_score = 0 return weighed_score + def get_eval_statement(self, input): + my_eval_statement = input.replace("\r", "").replace("\n", "") + + for var in self.variables: + if var.value: + if var.param_name in my_eval_statement: + my_eval_statement = my_eval_statement.replace('{' + var.param_name + '}', "{:.2f}".format(var.value)) + else: + if var.param_name in my_eval_statement: + my_eval_statement = my_eval_statement.replace('{' + var.param_name + '}', '0.0') + + return my_eval_statement + def import_string_path(path): components = path.split('.') @@ -108,7 +95,7 @@ def make_supplier_scorecard(source_name, target_doc=None): for var in get_variables(cr.criteria_name): if var not in variables: variables.append(var) - + target.extend('variables', variables) doc = get_mapped_doc("Supplier Scorecard", source_name, { diff --git a/erpnext/buying/doctype/supplier_scorecard_scoring_criteria/supplier_scorecard_scoring_criteria.json b/erpnext/buying/doctype/supplier_scorecard_scoring_criteria/supplier_scorecard_scoring_criteria.json index 5816856521..55ed45e320 100644 --- a/erpnext/buying/doctype/supplier_scorecard_scoring_criteria/supplier_scorecard_scoring_criteria.json +++ b/erpnext/buying/doctype/supplier_scorecard_scoring_criteria/supplier_scorecard_scoring_criteria.json @@ -1,252 +1,252 @@ { - "allow_copy": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "beta": 0, - "creation": "2017-05-29 01:32:17.988454", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "", - "editable_grid": 1, - "engine": "InnoDB", + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 0, + "creation": "2017-05-29 01:32:17.988454", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", "fields": [ { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 5, - "fieldname": "criteria_name", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Criteria Name", - "length": 0, - "no_copy": 0, - "options": "Supplier Scorecard Criteria", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 5, + "fieldname": "criteria_name", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Criteria Name", + "length": 0, + "no_copy": 0, + "options": "Supplier Scorecard Criteria", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 2, - "fieldname": "score", - "fieldtype": "Percent", - "hidden": 1, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Score", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 2, + "fieldname": "score", + "fieldtype": "Percent", + "hidden": 1, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Score", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "column_break_4", - "fieldtype": "Column Break", - "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, - "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, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_4", + "fieldtype": "Column Break", + "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, + "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, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 2, - "fieldname": "weight", - "fieldtype": "Percent", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Criteria Weight", - "length": 0, - "no_copy": 0, - "options": "", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 2, + "fieldname": "weight", + "fieldtype": "Percent", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Criteria Weight", + "length": 0, + "no_copy": 0, + "options": "", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "100", - "fieldname": "max_score", - "fieldtype": "Float", - "hidden": 1, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Max Score", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "100", + "fieldname": "max_score", + "fieldtype": "Float", + "hidden": 1, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Max Score", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "section_break_6", - "fieldtype": "Section Break", - "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, - "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, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_6", + "fieldtype": "Section Break", + "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, + "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, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "formula", - "fieldtype": "Small Text", - "hidden": 1, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Criteria Formula", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "formula", + "fieldtype": "Small Text", + "hidden": 1, + "ignore_user_permissions": 0, + "ignore_xss_filter": 1, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Criteria Formula", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, "unique": 0 } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 1, - "max_attachments": 0, - "modified": "2019-01-23 13:49:13.350095", - "modified_by": "Administrator", - "module": "Buying", - "name": "Supplier Scorecard Scoring Criteria", - "name_case": "", - "owner": "Administrator", - "permissions": [], - "quick_entry": 1, - "read_only": 0, - "read_only_onload": 0, - "show_name_in_global_search": 0, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1, + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2019-01-23 13:49:13.350095", + "modified_by": "Administrator", + "module": "Buying", + "name": "Supplier Scorecard Scoring Criteria", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, "track_seen": 0 } \ No newline at end of file From 853d3fd1ab6e03cc1fd50429ea2d4139d1d15c77 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 23 Jan 2019 16:34:22 +0530 Subject: [PATCH 34/86] fix: Don't use .format in jinja templates - Jinja doesn't allow unicode strings to be formatted in templates --- erpnext/templates/includes/cart/cart_items.html | 5 ++--- erpnext/templates/pages/order.html | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/erpnext/templates/includes/cart/cart_items.html b/erpnext/templates/includes/cart/cart_items.html index b2e68585a7..65b81d9320 100644 --- a/erpnext/templates/includes/cart/cart_items.html +++ b/erpnext/templates/includes/cart/cart_items.html @@ -21,12 +21,11 @@ + - +
    {{ d.get_formatted("amount") }} -

    {{ - _("Rate: {0}").format(d.get_formatted("rate")) }}

    +

    {{ _("Rate") }} {{ d.get_formatted("rate") }}

    {% endfor %} \ No newline at end of file diff --git a/erpnext/templates/pages/order.html b/erpnext/templates/pages/order.html index 74c9da0012..64fd32a992 100644 --- a/erpnext/templates/pages/order.html +++ b/erpnext/templates/pages/order.html @@ -73,14 +73,12 @@
    {{ d.qty }} {% if d.delivered_qty is defined and d.delivered_qty != None %} -

    {{ - _("Delivered: {0}").format(d.delivered_qty) }}

    +

    {{ _("Delivered") }} {{ d.delivered_qty }}

    {% endif %}
    {{ d.get_formatted("amount") }} -

    {{ - _("@ {0}").format(d.get_formatted("rate")) }}

    +

    {{ _("Rate:") }} {{ d.get_formatted("rate") }}

    {% endfor %} From f51661b225d0fe007901f098d2d80cb5d0b88965 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Wed, 23 Jan 2019 16:42:28 +0530 Subject: [PATCH 35/86] fix: allow operators, make weighting_function mandatory --- .../supplier_scorecard.json | 2 +- erpnext/patches.txt | 3 ++- .../allow_operators_in_supplier_scorecard.py | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 erpnext/patches/v10_0/allow_operators_in_supplier_scorecard.py diff --git a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.json b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.json index 95dc7518f6..6a077e9c35 100644 --- a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.json +++ b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.json @@ -252,7 +252,7 @@ "read_only": 0, "remember_last_selected_value": 0, "report_hide": 0, - "reqd": 0, + "reqd": 1, "search_index": 0, "set_only_once": 0, "unique": 0 diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 9d5b331123..d34a3fb87d 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -507,4 +507,5 @@ erpnext.patches.v10_0.set_discount_amount erpnext.patches.v10_0.recalculate_gross_margin_for_project erpnext.patches.v10_0.delete_hub_documents erpnext.patches.v10_0.update_user_image_in_employee -erpnext.patches.v10_0.repost_gle_for_purchase_receipts_with_rejected_items \ No newline at end of file +erpnext.patches.v10_0.repost_gle_for_purchase_receipts_with_rejected_items +erpnext.patches.v10_0.allow_operators_in_supplier_scorecard \ No newline at end of file diff --git a/erpnext/patches/v10_0/allow_operators_in_supplier_scorecard.py b/erpnext/patches/v10_0/allow_operators_in_supplier_scorecard.py new file mode 100644 index 0000000000..27478f3ad5 --- /dev/null +++ b/erpnext/patches/v10_0/allow_operators_in_supplier_scorecard.py @@ -0,0 +1,19 @@ +# Copyright (c) 2019, Frappe and Contributors +# License: GNU General Public License v3. See license.txt + +from __future__ import unicode_literals +import frappe + +def execute(): + for criteria in frappe.get_all('Supplier Scorecard Criteria', fields=['name', 'formula'], limit_page_length=None): + frappe.db.set_value('Supplier Scorecard Criteria', criteria.name, + 'formula', criteria.formula.replace('<','<').replace('>','>')) + + for criteria in frappe.get_all('Supplier Scorecard Scoring Criteria', fields=['name', 'formula'], limit_page_length=None): + if criteria.formula: # not mandatory + frappe.db.set_value('Supplier Scorecard Scoring Criteria', criteria.name, + 'formula', criteria.formula.replace('<','<').replace('>','>')) + + for sc in frappe.get_all('Supplier Scorecard', fields=['name', 'weighting_function'], limit_page_length=None): + frappe.db.set_value('Supplier Scorecard', sc.name, 'weighting_function', + sc.weighting_function.replace('<','<').replace('>','>')) \ No newline at end of file From e9778d9556d37dd89c00c4c0a8de802fc112551f Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Wed, 23 Jan 2019 16:58:42 +0530 Subject: [PATCH 36/86] fix: do not use built-in "input", reload_doc --- .../supplier_scorecard_period/supplier_scorecard_period.py | 4 ++-- .../patches/v10_0/allow_operators_in_supplier_scorecard.py | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py b/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py index 15ba3f93ba..737ddd6ddd 100644 --- a/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +++ b/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py @@ -61,8 +61,8 @@ class SupplierScorecardPeriod(Document): return weighed_score - def get_eval_statement(self, input): - my_eval_statement = input.replace("\r", "").replace("\n", "") + def get_eval_statement(self, formula): + my_eval_statement = formula.replace("\r", "").replace("\n", "") for var in self.variables: if var.value: diff --git a/erpnext/patches/v10_0/allow_operators_in_supplier_scorecard.py b/erpnext/patches/v10_0/allow_operators_in_supplier_scorecard.py index 27478f3ad5..827f9bc94f 100644 --- a/erpnext/patches/v10_0/allow_operators_in_supplier_scorecard.py +++ b/erpnext/patches/v10_0/allow_operators_in_supplier_scorecard.py @@ -5,6 +5,10 @@ from __future__ import unicode_literals import frappe def execute(): + frappe.reload_doc('buying', 'doctype', 'supplier_scorecard_criteria') + frappe.reload_doc('buying', 'doctype', 'supplier_scorecard_scoring_criteria') + frappe.reload_doc('buying', 'doctype', 'supplier_scorecard') + for criteria in frappe.get_all('Supplier Scorecard Criteria', fields=['name', 'formula'], limit_page_length=None): frappe.db.set_value('Supplier Scorecard Criteria', criteria.name, 'formula', criteria.formula.replace('<','<').replace('>','>')) From 19ab86a3a7345eb986e2553c78f7bc92d3f1578f Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Wed, 23 Jan 2019 17:28:13 +0530 Subject: [PATCH 37/86] fix:(cost_center): fix for update cost center number --- erpnext/accounts/doctype/cost_center/cost_center.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/cost_center/cost_center.js b/erpnext/accounts/doctype/cost_center/cost_center.js index 8f3ae194da..3df4da52ef 100644 --- a/erpnext/accounts/doctype/cost_center/cost_center.js +++ b/erpnext/accounts/doctype/cost_center/cost_center.js @@ -46,7 +46,7 @@ frappe.ui.form.on('Cost Center', { doctype_name: frm.doc.doctype, name: frm.doc.name, field_name: d.fields[0].fieldname, - field_value: data.cost_center_number, + number_value: data.cost_center_number, company: frm.doc.company }, callback: function(r) { From c16c7fffb4640822259adc51ee1b651ba2ca7632 Mon Sep 17 00:00:00 2001 From: pipeCh Date: Thu, 24 Jan 2019 15:00:07 +0700 Subject: [PATCH 38/86] fixed for "Select Serial Numbers" dialog won't fill mandatory field --- erpnext/public/js/utils/serial_no_batch_selector.js | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/public/js/utils/serial_no_batch_selector.js b/erpnext/public/js/utils/serial_no_batch_selector.js index eabb81ed02..b94cdd8c4c 100644 --- a/erpnext/public/js/utils/serial_no_batch_selector.js +++ b/erpnext/public/js/utils/serial_no_batch_selector.js @@ -208,6 +208,7 @@ erpnext.SerialNoBatchSelector = Class.extend({ map_row_values: function(row, values, number, qty_field, warehouse) { row.qty = values[qty_field]; + row.transfer_qty = flt(values[qty_field]) * flt(row.conversion_factor); row[number] = values[number]; if(this.warehouse_details.type === 'Source Warehouse') { row.s_warehouse = values.warehouse || warehouse; From c1658382280e2377bee7899bcb6a9f769756e84c Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 24 Jan 2019 15:45:46 +0530 Subject: [PATCH 39/86] Filter bin list based on warehouses that are accessible to the user --- erpnext/stock/dashboard/item_dashboard.py | 56 ++++++++++------------- 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/erpnext/stock/dashboard/item_dashboard.py b/erpnext/stock/dashboard/item_dashboard.py index f95daafd38..8762920c6e 100644 --- a/erpnext/stock/dashboard/item_dashboard.py +++ b/erpnext/stock/dashboard/item_dashboard.py @@ -1,43 +1,37 @@ from __future__ import unicode_literals import frappe +from frappe.model.db_query import DatabaseQuery @frappe.whitelist() def get_data(item_code=None, warehouse=None, item_group=None, start=0, sort_by='actual_qty', sort_order='desc'): '''Return data to render the item dashboard''' - conditions = [] - values = [] + filters = [] if item_code: - conditions.append('b.item_code=%s') - values.append(item_code) + filters.append(['item_code', '=', item_code]) if warehouse: - conditions.append('b.warehouse=%s') - values.append(warehouse) + filters.append(['warehouse', '=', warehouse]) if item_group: - conditions.append('i.item_group=%s') - values.append(item_group) + filters.append(['item_group', '=', item_group]) + try: + # check if user has any restrictions based on user permissions on warehouse + if DatabaseQuery('Warehouse', user=frappe.session.user).build_match_conditions(): + filters.append(['warehouse', 'in', [w.name for w in frappe.get_list('Warehouse')]]) + except frappe.PermissionError: + # user does not have access to warehouse + return [] - if conditions: - conditions = ' and ' + ' and '.join(conditions) - else: - conditions = '' - - return frappe.db.sql(''' - select - b.item_code, b.warehouse, b.projected_qty, b.reserved_qty, - b.reserved_qty_for_production, b.reserved_qty_for_sub_contract, b.actual_qty, b.valuation_rate, i.item_name - from - tabBin b, tabItem i - where - b.item_code = i.name - and - (b.projected_qty != 0 or b.reserved_qty != 0 or b.reserved_qty_for_production != 0 - or b.reserved_qty_for_sub_contract != 0 or b.actual_qty != 0) - {conditions} - order by - {sort_by} {sort_order} - limit - {start}, 21 - '''.format(conditions=conditions, sort_by=sort_by, sort_order=sort_order, - start=start), values, as_dict=True) + return frappe.db.get_all('Bin', fields=['item_code', 'warehouse', 'projected_qty', + 'reserved_qty', 'reserved_qty_for_sub_contract', 'actual_qty', 'valuation_rate'], + or_filters={ + 'projected_qty': ['!=', 0], + 'reserved_qty': ['!=', 0], + 'reserved_qty_for_production': ['!=', 0], + 'reserved_qty_for_sub_contract': ['!=', 0], + 'actual_qty': ['!=', 0], + }, + filters=filters, + order_by=sort_by + ' ' + sort_order, + limit_start=start, + limit_page_length='21') \ No newline at end of file From dd0496f7aae119de4bfa1586e0a3d08c7da5b71a Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 24 Jan 2019 16:18:43 +0530 Subject: [PATCH 40/86] Add missed out field field --- erpnext/stock/dashboard/item_dashboard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/dashboard/item_dashboard.py b/erpnext/stock/dashboard/item_dashboard.py index 8762920c6e..6667317bf0 100644 --- a/erpnext/stock/dashboard/item_dashboard.py +++ b/erpnext/stock/dashboard/item_dashboard.py @@ -23,7 +23,7 @@ def get_data(item_code=None, warehouse=None, item_group=None, return [] return frappe.db.get_all('Bin', fields=['item_code', 'warehouse', 'projected_qty', - 'reserved_qty', 'reserved_qty_for_sub_contract', 'actual_qty', 'valuation_rate'], + 'reserved_qty', 'reserved_qty_for_production', 'reserved_qty_for_sub_contract', 'actual_qty', 'valuation_rate'], or_filters={ 'projected_qty': ['!=', 0], 'reserved_qty': ['!=', 0], From 7a45887fa192be2d3293777be252e8b0ac139375 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 24 Jan 2019 16:26:48 +0530 Subject: [PATCH 41/86] fix typo --- erpnext/stock/dashboard/item_dashboard.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/dashboard/item_dashboard.py b/erpnext/stock/dashboard/item_dashboard.py index 6667317bf0..d817e5ff2d 100644 --- a/erpnext/stock/dashboard/item_dashboard.py +++ b/erpnext/stock/dashboard/item_dashboard.py @@ -19,7 +19,7 @@ def get_data(item_code=None, warehouse=None, item_group=None, if DatabaseQuery('Warehouse', user=frappe.session.user).build_match_conditions(): filters.append(['warehouse', 'in', [w.name for w in frappe.get_list('Warehouse')]]) except frappe.PermissionError: - # user does not have access to warehouse + # user does not have access on warehouse return [] return frappe.db.get_all('Bin', fields=['item_code', 'warehouse', 'projected_qty', @@ -34,4 +34,4 @@ def get_data(item_code=None, warehouse=None, item_group=None, filters=filters, order_by=sort_by + ' ' + sort_order, limit_start=start, - limit_page_length='21') \ No newline at end of file + limit_page_length='21') From badf1c42e043cc7f2962bbad0a817123dd6900b1 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 24 Jan 2019 16:28:53 +0530 Subject: [PATCH 42/86] chore: Add error logging for failed get_exchange_rate call --- erpnext/setup/utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/setup/utils.py b/erpnext/setup/utils.py index 0216c3ba69..01e0b7d441 100644 --- a/erpnext/setup/utils.py +++ b/erpnext/setup/utils.py @@ -109,6 +109,7 @@ def get_exchange_rate(from_currency, to_currency, transaction_date=None, args=No cache.setex(key, value, 6 * 60 * 60) return flt(value) except: + frappe.log_error(title="Get Exchange Rate") frappe.msgprint(_("Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually").format(from_currency, to_currency, transaction_date)) return 0.0 From d6f837c5e5249f120990ecfc65848822e8c8bc7c Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 24 Jan 2019 17:10:33 +0530 Subject: [PATCH 43/86] fix: Dont show 0 amount taxes and tax breakup --- .../print_format/gst_pos_invoice/gst_pos_invoice.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/print_format/gst_pos_invoice/gst_pos_invoice.json b/erpnext/accounts/print_format/gst_pos_invoice/gst_pos_invoice.json index 33af3135dd..8a313688b9 100644 --- a/erpnext/accounts/print_format/gst_pos_invoice/gst_pos_invoice.json +++ b/erpnext/accounts/print_format/gst_pos_invoice/gst_pos_invoice.json @@ -7,10 +7,10 @@ "docstatus": 0, "doctype": "Print Format", "font": "Default", - "html": "\n\n

    \n\t{{ doc.company }}
    \n\t{% if doc.company_address_display %}\n\t\t{% set company_address = doc.company_address_display.replace(\"\\n\", \" \").replace(\"
    \", \" \") %}\n\t\t{% if \"GSTIN\" not in company_address %}\n\t\t\t{{ company_address }}\n\t\t\t{{ _(\"GSTIN\") }}:{{ doc.company_gstin }}\n\t\t{% else %}\n\t\t\t{{ company_address.replace(\"GSTIN\", \"
    GSTIN\") }}\n\t\t{% endif %}\n\t{% endif %}\n\t
    \n\t{% if doc.docstatus == 0 %}\n\t\t{{ doc.status + \" \"+ (doc.select_print_heading or _(\"Invoice\")) }}
    \n\t{% else %}\n\t\t{{ doc.select_print_heading or _(\"Invoice\") }}
    \n\t{% endif %}\n

    \n

    \n\t{{ _(\"Receipt No\") }}: {{ doc.name }}
    \n\t{{ _(\"Date\") }}: {{ doc.get_formatted(\"posting_date\") }}
    \n\t{% if doc.grand_total > 50000 %}\n\t\t{% set customer_address = doc.address_display.replace(\"\\n\", \" \").replace(\"
    \", \" \") %}\n\t\t{{ _(\"Customer\") }}:
    \n\t\t{{ doc.customer_name }}
    \n\t\t{{ customer_address }}\n\t{% endif %}\n

    \n\n
    \n\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\n\t\n\t\t{%- for item in doc.items -%}\n\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t{%- endfor -%}\n\t\n
    {{ _(\"Item\") }}{{ _(\"Qty\") }}{{ _(\"Amount\") }}
    \n\t\t\t\t{{ item.item_code }}\n\t\t\t\t{%- if item.item_name != item.item_code -%}\n\t\t\t\t\t
    {{ item.item_name }}\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- if item.gst_hsn_code -%}\n\t\t\t\t\t
    {{ _(\"HSN/SAC\") }}: {{ item.gst_hsn_code }}\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- if item.serial_no -%}\n\t\t\t\t\t
    {{ _(\"Serial No\") }}: {{ item.serial_no }}\n\t\t\t\t{%- endif -%}\n\t\t\t    		{{ item.qty }}
    @ {{ item.rate }}    		{{ item.get_formatted(\"amount\") }}
    \n\n\t\n\t\t\n\t\t\t{% if doc.flags.show_inclusive_tax_in_print %}\n\t\t\t\t\n\t\t\t\t\n\t\t\t{% else %}\n\t\t\t\t\n\t\t\t\t\n\t\t\t{% endif %}\n\t\t\n\t\t{%- for row in doc.taxes -%}\n\t\t {%- if not row.included_in_print_rate or doc.flags.show_inclusive_tax_in_print -%}\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t {%- endif -%}\n\t\t{%- endfor -%}\n\t\t{%- if doc.discount_amount -%}\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t{%- endif -%}\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t{%- if doc.rounded_total -%}\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t{%- endif -%}\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t{%- if doc.change_amount -%}\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t{%- endif -%}\n\t\n
    \n\t\t\t\t\t{{ _(\"Total Excl. Tax\") }}\n\t\t\t\t\n\t\t\t\t\t{{ doc.get_formatted(\"net_total\", doc) }}\n\t\t\t\t\n\t\t\t\t\t{{ _(\"Total\") }}\n\t\t\t\t\n\t\t\t\t\t{{ doc.get_formatted(\"total\", doc) }}\n\t\t\t\t
    \n\t\t\t\t\t{{ row.description }}\n\t\t\t\t\n\t\t\t\t\t{{ row.get_formatted(\"tax_amount\", doc) }}\n\t\t\t\t
    \n\t\t\t\t{{ _(\"Discount\") }}\n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"discount_amount\") }}\n\t\t\t
    \n\t\t\t\t{{ _(\"Grand Total\") }}\n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"grand_total\") }}\n\t\t\t
    \n\t\t\t\t{{ _(\"Rounded Total\") }}\n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"rounded_total\") }}\n\t\t\t
    \n\t\t\t\t{{ _(\"Paid Amount\") }}\n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"paid_amount\") }}\n\t\t\t
    \n\t\t\t\t{{ _(\"Change Amount\") }}\n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"change_amount\") }}\n\t\t\t
    \n

    Tax Breakup:

    \n
    \n\t{{ doc.other_charges_calculation }}\n
    \n

    {{ doc.terms or \"\" }}

    \n

    {{ _(\"Thank you, please visit again.\") }}

    ", + "html": "\n\n

    \n\t{{ doc.company }}
    \n\t{% if doc.company_address_display %}\n\t\t{% set company_address = doc.company_address_display.replace(\"\\n\", \" \").replace(\"
    \", \" \") %}\n\t\t{% if \"GSTIN\" not in company_address %}\n\t\t\t{{ company_address }}\n\t\t\t{{ _(\"GSTIN\") }}:{{ doc.company_gstin }}\n\t\t{% else %}\n\t\t\t{{ company_address.replace(\"GSTIN\", \"
    GSTIN\") }}\n\t\t{% endif %}\n\t{% endif %}\n\t
    \n\t{% if doc.docstatus == 0 %}\n\t\t{{ doc.status + \" \"+ (doc.select_print_heading or _(\"Invoice\")) }}
    \n\t{% else %}\n\t\t{{ doc.select_print_heading or _(\"Invoice\") }}
    \n\t{% endif %}\n

    \n

    \n\t{{ _(\"Receipt No\") }}: {{ doc.name }}
    \n\t{{ _(\"Date\") }}: {{ doc.get_formatted(\"posting_date\") }}
    \n\t{% if doc.grand_total > 50000 %}\n\t\t{% set customer_address = doc.address_display.replace(\"\\n\", \" \").replace(\"
    \", \" \") %}\n\t\t{{ _(\"Customer\") }}:
    \n\t\t{{ doc.customer_name }}
    \n\t\t{{ customer_address }}\n\t{% endif %}\n

    \n\n
    \n\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\n\t\n\t\t{%- for item in doc.items -%}\n\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t{%- endfor -%}\n\t\n
    {{ _(\"Item\") }}{{ _(\"Qty\") }}{{ _(\"Amount\") }}
    \n\t\t\t\t{{ item.item_code }}\n\t\t\t\t{%- if item.item_name != item.item_code -%}\n\t\t\t\t\t
    {{ item.item_name }}\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- if item.gst_hsn_code -%}\n\t\t\t\t\t
    {{ _(\"HSN/SAC\") }}: {{ item.gst_hsn_code }}\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- if item.serial_no -%}\n\t\t\t\t\t
    {{ _(\"Serial No\") }}: {{ item.serial_no }}\n\t\t\t\t{%- endif -%}\n\t\t\t    		{{ item.qty }}
    @ {{ item.rate }}    		{{ item.get_formatted(\"amount\") }}
    \n\n\t\n\t\t\n\t\t\t{% if doc.flags.show_inclusive_tax_in_print %}\n\t\t\t\t\n\t\t\t\t\n\t\t\t{% else %}\n\t\t\t\t\n\t\t\t\t\n\t\t\t{% endif %}\n\t\t\n\t\t{%- for row in doc.taxes -%}\n\t\t {%- if (not row.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) and row.tax_amount != 0 -%}\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t {%- endif -%}\n\t\t{%- endfor -%}\n\t\t{%- if doc.discount_amount -%}\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t{%- endif -%}\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t{%- if doc.rounded_total -%}\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t{%- endif -%}\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t{%- if doc.change_amount -%}\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t{%- endif -%}\n\t\n
    \n\t\t\t\t\t{{ _(\"Total Excl. Tax\") }}\n\t\t\t\t\n\t\t\t\t\t{{ doc.get_formatted(\"net_total\", doc) }}\n\t\t\t\t\n\t\t\t\t\t{{ _(\"Total\") }}\n\t\t\t\t\n\t\t\t\t\t{{ doc.get_formatted(\"total\", doc) }}\n\t\t\t\t
    \n\t\t\t\t\t{{ row.description }}\n\t\t\t\t\n\t\t\t\t\t{{ row.get_formatted(\"tax_amount\", doc) }}\n\t\t\t\t
    \n\t\t\t\t{{ _(\"Discount\") }}\n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"discount_amount\") }}\n\t\t\t
    \n\t\t\t\t{{ _(\"Grand Total\") }}\n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"grand_total\") }}\n\t\t\t
    \n\t\t\t\t{{ _(\"Rounded Total\") }}\n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"rounded_total\") }}\n\t\t\t
    \n\t\t\t\t{{ _(\"Paid Amount\") }}\n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"paid_amount\") }}\n\t\t\t
    \n\t\t\t\t{{ _(\"Change Amount\") }}\n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"change_amount\") }}\n\t\t\t
    \n

    {{ doc.terms or \"\" }}

    \n

    {{ _(\"Thank you, please visit again.\") }}

    ", "idx": 0, "line_breaks": 0, - "modified": "2018-03-20 14:24:08.167930", + "modified": "2019-01-24 17:09:27.190929", "modified_by": "Administrator", "module": "Accounts", "name": "GST POS Invoice", From c48efaba6e0cdea0c42340bd086b5cf38f8c41c8 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Thu, 24 Jan 2019 17:15:38 +0530 Subject: [PATCH 44/86] fix(sales_invoice): fetch customer price list if available before pos profile price list --- .../doctype/sales_invoice/sales_invoice.js | 4 ++++ .../doctype/sales_invoice/sales_invoice.py | 7 ++++++- erpnext/accounts/party.py | 20 ++++++++++++++----- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index 91a44b377d..8911ddf464 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -217,6 +217,9 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte this.get_terms(); }, customer: function() { + if (this.frm.doc.is_pos){ + var pos_profile = this.frm.doc.pos_profile; + } var me = this; if(this.frm.updating_party_details) return; erpnext.utils.get_party_details(this.frm, @@ -226,6 +229,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte party_type: "Customer", account: this.frm.doc.debit_to, price_list: this.frm.doc.selling_price_list, + pos_profile: pos_profile }, function() { me.apply_pricing_rule(); }); diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 6072fb895c..895ca07da2 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -398,11 +398,16 @@ class SalesInvoice(SellingController): self.account_for_change_amount = pos.get('account_for_change_amount') for fieldname in ('territory', 'naming_series', 'currency', 'taxes_and_charges', 'letter_head', 'tc_name', - 'selling_price_list', 'company', 'select_print_heading', 'cash_bank_account', 'company_address', + 'company', 'select_print_heading', 'cash_bank_account', 'company_address', 'write_off_account', 'write_off_cost_center', 'apply_discount_on'): if (not for_validate) or (for_validate and not self.get(fieldname)): self.set(fieldname, pos.get(fieldname)) + customer_price_list = frappe.get_value("Customer", self.customer, 'default_price_list') + + if not customer_price_list: + self.set('selling_price_list', pos.get('selling_price_list')) + if not for_validate: self.update_stock = cint(pos.get("update_stock")) diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py index 1e1f8b5b83..c0a44d1c02 100644 --- a/erpnext/accounts/party.py +++ b/erpnext/accounts/party.py @@ -22,18 +22,20 @@ class DuplicatePartyAccountError(frappe.ValidationError): pass @frappe.whitelist() def get_party_details(party=None, account=None, party_type="Customer", company=None, posting_date=None, - bill_date=None, price_list=None, currency=None, doctype=None, ignore_permissions=False, fetch_payment_terms_template=True, party_address=None, shipping_address=None): + bill_date=None, price_list=None, currency=None, doctype=None, ignore_permissions=False, fetch_payment_terms_template=True, + party_address=None, shipping_address=None, pos_profile=None): 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, bill_date, price_list, currency, doctype, ignore_permissions, fetch_payment_terms_template, party_address, shipping_address) + company, posting_date, bill_date, price_list, currency, doctype, ignore_permissions, + fetch_payment_terms_template, party_address, shipping_address, pos_profile) def _get_party_details(party=None, account=None, party_type="Customer", company=None, posting_date=None, bill_date=None, price_list=None, currency=None, doctype=None, ignore_permissions=False, - fetch_payment_terms_template=True, party_address=None, shipping_address=None): + fetch_payment_terms_template=True, party_address=None, shipping_address=None, pos_profile=None): out = frappe._dict(set_account_and_due_date(party, account, party_type, company, posting_date, bill_date, doctype)) party = out[party_type.lower()] @@ -49,7 +51,7 @@ def _get_party_details(party=None, account=None, party_type="Customer", company= set_address_details(out, party, party_type, doctype, company, party_address, shipping_address) set_contact_details(out, party, party_type) set_other_values(out, party, party_type) - set_price_list(out, party, party_type, price_list) + set_price_list(out, party, party_type, price_list, pos_profile) out["taxes_and_charges"] = set_taxes(party.name, party_type, posting_date, company, out.customer_group, out.supplier_type) @@ -149,12 +151,20 @@ def get_default_price_list(party): return None -def set_price_list(out, party, party_type, given_price_list): +def set_price_list(out, party, party_type, given_price_list, pos=None): # price list price_list = get_permitted_documents('Price List') if price_list: price_list = price_list[0] + elif pos and party_type == 'Customer': + customer_price_list = frappe.get_value('Customer', party.name, 'default_price_list') + + if customer_price_list: + price_list = customer_price_list + else: + pos_price_list = frappe.get_value('Pos Profile', pos, 'selling_price_list') + price_list = pos_price_list else: price_list = get_default_price_list(party) or given_price_list From 49b41e49aedffe8af4eeb83adee0d2cc7a95c423 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 24 Jan 2019 17:55:44 +0530 Subject: [PATCH 45/86] fix: Added permissions in GST Settings and added filters for accounts based on company --- erpnext/patches.txt | 3 ++- .../v11_0/add_permissions_in_gst_settings.py | 12 ++++++++++++ .../doctype/gst_settings/gst_settings.js | 18 ++++++++++++++++++ erpnext/regional/india/setup.py | 5 ++++- 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 erpnext/patches/v11_0/add_permissions_in_gst_settings.py diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 69ad5d1d74..1544f99429 100755 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -581,4 +581,5 @@ erpnext.patches.v10_0.repost_gle_for_purchase_receipts_with_rejected_items erpnext.patches.v11_0.set_missing_gst_hsn_code erpnext.patches.v11_0.rename_bom_wo_fields erpnext.patches.v11_0.rename_additional_salary_component_additional_salary -erpnext.patches.v11_0.renamed_from_to_fields_in_project \ No newline at end of file +erpnext.patches.v11_0.renamed_from_to_fields_in_project +erpnext.patches.v11_0.add_permissions_in_gst_settings \ No newline at end of file diff --git a/erpnext/patches/v11_0/add_permissions_in_gst_settings.py b/erpnext/patches/v11_0/add_permissions_in_gst_settings.py new file mode 100644 index 0000000000..e8fcf33bed --- /dev/null +++ b/erpnext/patches/v11_0/add_permissions_in_gst_settings.py @@ -0,0 +1,12 @@ +import frappe +from frappe.permissions import add_permission, update_permission_property + +def execute(): + company = frappe.get_all('Company', filters = {'country': 'India'}) + if not company: + return + + for doctype in ('GST HSN Code', 'GST Settings'): + add_permission(doctype, 'Accounts Manager', 0) + update_permission_property(doctype, 'Accounts Manager', 0, 'write', 1) + update_permission_property(doctype, 'Accounts Manager', 0, 'create', 1) \ No newline at end of file diff --git a/erpnext/regional/doctype/gst_settings/gst_settings.js b/erpnext/regional/doctype/gst_settings/gst_settings.js index ab2358ff05..808f9bc078 100644 --- a/erpnext/regional/doctype/gst_settings/gst_settings.js +++ b/erpnext/regional/doctype/gst_settings/gst_settings.js @@ -21,5 +21,23 @@ frappe.ui.form.on('GST Settings', { ` ); + }, + + setup: function(frm) { + $.each(["cgst_account", "sgst_account", "igst_account", "cess_account"], function(i, field) { + frm.events.filter_accounts(frm, field); + }); + }, + + filter_accounts: function(frm, account_field) { + frm.set_query(account_field, "gst_accounts", function(doc, cdt, cdn) { + var row = locals[cdt][cdn]; + return { + filters: { + company: row.company, + is_group: 0 + } + }; + }); } }); diff --git a/erpnext/regional/india/setup.py b/erpnext/regional/india/setup.py index ec4da0db65..a6d723a824 100644 --- a/erpnext/regional/india/setup.py +++ b/erpnext/regional/india/setup.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals import frappe, os, json from frappe.custom.doctype.custom_field.custom_field import create_custom_fields -from frappe.permissions import add_permission +from frappe.permissions import add_permission, update_permission_property from erpnext.regional.india import states from erpnext.accounts.utils import get_fiscal_year from frappe.utils import today @@ -79,6 +79,9 @@ def add_custom_roles_for_reports(): def add_permissions(): for doctype in ('GST HSN Code', 'GST Settings'): add_permission(doctype, 'All', 0) + add_permission(doctype, 'Accounts Manager', 0) + update_permission_property(doctype, 'Accounts Manager', 0, 'write', 1) + update_permission_property(doctype, 'Accounts Manager', 0, 'create', 1) def add_print_formats(): frappe.reload_doc("regional", "print_format", "gst_tax_invoice") From 2a1aedfff1f752dc821f7a822a976c6037e9ed92 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 24 Jan 2019 17:56:19 +0530 Subject: [PATCH 46/86] fix(setup): Create regional taxes on creation on company --- erpnext/setup/doctype/company/company.py | 3 +++ erpnext/setup/setup_wizard/setup_wizard.py | 13 ++----------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py index 09ff5a83fd..20b1201269 100644 --- a/erpnext/setup/doctype/company/company.py +++ b/erpnext/setup/doctype/company/company.py @@ -94,6 +94,9 @@ class Company(NestedSet): if frappe.flags.country_change: install_country_fixtures(self.name) + self.create_default_tax_template() + + if not frappe.db.get_value("Department", {"company": self.name}): from erpnext.setup.setup_wizard.operations.install_fixtures import install_post_company_fixtures diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py index e062e280b9..b293f5d920 100644 --- a/erpnext/setup/setup_wizard/setup_wizard.py +++ b/erpnext/setup/setup_wizard/setup_wizard.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals import frappe from frappe import _ -from .operations import install_fixtures as fixtures, company_setup, taxes_setup, sample_data +from .operations import install_fixtures as fixtures, company_setup, sample_data def get_setup_stages(args=None): if frappe.db.sql("select name from tabCompany"): @@ -37,18 +37,13 @@ def get_setup_stages(args=None): ] }, { - 'status': _('Setting up company and taxes'), + 'status': _('Setting up company'), 'fail_msg': _('Failed to setup company'), 'tasks': [ { 'fn': setup_company, 'args': args, 'fail_msg': _("Failed to setup company") - }, - { - 'fn': setup_taxes, - 'args': args, - 'fail_msg': _("Failed to setup taxes") } ] }, @@ -94,9 +89,6 @@ def stage_fixtures(args): def setup_company(args): fixtures.install_company(args) -def setup_taxes(args): - taxes_setup.create_sales_tax(args) - def setup_post_company_fixtures(args): fixtures.install_post_company_fixtures(args) @@ -132,7 +124,6 @@ def login_as_first_user(args): def setup_complete(args=None): stage_fixtures(args) setup_company(args) - setup_taxes(args) setup_post_company_fixtures(args) setup_defaults(args) stage_four(args) From a40c43e414e2eb1c42bffd83d4c26bc0cbc4d69a Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 24 Jan 2019 19:13:32 +0530 Subject: [PATCH 47/86] fix(ar-summary): Changes to column list to match recent changes --- .../accounts_receivable_summary/accounts_receivable_summary.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py index cc21d3427d..73ca8b48ef 100644 --- a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +++ b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py @@ -190,7 +190,7 @@ class AccountsReceivableSummary(ReceivablePayableReport): def get_voucherwise_data(self, party_naming_by, args): voucherwise_data = ReceivablePayableReport(self.filters).run(args)[1] - cols = ["posting_date", "party", "customer-contact"] + cols = ["posting_date", "party"] if party_naming_by == "Naming Series": cols += ["party_name"] From 74df01d3d10bfeb89b6605602a11fd8826c47b71 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Thu, 24 Jan 2019 23:59:00 +0530 Subject: [PATCH 48/86] fix: ascii code while opening offline POS --- erpnext/accounts/doctype/sales_invoice/pos.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py index 287da08ef5..1ef7b5403c 100755 --- a/erpnext/accounts/doctype/sales_invoice/pos.py +++ b/erpnext/accounts/doctype/sales_invoice/pos.py @@ -333,10 +333,12 @@ def get_bin_data(pos_profile): itemwise_bin_data = {} cond = "1=1" if pos_profile.get('warehouse'): - cond = "warehouse = '{0}'".format(pos_profile.get('warehouse')) + cond = "warehouse = %(warehouse)s" bin_data = frappe.db.sql(""" select item_code, warehouse, actual_qty from `tabBin` - where actual_qty > 0 and {cond}""".format(cond=cond), as_dict=1) + where actual_qty > 0 and {cond}""".format(cond=cond), { + 'warehouse': frappe.db.escape(pos_profile.get('warehouse')) + }, as_dict=1) for bins in bin_data: if bins.item_code not in itemwise_bin_data: From e14cc8f2b67393c23f7c6e6f087670369bb0e446 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 25 Jan 2019 00:23:41 +0530 Subject: [PATCH 49/86] fix: bank reconcilliation showing multiple entries against one JV --- .../doctype/bank_reconciliation/bank_reconciliation.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py index 7814b0883d..917276293d 100644 --- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py @@ -26,7 +26,7 @@ class BankReconciliation(Document): select "Journal Entry" as payment_document, t1.name as payment_entry, t1.cheque_no as cheque_number, t1.cheque_date, - t2.debit_in_account_currency as debit, t2.credit_in_account_currency as credit, + sum(t2.debit_in_account_currency) as debit, sum(t2.credit_in_account_currency) as credit, t1.posting_date, t2.against_account, t1.clearance_date, t2.account_currency from `tabJournal Entry` t1, `tabJournal Entry Account` t2 @@ -34,6 +34,7 @@ class BankReconciliation(Document): t2.parent = t1.name and t2.account = %s and t1.docstatus=1 and t1.posting_date >= %s and t1.posting_date <= %s and ifnull(t1.is_opening, 'No') = 'No' {0} + group by t2.account, t1.name order by t1.posting_date ASC, t1.name DESC """.format(condition), (self.bank_account, self.from_date, self.to_date), as_dict=1) From ddc65dfb872053e507b63d00c146cf475eec1bd2 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 25 Jan 2019 11:04:14 +0530 Subject: [PATCH 50/86] fix: delete taxes and charges template while deleting company --- erpnext/setup/doctype/company/company.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py index 20b1201269..c49c264251 100644 --- a/erpnext/setup/doctype/company/company.py +++ b/erpnext/setup/doctype/company/company.py @@ -339,6 +339,9 @@ class Company(NestedSet): frappe.db.sql("delete from tabDepartment where company=%s", self.name) frappe.db.sql("delete from `tabTax Withholding Account` where company=%s", self.name) + frappe.db.sql("delete from `tabSales Taxes and Charges Template` where company=%s", self.name) + frappe.db.sql("delete from `tabPurchase Taxes and Charges Template` where company=%s", self.name) + @frappe.whitelist() def enqueue_replace_abbr(company, old, new): kwargs = dict(company=company, old=old, new=new) From 1f9a6febdd138a1a9b1b1651c8f21e8d14d4416d Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Fri, 25 Jan 2019 11:53:55 +0530 Subject: [PATCH 51/86] fix: Assign given price list if POS price list is not available --- erpnext/accounts/party.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py index c0a44d1c02..f412506a7c 100644 --- a/erpnext/accounts/party.py +++ b/erpnext/accounts/party.py @@ -164,7 +164,7 @@ def set_price_list(out, party, party_type, given_price_list, pos=None): price_list = customer_price_list else: pos_price_list = frappe.get_value('Pos Profile', pos, 'selling_price_list') - price_list = pos_price_list + price_list = pos_price_list or given_price_list else: price_list = get_default_price_list(party) or given_price_list From 3f9b231f31823b998c09ea4fb84a1b62fc54b69a Mon Sep 17 00:00:00 2001 From: scmmishra Date: Fri, 25 Jan 2019 12:56:27 +0530 Subject: [PATCH 52/86] [fix] Links now redirect to erpnext.com --- README.md | 2 +- erpnext/change_log/v6/v6_13_1.md | 2 +- erpnext/hooks.py | 2 -- erpnext/public/js/conf.js | 2 +- .../page/welcome_to_erpnext/welcome_to_erpnext.html | 2 +- erpnext/utilities/user_progress.py | 10 +++++----- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index f4a08be548..8c13e1ed88 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Includes: Accounting, Inventory, Manufacturing, CRM, Sales, Purchase, Project Ma ERPNext is built on the [Frappe](https://github.com/frappe/frappe) Framework, a full-stack web app framework in Python & JavaScript. -- [User Guide](https://erpnext.org/docs/user) +- [User Guide](https://erpnext.com/docs/user) - [Discussion Forum](https://discuss.erpnext.com/) --- diff --git a/erpnext/change_log/v6/v6_13_1.md b/erpnext/change_log/v6/v6_13_1.md index 4b2c4a9cca..d5a930e3b9 100644 --- a/erpnext/change_log/v6/v6_13_1.md +++ b/erpnext/change_log/v6/v6_13_1.md @@ -1 +1 @@ -- [ERPNext Manual in German](http://erpnext.org/docs/user/manual/de/) contributed by [CWT Connector & Wire Technology GmbH](http://www.cwt-assembly.com/) +- [ERPNext Manual in German](http://erpnext.com/docs/user/manual/de/) contributed by [CWT Connector & Wire Technology GmbH](http://www.cwt-assembly.com/) diff --git a/erpnext/hooks.py b/erpnext/hooks.py index bf7e32ab78..e4f90dc779 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -16,8 +16,6 @@ staging_version = '11.0.3-beta.34' error_report_email = "support@erpnext.com" -docs_app = "foundation" - app_include_js = "assets/js/erpnext.min.js" app_include_css = "assets/css/erpnext.css" web_include_js = "assets/js/erpnext-web.min.js" diff --git a/erpnext/public/js/conf.js b/erpnext/public/js/conf.js index 7eb59e0489..56e6bdb8db 100644 --- a/erpnext/public/js/conf.js +++ b/erpnext/public/js/conf.js @@ -23,7 +23,7 @@ $(document).bind('toolbar_setup', function() { // additional help links for erpnext var $help_menu = $('.dropdown-help ul .documentation-links'); - $('
  • '+__('Documentation')+'
    • ').insertBefore($help_menu); $('
  • '+__('User Forum')+'
    • ').insertBefore($help_menu); diff --git a/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html b/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html index 57fce28eeb..5808ce73ee 100644 --- a/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +++ b/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html @@ -22,7 +22,7 @@ diff --git a/erpnext/utilities/user_progress.py b/erpnext/utilities/user_progress.py index 2901d52276..71a5f90464 100644 --- a/erpnext/utilities/user_progress.py +++ b/erpnext/utilities/user_progress.py @@ -33,7 +33,7 @@ def get_slide_settings(): help_links=[ { "label": _("Chart of Accounts"), - "url": ["https://erpnext.org/docs/user/manual/en/accounts/chart-of-accounts"] + "url": ["https://erpnext.com/docs/user/manual/en/accounts/chart-of-accounts"] }, { "label": _("Opening Balances"), @@ -56,7 +56,7 @@ def get_slide_settings(): help_links=[ { "label": _('Learn More'), - "url": ["https://erpnext.org/docs/user/manual/en/setting-up/setting-company-sales-goal"] + "url": ["https://erpnext.com/docs/user/manual/en/setting-up/setting-company-sales-goal"] } ] ), @@ -80,7 +80,7 @@ def get_slide_settings(): help_links=[ { "label": _('Learn More'), - "url": ["https://erpnext.org/docs/user/manual/en/CRM/customer.html"] + "url": ["https://erpnext.com/docs/user/manual/en/CRM/customer.html"] } ] ), @@ -123,7 +123,7 @@ def get_slide_settings(): help_links=[ { "label": _('Learn More'), - "url": ["https://erpnext.org/docs/user/manual/en/buying/supplier"] + "url": ["https://erpnext.com/docs/user/manual/en/buying/supplier"] }, { "label": _('Customers and Suppliers'), @@ -261,7 +261,7 @@ def get_slide_settings(): help_links=[ { "label": _('Learn More'), - "url": ["https://erpnext.org/docs/user/manual/en/setting-up/users-and-permissions"] + "url": ["https://erpnext.com/docs/user/manual/en/setting-up/users-and-permissions"] }, { "label": _('Users and Permissions'), From 9731a02657026132ada006505e61fb5e7d9eba4d Mon Sep 17 00:00:00 2001 From: scmmishra Date: Fri, 25 Jan 2019 13:14:11 +0530 Subject: [PATCH 53/86] [feat] Added docsUrl variable to configure help_links --- erpnext/public/js/help_links.js | 352 ++++++++++++++++---------------- 1 file changed, 177 insertions(+), 175 deletions(-) diff --git a/erpnext/public/js/help_links.js b/erpnext/public/js/help_links.js index 20ba56a5ec..d3cc688cd2 100644 --- a/erpnext/public/js/help_links.js +++ b/erpnext/public/js/help_links.js @@ -1,524 +1,526 @@ frappe.provide('frappe.help.help_links'); +const docsUrl = 'https://erpnext.com/docs/' + frappe.help.help_links['Form/Rename Tool'] = [ - { label: 'Bulk Rename', url: 'https://erpnext.com/docs/user/manual/en/setting-up/data/bulk-rename' }, + { label: 'Bulk Rename', url: docsUrl + 'user/manual/en/setting-up/data/bulk-rename' }, ] //Setup frappe.help.help_links['List/User'] = [ - { label: 'New User', url: 'https://erpnext.com/docs/user/manual/en/setting-up/users-and-permissions/adding-users' }, - { label: 'Rename User', url: 'https://erpnext.com/docs/user/manual/en/setting-up/articles/rename-user' }, + { label: 'New User', url: docsUrl + 'user/manual/en/setting-up/users-and-permissions/adding-users' }, + { label: 'Rename User', url: docsUrl + 'user/manual/en/setting-up/articles/rename-user' }, ] frappe.help.help_links['permission-manager'] = [ - { label: 'Role Permissions Manager', url: 'https://erpnext.com/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions' }, - { label: 'Managing Perm Level in Permissions Manager', url: 'https://erpnext.com/docs/user/manual/en/setting-up/articles/managing-perm-level' }, - { label: 'User Permissions', url: 'https://erpnext.com/docs/user/manual/en/setting-up/users-and-permissions/user-permissions' }, - { label: 'Sharing', url: 'https://erpnext.com/docs/user/manual/en/setting-up/users-and-permissions/sharing' }, - { label: 'Password', url: 'https://erpnext.com/docs/user/manual/en/setting-up/articles/change-password' }, + { label: 'Role Permissions Manager', url: docsUrl + 'user/manual/en/setting-up/users-and-permissions/role-based-permissions' }, + { label: 'Managing Perm Level in Permissions Manager', url: docsUrl + 'user/manual/en/setting-up/articles/managing-perm-level' }, + { label: 'User Permissions', url: docsUrl + 'user/manual/en/setting-up/users-and-permissions/user-permissions' }, + { label: 'Sharing', url: docsUrl + 'user/manual/en/setting-up/users-and-permissions/sharing' }, + { label: 'Password', url: docsUrl + 'user/manual/en/setting-up/articles/change-password' }, ] frappe.help.help_links['Form/System Settings'] = [ - { label: 'Naming Series', url: 'https://erpnext.com/docs/user/manual/en/setting-up/settings/system-settings' }, + { label: 'Naming Series', url: docsUrl + 'user/manual/en/setting-up/settings/system-settings' }, ] frappe.help.help_links['data-import-tool'] = [ - { label: 'Importing and Exporting Data', url: 'https://erpnext.com/docs/user/manual/en/setting-up/data/data-import-tool' }, - { label: 'Overwriting Data from Data Import Tool', url: 'https://erpnext.com/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool' }, + { label: 'Importing and Exporting Data', url: docsUrl + 'user/manual/en/setting-up/data/data-import-tool' }, + { label: 'Overwriting Data from Data Import Tool', url: docsUrl + 'user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool' }, ] frappe.help.help_links['module_setup'] = [ - { label: 'Role Permissions Manager', url: 'https://erpnext.com/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions' }, + { label: 'Role Permissions Manager', url: docsUrl + 'user/manual/en/setting-up/users-and-permissions/role-based-permissions' }, ] frappe.help.help_links['Form/Naming Series'] = [ - { label: 'Naming Series', url: 'https://erpnext.com/docs/user/manual/en/setting-up/settings/naming-series' }, - { label: 'Setting the Current Value for Naming Series', url: 'https://erpnext.com/docs/user/manual/en/setting-up/articles/naming-series-current-value' }, + { label: 'Naming Series', url: docsUrl + 'user/manual/en/setting-up/settings/naming-series' }, + { label: 'Setting the Current Value for Naming Series', url: docsUrl + 'user/manual/en/setting-up/articles/naming-series-current-value' }, ] frappe.help.help_links['Form/Global Defaults'] = [ - { label: 'Global Settings', url: 'https://erpnext.com/docs/user/manual/en/setting-up/settings/global-defaults' }, + { label: 'Global Settings', url: docsUrl + 'user/manual/en/setting-up/settings/global-defaults' }, ] frappe.help.help_links['Form/Email Digest'] = [ - { label: 'Email Digest', url: 'https://erpnext.com/docs/user/manual/en/setting-up/email/email-digest' }, + { label: 'Email Digest', url: docsUrl + 'user/manual/en/setting-up/email/email-digest' }, ] frappe.help.help_links['List/Print Heading'] = [ - { label: 'Print Heading', url: 'https://erpnext.com/docs/user/manual/en/setting-up/print/print-headings' }, + { label: 'Print Heading', url: docsUrl + 'user/manual/en/setting-up/print/print-headings' }, ] frappe.help.help_links['List/Letter Head'] = [ - { label: 'Letter Head', url: 'https://erpnext.com/docs/user/manual/en/setting-up/print/letter-head' }, + { label: 'Letter Head', url: docsUrl + 'user/manual/en/setting-up/print/letter-head' }, ] frappe.help.help_links['List/Address Template'] = [ - { label: 'Address Template', url: 'https://erpnext.com/docs/user/manual/en/setting-up/print/address-template' }, + { label: 'Address Template', url: docsUrl + 'user/manual/en/setting-up/print/address-template' }, ] frappe.help.help_links['List/Terms and Conditions'] = [ - { label: 'Terms and Conditions', url: 'https://erpnext.com/docs/user/manual/en/setting-up/print/terms-and-conditions' }, + { label: 'Terms and Conditions', url: docsUrl + 'user/manual/en/setting-up/print/terms-and-conditions' }, ] frappe.help.help_links['List/Cheque Print Template'] = [ - { label: 'Cheque Print Template', url: 'https://erpnext.com/docs/user/manual/en/setting-up/print/cheque-print-template' }, + { label: 'Cheque Print Template', url: docsUrl + 'user/manual/en/setting-up/print/cheque-print-template' }, ] frappe.help.help_links['List/Email Account'] = [ - { label: 'Email Account', url: 'https://erpnext.com/docs/user/manual/en/setting-up/email/email-account' }, + { label: 'Email Account', url: docsUrl + 'user/manual/en/setting-up/email/email-account' }, ] frappe.help.help_links['List/Notification'] = [ - { label: 'Notification', url: 'https://erpnext.com/docs/user/manual/en/setting-up/email/notifications' }, + { label: 'Notification', url: docsUrl + 'user/manual/en/setting-up/email/notifications' }, ] frappe.help.help_links['Form/Notification'] = [ - { label: 'Notification', url: 'https://erpnext.com/docs/user/manual/en/setting-up/email/notifications' }, + { label: 'Notification', url: docsUrl + 'user/manual/en/setting-up/email/notifications' }, ] frappe.help.help_links['List/Email Digest'] = [ - { label: 'Email Digest', url: 'https://erpnext.com/docs/user/manual/en/setting-up/email/email-digest' }, + { label: 'Email Digest', url: docsUrl + 'user/manual/en/setting-up/email/email-digest' }, ] frappe.help.help_links['List/Auto Email Report'] = [ - { label: 'Auto Email Reports', url: 'https://erpnext.com/docs/user/manual/en/setting-up/email/email-reports' }, + { label: 'Auto Email Reports', url: docsUrl + 'user/manual/en/setting-up/email/email-reports' }, ] frappe.help.help_links['Form/Print Settings'] = [ - { label: 'Print Settings', url: 'https://erpnext.com/docs/user/manual/en/setting-up/print/print-settings' }, + { label: 'Print Settings', url: docsUrl + 'user/manual/en/setting-up/print/print-settings' }, ] frappe.help.help_links['print-format-builder'] = [ - { label: 'Print Format Builder', url: 'https://erpnext.com/docs/user/manual/en/setting-up/print/print-settings' }, + { label: 'Print Format Builder', url: docsUrl + 'user/manual/en/setting-up/print/print-settings' }, ] frappe.help.help_links['List/Print Heading'] = [ - { label: 'Print Heading', url: 'https://erpnext.com/docs/user/manual/en/setting-up/print/print-headings' }, + { label: 'Print Heading', url: docsUrl + 'user/manual/en/setting-up/print/print-headings' }, ] //setup-integrations frappe.help.help_links['Form/PayPal Settings'] = [ - { label: 'PayPal Settings', url: 'https://erpnext.com/docs/user/manual/en/setting-up/integrations/paypal-integration' }, + { label: 'PayPal Settings', url: docsUrl + 'user/manual/en/setting-up/integrations/paypal-integration' }, ] frappe.help.help_links['Form/Razorpay Settings'] = [ - { label: 'Razorpay Settings', url: 'https://erpnext.com/docs/user/manual/en/setting-up/integrations/razorpay-integration' }, + { label: 'Razorpay Settings', url: docsUrl + 'user/manual/en/setting-up/integrations/razorpay-integration' }, ] frappe.help.help_links['Form/Dropbox Settings'] = [ - { label: 'Dropbox Settings', url: 'https://erpnext.com/docs/user/manual/en/setting-up/integrations/dropbox-backup' }, + { label: 'Dropbox Settings', url: docsUrl + 'user/manual/en/setting-up/integrations/dropbox-backup' }, ] frappe.help.help_links['Form/LDAP Settings'] = [ - { label: 'LDAP Settings', url: 'https://erpnext.com/docs/user/manual/en/setting-up/integrations/ldap-integration' }, + { label: 'LDAP Settings', url: docsUrl + 'user/manual/en/setting-up/integrations/ldap-integration' }, ] frappe.help.help_links['Form/Stripe Settings'] = [ - { label: 'Stripe Settings', url: 'https://erpnext.com/docs/user/manual/en/setting-up/integrations/stripe-integration' }, + { label: 'Stripe Settings', url: docsUrl + 'user/manual/en/setting-up/integrations/stripe-integration' }, ] //Sales frappe.help.help_links['Form/Quotation'] = [ - { label: 'Quotation', url: 'https://erpnext.com/docs/user/manual/en/selling/quotation' }, - { label: 'Applying Discount', url: 'https://erpnext.com/docs/user/manual/en/selling/articles/applying-discount' }, - { label: 'Sales Person', url: 'https://erpnext.com/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions' }, - { label: 'Applying Margin', url: 'https://erpnext.com/docs/user/manual/en/selling/articles/adding-margin' }, + { label: 'Quotation', url: docsUrl + 'user/manual/en/selling/quotation' }, + { label: 'Applying Discount', url: docsUrl + 'user/manual/en/selling/articles/applying-discount' }, + { label: 'Sales Person', url: docsUrl + 'user/manual/en/selling/articles/sales-persons-in-the-sales-transactions' }, + { label: 'Applying Margin', url: docsUrl + 'user/manual/en/selling/articles/adding-margin' }, ] frappe.help.help_links['List/Customer'] = [ - { label: 'Customer', url: 'https://erpnext.com/docs/user/manual/en/CRM/customer' }, - { label: 'Credit Limit', url: 'https://erpnext.com/docs/user/manual/en/accounts/credit-limit' }, + { label: 'Customer', url: docsUrl + 'user/manual/en/CRM/customer' }, + { label: 'Credit Limit', url: docsUrl + 'user/manual/en/accounts/credit-limit' }, ] frappe.help.help_links['Form/Customer'] = [ - { label: 'Customer', url: 'https://erpnext.com/docs/user/manual/en/CRM/customer' }, - { label: 'Credit Limit', url: 'https://erpnext.com/docs/user/manual/en/accounts/credit-limit' }, + { label: 'Customer', url: docsUrl + 'user/manual/en/CRM/customer' }, + { label: 'Credit Limit', url: docsUrl + 'user/manual/en/accounts/credit-limit' }, ] frappe.help.help_links['List/Sales Taxes and Charges Template'] = [ - { label: 'Setting Up Taxes', url: 'https://erpnext.com/docs/user/manual/en/setting-up/setting-up-taxes' }, + { label: 'Setting Up Taxes', url: docsUrl + 'user/manual/en/setting-up/setting-up-taxes' }, ] frappe.help.help_links['Form/Sales Taxes and Charges Template'] = [ - { label: 'Setting Up Taxes', url: 'https://erpnext.com/docs/user/manual/en/setting-up/setting-up-taxes' }, + { label: 'Setting Up Taxes', url: docsUrl + 'user/manual/en/setting-up/setting-up-taxes' }, ] frappe.help.help_links['List/Sales Order'] = [ - { label: 'Sales Order', url: 'https://erpnext.com/docs/user/manual/en/selling/sales-order' }, - { label: 'Recurring Sales Order', url: 'https://erpnext.com/docs/user/manual/en/accounts/recurring-orders-and-invoices' }, - { label: 'Applying Discount', url: 'https://erpnext.com/docs/user/manual/en/selling/articles/applying-discount' }, + { label: 'Sales Order', url: docsUrl + 'user/manual/en/selling/sales-order' }, + { label: 'Recurring Sales Order', url: docsUrl + 'user/manual/en/accounts/recurring-orders-and-invoices' }, + { label: 'Applying Discount', url: docsUrl + 'user/manual/en/selling/articles/applying-discount' }, ] frappe.help.help_links['Form/Sales Order'] = [ - { label: 'Sales Order', url: 'https://erpnext.com/docs/user/manual/en/selling/sales-order' }, - { label: 'Recurring Sales Order', url: 'https://erpnext.com/docs/user/manual/en/accounts/recurring-orders-and-invoices' }, - { label: 'Applying Discount', url: 'https://erpnext.com/docs/user/manual/en/selling/articles/applying-discount' }, - { label: 'Drop Shipping', url: 'https://erpnext.com/docs/user/manual/en/selling/articles/drop-shipping' }, - { label: 'Sales Person', url: 'https://erpnext.com/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions' }, - { label: 'Close Sales Order', url: 'https://erpnext.com/docs/user/manual/en/selling/articles/close-sales-order' }, - { label: 'Applying Margin', url: 'https://erpnext.com/docs/user/manual/en/selling/articles/adding-margin' }, + { label: 'Sales Order', url: docsUrl + 'user/manual/en/selling/sales-order' }, + { label: 'Recurring Sales Order', url: docsUrl + 'user/manual/en/accounts/recurring-orders-and-invoices' }, + { label: 'Applying Discount', url: docsUrl + 'user/manual/en/selling/articles/applying-discount' }, + { label: 'Drop Shipping', url: docsUrl + 'user/manual/en/selling/articles/drop-shipping' }, + { label: 'Sales Person', url: docsUrl + 'user/manual/en/selling/articles/sales-persons-in-the-sales-transactions' }, + { label: 'Close Sales Order', url: docsUrl + 'user/manual/en/selling/articles/close-sales-order' }, + { label: 'Applying Margin', url: docsUrl + 'user/manual/en/selling/articles/adding-margin' }, ] frappe.help.help_links['Form/Product Bundle'] = [ - { label: 'Product Bundle', url: 'https://erpnext.com/docs/user/manual/en/selling/setup/product-bundle' }, + { label: 'Product Bundle', url: docsUrl + 'user/manual/en/selling/setup/product-bundle' }, ] frappe.help.help_links['Form/Selling Settings'] = [ - { label: 'Selling Settings', url: 'https://erpnext.com/docs/user/manual/en/selling/setup/selling-settings' }, + { label: 'Selling Settings', url: docsUrl + 'user/manual/en/selling/setup/selling-settings' }, ] //Buying frappe.help.help_links['List/Supplier'] = [ - { label: 'Supplier', url: 'https://erpnext.com/docs/user/manual/en/buying/supplier' }, + { label: 'Supplier', url: docsUrl + 'user/manual/en/buying/supplier' }, ] frappe.help.help_links['Form/Supplier'] = [ - { label: 'Supplier', url: 'https://erpnext.com/docs/user/manual/en/buying/supplier' }, + { label: 'Supplier', url: docsUrl + 'user/manual/en/buying/supplier' }, ] frappe.help.help_links['Form/Request for Quotation'] = [ - { label: 'Request for Quotation', url: 'https://erpnext.com/docs/user/manual/en/buying/request-for-quotation' }, - { label: 'RFQ Video', url: 'https://erpnext.com/docs/user/videos/learn/request-for-quotation.html' }, + { label: 'Request for Quotation', url: docsUrl + 'user/manual/en/buying/request-for-quotation' }, + { label: 'RFQ Video', url: docsUrl + 'user/videos/learn/request-for-quotation.html' }, ] frappe.help.help_links['Form/Supplier Quotation'] = [ - { label: 'Supplier Quotation', url: 'https://erpnext.com/docs/user/manual/en/buying/supplier-quotation' }, + { label: 'Supplier Quotation', url: docsUrl + 'user/manual/en/buying/supplier-quotation' }, ] frappe.help.help_links['Form/Buying Settings'] = [ - { label: 'Buying Settings', url: 'https://erpnext.com/docs/user/manual/en/buying/setup/buying-settings' }, + { label: 'Buying Settings', url: docsUrl + 'user/manual/en/buying/setup/buying-settings' }, ] frappe.help.help_links['List/Purchase Order'] = [ - { label: 'Purchase Order', url: 'https://erpnext.com/docs/user/manual/en/buying/purchase-order' }, - { label: 'Recurring Purchase Order', url: 'https://erpnext.com/docs/user/manual/en/accounts/recurring-orders-and-invoices' }, + { label: 'Purchase Order', url: docsUrl + 'user/manual/en/buying/purchase-order' }, + { label: 'Recurring Purchase Order', url: docsUrl + 'user/manual/en/accounts/recurring-orders-and-invoices' }, ] frappe.help.help_links['Form/Purchase Order'] = [ - { label: 'Purchase Order', url: 'https://erpnext.com/docs/user/manual/en/buying/purchase-order' }, - { label: 'Item UoM', url: 'https://erpnext.com/docs/user/manual/en/buying/articles/purchasing-in-different-unit' }, - { label: 'Supplier Item Code', url: 'https://erpnext.com/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item' }, - { label: 'Recurring Purchase Order', url: 'https://erpnext.com/docs/user/manual/en/accounts/recurring-orders-and-invoices' }, - { label: 'Subcontracting', url: 'https://erpnext.com/docs/user/manual/en/manufacturing/subcontracting' }, + { label: 'Purchase Order', url: docsUrl + 'user/manual/en/buying/purchase-order' }, + { label: 'Item UoM', url: docsUrl + 'user/manual/en/buying/articles/purchasing-in-different-unit' }, + { label: 'Supplier Item Code', url: docsUrl + 'user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item' }, + { label: 'Recurring Purchase Order', url: docsUrl + 'user/manual/en/accounts/recurring-orders-and-invoices' }, + { label: 'Subcontracting', url: docsUrl + 'user/manual/en/manufacturing/subcontracting' }, ] frappe.help.help_links['List/Purchase Taxes and Charges Template'] = [ - { label: 'Setting Up Taxes', url: 'https://erpnext.com/docs/user/manual/en/setting-up/setting-up-taxes' }, + { label: 'Setting Up Taxes', url: docsUrl + 'user/manual/en/setting-up/setting-up-taxes' }, ] frappe.help.help_links['List/POS Profile'] = [ - { label: 'POS Profile', url: 'https://erpnext.com/docs/user/manual/en/setting-up/pos-setting' }, + { label: 'POS Profile', url: docsUrl + 'user/manual/en/setting-up/pos-setting' }, ] frappe.help.help_links['List/Price List'] = [ - { label: 'Price List', url: 'https://erpnext.com/docs/user/manual/en/setting-up/price-lists' }, + { label: 'Price List', url: docsUrl + 'user/manual/en/setting-up/price-lists' }, ] frappe.help.help_links['List/Authorization Rule'] = [ - { label: 'Authorization Rule', url: 'https://erpnext.com/docs/user/manual/en/setting-up/authorization-rule' }, + { label: 'Authorization Rule', url: docsUrl + 'user/manual/en/setting-up/authorization-rule' }, ] frappe.help.help_links['Form/SMS Settings'] = [ - { label: 'SMS Settings', url: 'https://erpnext.com/docs/user/manual/en/setting-up/sms-setting' }, + { label: 'SMS Settings', url: docsUrl + 'user/manual/en/setting-up/sms-setting' }, ] frappe.help.help_links['List/Stock Reconciliation'] = [ - { label: 'Stock Reconciliation', url: 'https://erpnext.com/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item' }, + { label: 'Stock Reconciliation', url: docsUrl + 'user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item' }, ] frappe.help.help_links['Tree/Territory'] = [ - { label: 'Territory', url: 'https://erpnext.com/docs/user/manual/en/setting-up/territory' }, + { label: 'Territory', url: docsUrl + 'user/manual/en/setting-up/territory' }, ] frappe.help.help_links['Form/Dropbox Backup'] = [ - { label: 'Dropbox Backup', url: 'https://erpnext.com/docs/user/manual/en/setting-up/third-party-backups' }, - { label: 'Setting Up Dropbox Backup', url: 'https://erpnext.com/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups' }, + { label: 'Dropbox Backup', url: docsUrl + 'user/manual/en/setting-up/third-party-backups' }, + { label: 'Setting Up Dropbox Backup', url: docsUrl + 'user/manual/en/setting-up/articles/setting-up-dropbox-backups' }, ] frappe.help.help_links['List/Workflow'] = [ - { label: 'Workflow', url: 'https://erpnext.com/docs/user/manual/en/setting-up/workflows' }, + { label: 'Workflow', url: docsUrl + 'user/manual/en/setting-up/workflows' }, ] frappe.help.help_links['List/Company'] = [ - { label: 'Company', url: 'https://erpnext.com/docs/user/manual/en/setting-up/company-setup' }, - { label: 'Managing Multiple Companies', url: 'https://erpnext.com/docs/user/manual/en/setting-up/articles/managing-multiple-companies' }, - { label: 'Delete All Related Transactions for a Company', url: 'https://erpnext.com/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions' }, + { label: 'Company', url: docsUrl + 'user/manual/en/setting-up/company-setup' }, + { label: 'Managing Multiple Companies', url: docsUrl + 'user/manual/en/setting-up/articles/managing-multiple-companies' }, + { label: 'Delete All Related Transactions for a Company', url: docsUrl + 'user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions' }, ] //Accounts frappe.help.help_links['modules/Accounts'] = [ { label: 'Introduction to Accounts', url: 'http://erpnext.com/docs/user/manual/en/accounts/' }, - { label: 'Chart of Accounts', url: 'https://erpnext.com/docs/user/manual/en/accounts/chart-of-accounts.html' }, - { label: 'Multi Currency Accounting', url: 'https://erpnext.com/docs/user/manual/en/accounts/multi-currency-accounting' }, + { label: 'Chart of Accounts', url: docsUrl + 'user/manual/en/accounts/chart-of-accounts.html' }, + { label: 'Multi Currency Accounting', url: docsUrl + 'user/manual/en/accounts/multi-currency-accounting' }, ] frappe.help.help_links['Tree/Account'] = [ - { label: 'Chart of Accounts', url: 'https://erpnext.com/docs/user/manual/en/accounts/chart-of-accounts' }, - { label: 'Managing Tree Mastes', url: 'https://erpnext.com/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters' }, + { label: 'Chart of Accounts', url: docsUrl + 'user/manual/en/accounts/chart-of-accounts' }, + { label: 'Managing Tree Mastes', url: docsUrl + 'user/manual/en/setting-up/articles/managing-tree-structure-masters' }, ] frappe.help.help_links['Form/Sales Invoice'] = [ - { label: 'Sales Invoice', url: 'https://erpnext.com/docs/user/manual/en/accounts/sales-invoice' }, - { label: 'Accounts Opening Balance', url: 'https://erpnext.com/docs/user/manual/en/accounts/opening-accounts' }, - { label: 'Sales Return', url: 'https://erpnext.com/docs/user/manual/en/stock/sales-return' }, - { label: 'Recurring Sales Invoice', url: 'https://erpnext.com/docs/user/manual/en/accounts/recurring-orders-and-invoices' }, + { label: 'Sales Invoice', url: docsUrl + 'user/manual/en/accounts/sales-invoice' }, + { label: 'Accounts Opening Balance', url: docsUrl + 'user/manual/en/accounts/opening-accounts' }, + { label: 'Sales Return', url: docsUrl + 'user/manual/en/stock/sales-return' }, + { label: 'Recurring Sales Invoice', url: docsUrl + 'user/manual/en/accounts/recurring-orders-and-invoices' }, ] frappe.help.help_links['List/Sales Invoice'] = [ - { label: 'Sales Invoice', url: 'https://erpnext.com/docs/user/manual/en/accounts/sales-invoice' }, - { label: 'Accounts Opening Balance', url: 'https://erpnext.com/docs/user/manual/en/accounts/opening-accounts' }, - { label: 'Sales Return', url: 'https://erpnext.com/docs/user/manual/en/stock/sales-return' }, - { label: 'Recurring Sales Invoice', url: 'https://erpnext.com/docs/user/manual/en/accounts/recurring-orders-and-invoices' }, + { label: 'Sales Invoice', url: docsUrl + 'user/manual/en/accounts/sales-invoice' }, + { label: 'Accounts Opening Balance', url: docsUrl + 'user/manual/en/accounts/opening-accounts' }, + { label: 'Sales Return', url: docsUrl + 'user/manual/en/stock/sales-return' }, + { label: 'Recurring Sales Invoice', url: docsUrl + 'user/manual/en/accounts/recurring-orders-and-invoices' }, ] frappe.help.help_links['pos'] = [ - { label: 'Point of Sale Invoice', url: 'https://erpnext.com/docs/user/manual/en/accounts/point-of-sale-pos-invoice' }, + { label: 'Point of Sale Invoice', url: docsUrl + 'user/manual/en/accounts/point-of-sale-pos-invoice' }, ] frappe.help.help_links['List/POS Profile'] = [ - { label: 'Point of Sale Profile', url: 'https://erpnext.com/docs/user/manual/en/setting-up/pos-setting' }, + { label: 'Point of Sale Profile', url: docsUrl + 'user/manual/en/setting-up/pos-setting' }, ] frappe.help.help_links['List/Purchase Invoice'] = [ - { label: 'Purchase Invoice', url: 'https://erpnext.com/docs/user/manual/en/accounts/purchase-invoice' }, - { label: 'Accounts Opening Balance', url: 'https://erpnext.com/docs/user/manual/en/accounts/opening-accounts' }, - { label: 'Recurring Purchase Invoice', url: 'https://erpnext.com/docs/user/manual/en/accounts/recurring-orders-and-invoices' }, + { label: 'Purchase Invoice', url: docsUrl + 'user/manual/en/accounts/purchase-invoice' }, + { label: 'Accounts Opening Balance', url: docsUrl + 'user/manual/en/accounts/opening-accounts' }, + { label: 'Recurring Purchase Invoice', url: docsUrl + 'user/manual/en/accounts/recurring-orders-and-invoices' }, ] frappe.help.help_links['List/Journal Entry'] = [ - { label: 'Journal Entry', url: 'https://erpnext.com/docs/user/manual/en/accounts/journal-entry' }, - { label: 'Advance Payment Entry', url: 'https://erpnext.com/docs/user/manual/en/accounts/advance-payment-entry' }, - { label: 'Accounts Opening Balance', url: 'https://erpnext.com/docs/user/manual/en/accounts/opening-accounts' }, + { label: 'Journal Entry', url: docsUrl + 'user/manual/en/accounts/journal-entry' }, + { label: 'Advance Payment Entry', url: docsUrl + 'user/manual/en/accounts/advance-payment-entry' }, + { label: 'Accounts Opening Balance', url: docsUrl + 'user/manual/en/accounts/opening-accounts' }, ] frappe.help.help_links['List/Payment Entry'] = [ - { label: 'Payment Entry', url: 'https://erpnext.com/docs/user/manual/en/accounts/payment-entry' }, + { label: 'Payment Entry', url: docsUrl + 'user/manual/en/accounts/payment-entry' }, ] frappe.help.help_links['List/Payment Request'] = [ - { label: 'Payment Request', url: 'https://erpnext.com/docs/user/manual/en/accounts/payment-request' }, + { label: 'Payment Request', url: docsUrl + 'user/manual/en/accounts/payment-request' }, ] frappe.help.help_links['List/Asset'] = [ - { label: 'Managing Fixed Assets', url: 'https://erpnext.com/docs/user/manual/en/accounts/managing-fixed-assets' }, + { label: 'Managing Fixed Assets', url: docsUrl + 'user/manual/en/accounts/managing-fixed-assets' }, ] frappe.help.help_links['List/Asset Category'] = [ - { label: 'Asset Category', url: 'https://erpnext.com/docs/user/manual/en/accounts/managing-fixed-assets' }, + { label: 'Asset Category', url: docsUrl + 'user/manual/en/accounts/managing-fixed-assets' }, ] frappe.help.help_links['Tree/Cost Center'] = [ - { label: 'Budgeting', url: 'https://erpnext.com/docs/user/manual/en/accounts/budgeting' }, + { label: 'Budgeting', url: docsUrl + 'user/manual/en/accounts/budgeting' }, ] frappe.help.help_links['List/Item'] = [ { label: 'Item', url: 'http://erpnext.com/docs/user/manual/en/stock/item' }, - { label: 'Item Price', url: 'https://erpnext.com/docs/user/manual/en/stock/item/item-price' }, - { label: 'Barcode', url: 'https://erpnext.com/docs/user/manual/en/stock/articles/track-items-using-barcode' }, - { label: 'Item Wise Taxation', url: 'https://erpnext.com/docs/user/manual/en/accounts/item-wise-taxation' }, - { label: 'Managing Fixed Assets', url: 'https://erpnext.com/docs/user/manual/en/accounts/managing-fixed-assets' }, - { label: 'Item Codification', url: 'https://erpnext.com/docs/user/manual/en/stock/item/item-codification' }, - { label: 'Item Variants', url: 'https://erpnext.com/docs/user/manual/en/stock/item/item-variants' }, - { label: 'Item Valuation', url: 'https://erpnext.com/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average' }, + { label: 'Item Price', url: docsUrl + 'user/manual/en/stock/item/item-price' }, + { label: 'Barcode', url: docsUrl + 'user/manual/en/stock/articles/track-items-using-barcode' }, + { label: 'Item Wise Taxation', url: docsUrl + 'user/manual/en/accounts/item-wise-taxation' }, + { label: 'Managing Fixed Assets', url: docsUrl + 'user/manual/en/accounts/managing-fixed-assets' }, + { label: 'Item Codification', url: docsUrl + 'user/manual/en/stock/item/item-codification' }, + { label: 'Item Variants', url: docsUrl + 'user/manual/en/stock/item/item-variants' }, + { label: 'Item Valuation', url: docsUrl + 'user/manual/en/stock/item/item-valuation-fifo-and-moving-average' }, ] frappe.help.help_links['Form/Item'] = [ { label: 'Item', url: 'http://erpnext.com/docs/user/manual/en/stock/item' }, - { label: 'Item Price', url: 'https://erpnext.com/docs/user/manual/en/stock/item/item-price' }, - { label: 'Barcode', url: 'https://erpnext.com/docs/user/manual/en/stock/articles/track-items-using-barcode' }, - { label: 'Item Wise Taxation', url: 'https://erpnext.com/docs/user/manual/en/accounts/item-wise-taxation' }, - { label: 'Managing Fixed Assets', url: 'https://erpnext.com/docs/user/manual/en/accounts/managing-fixed-assets' }, - { label: 'Item Codification', url: 'https://erpnext.com/docs/user/manual/en/stock/item/item-codification' }, - { label: 'Item Variants', url: 'https://erpnext.com/docs/user/manual/en/stock/item/item-variants' }, - { label: 'Item Valuation', url: 'https://erpnext.com/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average' }, + { label: 'Item Price', url: docsUrl + 'user/manual/en/stock/item/item-price' }, + { label: 'Barcode', url: docsUrl + 'user/manual/en/stock/articles/track-items-using-barcode' }, + { label: 'Item Wise Taxation', url: docsUrl + 'user/manual/en/accounts/item-wise-taxation' }, + { label: 'Managing Fixed Assets', url: docsUrl + 'user/manual/en/accounts/managing-fixed-assets' }, + { label: 'Item Codification', url: docsUrl + 'user/manual/en/stock/item/item-codification' }, + { label: 'Item Variants', url: docsUrl + 'user/manual/en/stock/item/item-variants' }, + { label: 'Item Valuation', url: docsUrl + 'user/manual/en/stock/item/item-valuation-fifo-and-moving-average' }, ] frappe.help.help_links['List/Purchase Receipt'] = [ - { label: 'Purchase Receipt', url: 'https://erpnext.com/docs/user/manual/en/stock/purchase-receipt' }, - { label: 'Barcode', url: 'https://erpnext.com/docs/user/manual/en/stock/articles/track-items-using-barcode' }, + { label: 'Purchase Receipt', url: docsUrl + 'user/manual/en/stock/purchase-receipt' }, + { label: 'Barcode', url: docsUrl + 'user/manual/en/stock/articles/track-items-using-barcode' }, ] frappe.help.help_links['List/Delivery Note'] = [ - { label: 'Delivery Note', url: 'https://erpnext.com/docs/user/manual/en/stock/delivery-note' }, - { label: 'Barcode', url: 'https://erpnext.com/docs/user/manual/en/stock/articles/track-items-using-barcode' }, - { label: 'Sales Return', url: 'https://erpnext.com/docs/user/manual/en/stock/sales-return' }, + { label: 'Delivery Note', url: docsUrl + 'user/manual/en/stock/delivery-note' }, + { label: 'Barcode', url: docsUrl + 'user/manual/en/stock/articles/track-items-using-barcode' }, + { label: 'Sales Return', url: docsUrl + 'user/manual/en/stock/sales-return' }, ] frappe.help.help_links['Form/Delivery Note'] = [ - { label: 'Delivery Note', url: 'https://erpnext.com/docs/user/manual/en/stock/delivery-note' }, - { label: 'Sales Return', url: 'https://erpnext.com/docs/user/manual/en/stock/sales-return' }, - { label: 'Barcode', url: 'https://erpnext.com/docs/user/manual/en/stock/articles/track-items-using-barcode' }, - { label: 'Subcontracting', url: 'https://erpnext.com/docs/user/manual/en/manufacturing/subcontracting' }, + { label: 'Delivery Note', url: docsUrl + 'user/manual/en/stock/delivery-note' }, + { label: 'Sales Return', url: docsUrl + 'user/manual/en/stock/sales-return' }, + { label: 'Barcode', url: docsUrl + 'user/manual/en/stock/articles/track-items-using-barcode' }, + { label: 'Subcontracting', url: docsUrl + 'user/manual/en/manufacturing/subcontracting' }, ] frappe.help.help_links['List/Installation Note'] = [ - { label: 'Installation Note', url: 'https://erpnext.com/docs/user/manual/en/stock/installation-note' }, + { label: 'Installation Note', url: docsUrl + 'user/manual/en/stock/installation-note' }, ] frappe.help.help_links['Tree'] = [ - { label: 'Managing Tree Structure Masters', url: 'https://erpnext.com/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters' }, + { label: 'Managing Tree Structure Masters', url: docsUrl + 'user/manual/en/setting-up/articles/managing-tree-structure-masters' }, ] frappe.help.help_links['List/Budget'] = [ - { label: 'Budgeting', url: 'https://erpnext.com/docs/user/manual/en/accounts/budgeting' }, + { label: 'Budgeting', url: docsUrl + 'user/manual/en/accounts/budgeting' }, ] //Stock frappe.help.help_links['List/Material Request'] = [ - { label: 'Material Request', url: 'https://erpnext.com/docs/user/manual/en/stock/material-request' }, - { label: 'Auto-creation of Material Request', url: 'https://erpnext.com/docs/user/manual/en/stock/articles/auto-creation-of-material-request' }, + { label: 'Material Request', url: docsUrl + 'user/manual/en/stock/material-request' }, + { label: 'Auto-creation of Material Request', url: docsUrl + 'user/manual/en/stock/articles/auto-creation-of-material-request' }, ] frappe.help.help_links['Form/Material Request'] = [ - { label: 'Material Request', url: 'https://erpnext.com/docs/user/manual/en/stock/material-request' }, - { label: 'Auto-creation of Material Request', url: 'https://erpnext.com/docs/user/manual/en/stock/articles/auto-creation-of-material-request' }, + { label: 'Material Request', url: docsUrl + 'user/manual/en/stock/material-request' }, + { label: 'Auto-creation of Material Request', url: docsUrl + 'user/manual/en/stock/articles/auto-creation-of-material-request' }, ] frappe.help.help_links['Form/Stock Entry'] = [ - { label: 'Stock Entry', url: 'https://erpnext.com/docs/user/manual/en/stock/stock-entry' }, - { label: 'Stock Entry Types', url: 'https://erpnext.com/docs/user/manual/en/stock/articles/stock-entry-purpose' }, - { label: 'Repack Entry', url: 'https://erpnext.com/docs/user/manual/en/stock/articles/repack-entry' }, - { label: 'Opening Stock', url: 'https://erpnext.com/docs/user/manual/en/stock/opening-stock' }, - { label: 'Subcontracting', url: 'https://erpnext.com/docs/user/manual/en/manufacturing/subcontracting' }, + { label: 'Stock Entry', url: docsUrl + 'user/manual/en/stock/stock-entry' }, + { label: 'Stock Entry Types', url: docsUrl + 'user/manual/en/stock/articles/stock-entry-purpose' }, + { label: 'Repack Entry', url: docsUrl + 'user/manual/en/stock/articles/repack-entry' }, + { label: 'Opening Stock', url: docsUrl + 'user/manual/en/stock/opening-stock' }, + { label: 'Subcontracting', url: docsUrl + 'user/manual/en/manufacturing/subcontracting' }, ] frappe.help.help_links['List/Stock Entry'] = [ - { label: 'Stock Entry', url: 'https://erpnext.com/docs/user/manual/en/stock/stock-entry' }, + { label: 'Stock Entry', url: docsUrl + 'user/manual/en/stock/stock-entry' }, ] frappe.help.help_links['Tree/Warehouse'] = [ - { label: 'Warehouse', url: 'https://erpnext.com/docs/user/manual/en/stock/warehouse' }, + { label: 'Warehouse', url: docsUrl + 'user/manual/en/stock/warehouse' }, ] frappe.help.help_links['List/Serial No'] = [ - { label: 'Serial No', url: 'https://erpnext.com/docs/user/manual/en/stock/serial-no' }, + { label: 'Serial No', url: docsUrl + 'user/manual/en/stock/serial-no' }, ] frappe.help.help_links['Form/Serial No'] = [ - { label: 'Serial No', url: 'https://erpnext.com/docs/user/manual/en/stock/serial-no' }, + { label: 'Serial No', url: docsUrl + 'user/manual/en/stock/serial-no' }, ] frappe.help.help_links['Form/Batch'] = [ - { label: 'Batch', url: 'https://erpnext.com/docs/user/manual/en/stock/batch' }, + { label: 'Batch', url: docsUrl + 'user/manual/en/stock/batch' }, ] frappe.help.help_links['Form/Packing Slip'] = [ - { label: 'Packing Slip', url: 'https://erpnext.com/docs/user/manual/en/stock/tools/packing-slip' }, + { label: 'Packing Slip', url: docsUrl + 'user/manual/en/stock/tools/packing-slip' }, ] frappe.help.help_links['Form/Quality Inspection'] = [ - { label: 'Quality Inspection', url: 'https://erpnext.com/docs/user/manual/en/stock/tools/quality-inspection' }, + { label: 'Quality Inspection', url: docsUrl + 'user/manual/en/stock/tools/quality-inspection' }, ] frappe.help.help_links['Form/Landed Cost Voucher'] = [ - { label: 'Landed Cost Voucher', url: 'https://erpnext.com/docs/user/manual/en/stock/tools/landed-cost-voucher' }, + { label: 'Landed Cost Voucher', url: docsUrl + 'user/manual/en/stock/tools/landed-cost-voucher' }, ] frappe.help.help_links['Tree/Item Group'] = [ - { label: 'Item Group', url: 'https://erpnext.com/docs/user/manual/en/stock/setup/item-group' }, + { label: 'Item Group', url: docsUrl + 'user/manual/en/stock/setup/item-group' }, ] frappe.help.help_links['Form/Item Attribute'] = [ - { label: 'Item Attribute', url: 'https://erpnext.com/docs/user/manual/en/stock/setup/item-attribute' }, + { label: 'Item Attribute', url: docsUrl + 'user/manual/en/stock/setup/item-attribute' }, ] frappe.help.help_links['Form/UOM'] = [ - { label: 'Fractions in UOM', url: 'https://erpnext.com/docs/user/manual/en/stock/articles/managing-fractions-in-uom' }, + { label: 'Fractions in UOM', url: docsUrl + 'user/manual/en/stock/articles/managing-fractions-in-uom' }, ] frappe.help.help_links['Form/Stock Reconciliation'] = [ - { label: 'Opening Stock Entry', url: 'https://erpnext.com/docs/user/manual/en/stock/opening-stock' }, + { label: 'Opening Stock Entry', url: docsUrl + 'user/manual/en/stock/opening-stock' }, ] //CRM frappe.help.help_links['Form/Lead'] = [ - { label: 'Lead', url: 'https://erpnext.com/docs/user/manual/en/CRM/lead' }, + { label: 'Lead', url: docsUrl + 'user/manual/en/CRM/lead' }, ] frappe.help.help_links['Form/Opportunity'] = [ - { label: 'Opportunity', url: 'https://erpnext.com/docs/user/manual/en/CRM/opportunity' }, + { label: 'Opportunity', url: docsUrl + 'user/manual/en/CRM/opportunity' }, ] frappe.help.help_links['Form/Address'] = [ - { label: 'Address', url: 'https://erpnext.com/docs/user/manual/en/CRM/contact' }, + { label: 'Address', url: docsUrl + 'user/manual/en/CRM/contact' }, ] frappe.help.help_links['Form/Contact'] = [ - { label: 'Contact', url: 'https://erpnext.com/docs/user/manual/en/CRM/contact' }, + { label: 'Contact', url: docsUrl + 'user/manual/en/CRM/contact' }, ] frappe.help.help_links['Form/Newsletter'] = [ - { label: 'Newsletter', url: 'https://erpnext.com/docs/user/manual/en/CRM/newsletter' }, + { label: 'Newsletter', url: docsUrl + 'user/manual/en/CRM/newsletter' }, ] frappe.help.help_links['Form/Campaign'] = [ - { label: 'Campaign', url: 'https://erpnext.com/docs/user/manual/en/CRM/setup/campaign' }, + { label: 'Campaign', url: docsUrl + 'user/manual/en/CRM/setup/campaign' }, ] frappe.help.help_links['Tree/Sales Person'] = [ - { label: 'Sales Person', url: 'https://erpnext.com/docs/user/manual/en/CRM/setup/sales-person' }, + { label: 'Sales Person', url: docsUrl + 'user/manual/en/CRM/setup/sales-person' }, ] frappe.help.help_links['Form/Sales Person'] = [ - { label: 'Sales Person Target', url: 'https://erpnext.com/docs/user/manual/en/selling/setup/sales-person-target-allocation' }, + { label: 'Sales Person Target', url: docsUrl + 'user/manual/en/selling/setup/sales-person-target-allocation' }, ] //Support frappe.help.help_links['List/Feedback Trigger'] = [ - { label: 'Feedback Trigger', url: 'https://erpnext.com/docs/user/manual/en/setting-up/feedback/setting-up-feedback' }, + { label: 'Feedback Trigger', url: docsUrl + 'user/manual/en/setting-up/feedback/setting-up-feedback' }, ] frappe.help.help_links['List/Feedback Request'] = [ - { label: 'Feedback Request', url: 'https://erpnext.com/docs/user/manual/en/setting-up/feedback/submit-feedback' }, + { label: 'Feedback Request', url: docsUrl + 'user/manual/en/setting-up/feedback/submit-feedback' }, ] frappe.help.help_links['List/Feedback Request'] = [ - { label: 'Feedback Request', url: 'https://erpnext.com/docs/user/manual/en/setting-up/feedback/submit-feedback' }, + { label: 'Feedback Request', url: docsUrl + 'user/manual/en/setting-up/feedback/submit-feedback' }, ] //Manufacturing frappe.help.help_links['Form/BOM'] = [ - { label: 'Bill of Material', url: 'https://erpnext.com/docs/user/manual/en/manufacturing/bill-of-materials' }, - { label: 'Nested BOM Structure', url: 'https://erpnext.com/docs/user/manual/en/manufacturing/articles/nested-bom-structure' }, + { label: 'Bill of Material', url: docsUrl + 'user/manual/en/manufacturing/bill-of-materials' }, + { label: 'Nested BOM Structure', url: docsUrl + 'user/manual/en/manufacturing/articles/nested-bom-structure' }, ] frappe.help.help_links['Form/Work Order'] = [ - { label: 'Work Order', url: 'https://erpnext.com/docs/user/manual/en/manufacturing/work-order' }, + { label: 'Work Order', url: docsUrl + 'user/manual/en/manufacturing/work-order' }, ] frappe.help.help_links['Form/Workstation'] = [ - { label: 'Workstation', url: 'https://erpnext.com/docs/user/manual/en/manufacturing/workstation' }, + { label: 'Workstation', url: docsUrl + 'user/manual/en/manufacturing/workstation' }, ] frappe.help.help_links['Form/Operation'] = [ - { label: 'Operation', url: 'https://erpnext.com/docs/user/manual/en/manufacturing/operation' }, + { label: 'Operation', url: docsUrl + 'user/manual/en/manufacturing/operation' }, ] frappe.help.help_links['Form/BOM Update Tool'] = [ - { label: 'BOM Update Tool', url: 'https://erpnext.com/docs/user/manual/en/manufacturing/tools/bom-update-tool' }, + { label: 'BOM Update Tool', url: docsUrl + 'user/manual/en/manufacturing/tools/bom-update-tool' }, ] //Customize frappe.help.help_links['Form/Customize Form'] = [ - { label: 'Custom Field', url: 'https://erpnext.com/docs/user/manual/en/customize-erpnext/custom-field' }, - { label: 'Customize Field', url: 'https://erpnext.com/docs/user/manual/en/customize-erpnext/customize-form' }, + { label: 'Custom Field', url: docsUrl + 'user/manual/en/customize-erpnext/custom-field' }, + { label: 'Customize Field', url: docsUrl + 'user/manual/en/customize-erpnext/customize-form' }, ] frappe.help.help_links['Form/Custom Field'] = [ - { label: 'Custom Field', url: 'https://erpnext.com/docs/user/manual/en/customize-erpnext/custom-field' }, + { label: 'Custom Field', url: docsUrl + 'user/manual/en/customize-erpnext/custom-field' }, ] frappe.help.help_links['Form/Custom Field'] = [ - { label: 'Custom Field', url: 'https://erpnext.com/docs/user/manual/en/customize-erpnext/custom-field' }, + { label: 'Custom Field', url: docsUrl + 'user/manual/en/customize-erpnext/custom-field' }, ] \ No newline at end of file From d71de2a23e1dd3d1f7a3b866f8b0a73a90207cf5 Mon Sep 17 00:00:00 2001 From: scmmishra Date: Fri, 25 Jan 2019 14:27:23 +0530 Subject: [PATCH 54/86] [fix] Code formatting, removed trailing spaces --- erpnext/public/js/help_links.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/erpnext/public/js/help_links.js b/erpnext/public/js/help_links.js index d3cc688cd2..23e7deb6e9 100644 --- a/erpnext/public/js/help_links.js +++ b/erpnext/public/js/help_links.js @@ -1,6 +1,6 @@ frappe.provide('frappe.help.help_links'); -const docsUrl = 'https://erpnext.com/docs/' +const docsUrl = 'https://erpnext.com/docs/'; frappe.help.help_links['Form/Rename Tool'] = [ { label: 'Bulk Rename', url: docsUrl + 'user/manual/en/setting-up/data/bulk-rename' }, @@ -320,12 +320,12 @@ frappe.help.help_links['Tree/Cost Center'] = [ frappe.help.help_links['List/Item'] = [ { label: 'Item', url: 'http://erpnext.com/docs/user/manual/en/stock/item' }, - { label: 'Item Price', url: docsUrl + 'user/manual/en/stock/item/item-price' }, + { label: 'Item Price', url: docsUrl + 'user/manual/en/stock/item/item-price' }, { label: 'Barcode', url: docsUrl + 'user/manual/en/stock/articles/track-items-using-barcode' }, { label: 'Item Wise Taxation', url: docsUrl + 'user/manual/en/accounts/item-wise-taxation' }, { label: 'Managing Fixed Assets', url: docsUrl + 'user/manual/en/accounts/managing-fixed-assets' }, { label: 'Item Codification', url: docsUrl + 'user/manual/en/stock/item/item-codification' }, - { label: 'Item Variants', url: docsUrl + 'user/manual/en/stock/item/item-variants' }, + { label: 'Item Variants', url: docsUrl + 'user/manual/en/stock/item/item-variants' }, { label: 'Item Valuation', url: docsUrl + 'user/manual/en/stock/item/item-valuation-fifo-and-moving-average' }, ] @@ -336,8 +336,8 @@ frappe.help.help_links['Form/Item'] = [ { label: 'Item Wise Taxation', url: docsUrl + 'user/manual/en/accounts/item-wise-taxation' }, { label: 'Managing Fixed Assets', url: docsUrl + 'user/manual/en/accounts/managing-fixed-assets' }, { label: 'Item Codification', url: docsUrl + 'user/manual/en/stock/item/item-codification' }, - { label: 'Item Variants', url: docsUrl + 'user/manual/en/stock/item/item-variants' }, - { label: 'Item Valuation', url: docsUrl + 'user/manual/en/stock/item/item-valuation-fifo-and-moving-average' }, + { label: 'Item Variants', url: docsUrl + 'user/manual/en/stock/item/item-variants' }, + { label: 'Item Valuation', url: docsUrl + 'user/manual/en/stock/item/item-valuation-fifo-and-moving-average' }, ] frappe.help.help_links['List/Purchase Receipt'] = [ From f44dfb158287726d0f60613796855f1404e6917d Mon Sep 17 00:00:00 2001 From: scmmishra Date: Fri, 25 Jan 2019 14:56:30 +0530 Subject: [PATCH 55/86] [fix] Formatting issues --- erpnext/public/js/help_links.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/public/js/help_links.js b/erpnext/public/js/help_links.js index 23e7deb6e9..458276eceb 100644 --- a/erpnext/public/js/help_links.js +++ b/erpnext/public/js/help_links.js @@ -326,12 +326,12 @@ frappe.help.help_links['List/Item'] = [ { label: 'Managing Fixed Assets', url: docsUrl + 'user/manual/en/accounts/managing-fixed-assets' }, { label: 'Item Codification', url: docsUrl + 'user/manual/en/stock/item/item-codification' }, { label: 'Item Variants', url: docsUrl + 'user/manual/en/stock/item/item-variants' }, - { label: 'Item Valuation', url: docsUrl + 'user/manual/en/stock/item/item-valuation-fifo-and-moving-average' }, + { label: 'Item Valuation', url: docsUrl + 'user/manual/en/stock/item/item-valuation-fifo-and-moving-average' }, ] frappe.help.help_links['Form/Item'] = [ { label: 'Item', url: 'http://erpnext.com/docs/user/manual/en/stock/item' }, - { label: 'Item Price', url: docsUrl + 'user/manual/en/stock/item/item-price' }, + { label: 'Item Price', url: docsUrl + 'user/manual/en/stock/item/item-price' }, { label: 'Barcode', url: docsUrl + 'user/manual/en/stock/articles/track-items-using-barcode' }, { label: 'Item Wise Taxation', url: docsUrl + 'user/manual/en/accounts/item-wise-taxation' }, { label: 'Managing Fixed Assets', url: docsUrl + 'user/manual/en/accounts/managing-fixed-assets' }, From 67c338fd51f46ef263c3ab9cb0ba49854f32e8a5 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 25 Jan 2019 15:17:44 +0530 Subject: [PATCH 56/86] [fix] Fixed links Previous commit missed the links starting with `http://` --- erpnext/public/js/help_links.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/public/js/help_links.js b/erpnext/public/js/help_links.js index 458276eceb..17b726ee18 100644 --- a/erpnext/public/js/help_links.js +++ b/erpnext/public/js/help_links.js @@ -254,7 +254,7 @@ frappe.help.help_links['List/Company'] = [ //Accounts frappe.help.help_links['modules/Accounts'] = [ - { label: 'Introduction to Accounts', url: 'http://erpnext.com/docs/user/manual/en/accounts/' }, + { label: 'Introduction to Accounts', url: docsUrl + 'user/manual/en/accounts/' }, { label: 'Chart of Accounts', url: docsUrl + 'user/manual/en/accounts/chart-of-accounts.html' }, { label: 'Multi Currency Accounting', url: docsUrl + 'user/manual/en/accounts/multi-currency-accounting' }, ] @@ -319,7 +319,7 @@ frappe.help.help_links['Tree/Cost Center'] = [ ] frappe.help.help_links['List/Item'] = [ - { label: 'Item', url: 'http://erpnext.com/docs/user/manual/en/stock/item' }, + { label: 'Item', url: docsUrl + 'user/manual/en/stock/item' }, { label: 'Item Price', url: docsUrl + 'user/manual/en/stock/item/item-price' }, { label: 'Barcode', url: docsUrl + 'user/manual/en/stock/articles/track-items-using-barcode' }, { label: 'Item Wise Taxation', url: docsUrl + 'user/manual/en/accounts/item-wise-taxation' }, @@ -330,7 +330,7 @@ frappe.help.help_links['List/Item'] = [ ] frappe.help.help_links['Form/Item'] = [ - { label: 'Item', url: 'http://erpnext.com/docs/user/manual/en/stock/item' }, + { label: 'Item', url: docsUrl + 'user/manual/en/stock/item' }, { label: 'Item Price', url: docsUrl + 'user/manual/en/stock/item/item-price' }, { label: 'Barcode', url: docsUrl + 'user/manual/en/stock/articles/track-items-using-barcode' }, { label: 'Item Wise Taxation', url: docsUrl + 'user/manual/en/accounts/item-wise-taxation' }, @@ -523,4 +523,4 @@ frappe.help.help_links['Form/Custom Field'] = [ frappe.help.help_links['Form/Custom Field'] = [ { label: 'Custom Field', url: docsUrl + 'user/manual/en/customize-erpnext/custom-field' }, -] \ No newline at end of file +] From 3476a457ad8448cc5648d3027d76fb0a97cc4c5c Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 25 Jan 2019 16:22:36 +0530 Subject: [PATCH 57/86] fix: minor --- erpnext/accounts/deferred_revenue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/deferred_revenue.py b/erpnext/accounts/deferred_revenue.py index 2ff2644d18..9ff8b04281 100644 --- a/erpnext/accounts/deferred_revenue.py +++ b/erpnext/accounts/deferred_revenue.py @@ -29,7 +29,7 @@ def validate_service_stop_date(doc): if date_diff(item.service_stop_date, item.service_end_date) > 0: frappe.throw(_("Service Stop Date cannot be after Service End Date")) - if old_stop_dates and old_stop_dates[item.name] and item.service_stop_date!=old_stop_dates[item.name]: + if old_stop_dates and old_stop_dates.get(item.name) and item.service_stop_date!=old_stop_dates[item.name]: frappe.throw(_("Cannot change Service Stop Date for item in row {0}".format(item.idx))) def convert_deferred_expense_to_expense(start_date=None, end_date=None): From 01ca3e5e362f05bc80884ce5c2198f00f1d9a2d1 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 25 Jan 2019 16:25:15 +0530 Subject: [PATCH 58/86] fix(manufacturing): Get raw materials rate from price list ignoring party --- erpnext/manufacturing/doctype/bom/bom.py | 7 +++++-- erpnext/stock/get_item_details.py | 23 +++++++++++++---------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py index 57a1cc2593..2317634cfc 100644 --- a/erpnext/manufacturing/doctype/bom/bom.py +++ b/erpnext/manufacturing/doctype/bom/bom.py @@ -189,7 +189,8 @@ class BOM(WebsiteGenerator): "currency": self.currency, "conversion_rate": self.conversion_rate or 1, "conversion_factor": arg.get("conversion_factor") or 1, - "plc_conversion_rate": 1 + "plc_conversion_rate": 1, + "ignore_party": True }) item_doc = frappe.get_doc("Item", arg.get("item_code")) out = frappe._dict() @@ -213,7 +214,7 @@ class BOM(WebsiteGenerator): existing_bom_cost = self.total_cost for d in self.get("items"): - d.rate = self.get_rm_rate({ + rate = self.get_rm_rate({ "item_code": d.item_code, "bom_no": d.bom_no, "qty": d.qty, @@ -221,6 +222,8 @@ class BOM(WebsiteGenerator): "stock_uom": d.stock_uom, "conversion_factor": d.conversion_factor }) + if rate: + d.rate = rate d.amount = flt(d.rate) * flt(d.qty) if self.docstatus == 1: diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index 9db04cd0ab..e1607a927f 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -424,7 +424,7 @@ def insert_item_price(args): frappe.msgprint(_("Item Price added for {0} in Price List {1}").format(args.item_code, args.price_list), alert=True) -def get_item_price(args, item_code): +def get_item_price(args, item_code, ignore_party=False): """ Get name, price_list_rate from Item Price based on conditions Check if the Derised qty is within the increment of the packing list. @@ -434,17 +434,20 @@ def get_item_price(args, item_code): """ args['item_code'] = item_code - conditions = "where (customer is null or customer = '') and (supplier is null or supplier = '')" - if args.get("customer"): - conditions = "where customer=%(customer)s" - if args.get("supplier"): - conditions = "where supplier=%(supplier)s" - - conditions += """ and item_code=%(item_code)s + conditions = """where item_code=%(item_code)s and price_list=%(price_list)s and ifnull(uom, '') in ('', %(uom)s)""" + if not ignore_party: + conditions += " and (customer is null or customer = '') and (supplier is null or supplier = '')" + if args.get("customer"): + conditions += " and customer=%(customer)s" + + if args.get("supplier"): + conditions += " and supplier=%(supplier)s" + + if args.get('min_qty'): conditions += " and ifnull(min_qty, 0) <= %(min_qty)s" @@ -490,10 +493,10 @@ def get_price_list_rate_for(args, item_code): for field in ["customer", "supplier", "min_qty"]: del item_price_args[field] - general_price_list_rate = get_item_price(item_price_args, item_code) + general_price_list_rate = get_item_price(item_price_args, item_code, ignore_party=args.get("ignore_party")) if not general_price_list_rate and args.get("uom") != args.get("stock_uom"): item_price_args["args"] = args.get("stock_uom") - general_price_list_rate = get_item_price(item_price_args, item_code) + general_price_list_rate = get_item_price(item_price_args, item_code, ignore_party=args.get("ignore_party")) if general_price_list_rate: item_price_data = general_price_list_rate From 49cca7ac76f85f1e7449468d1fb6dae0cb249899 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Fri, 25 Jan 2019 16:41:01 +0530 Subject: [PATCH 59/86] fix: Customer based price_list in online POS --- erpnext/public/js/controllers/transaction.js | 2 +- erpnext/selling/page/point_of_sale/point_of_sale.js | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index 4ef8b2e8be..20e1098806 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -477,7 +477,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ var me = this; var item = frappe.get_doc(cdt, cdn); - if (item.serial_no) { + if (item && item.serial_no) { if (!item.item_code) { this.frm.trigger("item_code", cdt, cdn); } diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.js b/erpnext/selling/page/point_of_sale/point_of_sale.js index 1ee5971271..8b4d684466 100644 --- a/erpnext/selling/page/point_of_sale/point_of_sale.js +++ b/erpnext/selling/page/point_of_sale/point_of_sale.js @@ -164,6 +164,12 @@ erpnext.pos.PointOfSale = class PointOfSale { } } }); + + frappe.ui.form.on('Sales Invoice', 'selling_price_list', (frm) => { + if(this.items) { + this.items.reset_items(); + } + }) } toggle_editing(flag) { @@ -1384,6 +1390,7 @@ class POSItems { } get_items({start = 0, page_length = 40, search_value='', item_group=this.parent_item_group}={}) { + const price_list = this.frm.doc.selling_price_list; return new Promise(res => { frappe.call({ method: "erpnext.selling.page.point_of_sale.point_of_sale.get_items", @@ -1391,10 +1398,10 @@ class POSItems { args: { start, page_length, - 'price_list': this.frm.doc.selling_price_list, + price_list, item_group, search_value, - 'pos_profile': this.frm.doc.pos_profile + pos_profile: this.frm.doc.pos_profile } }).then(r => { // const { items, serial_no, batch_no } = r.message; From 8c84b7b8884746966b735a187d681c4253eef6ed Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Fri, 25 Jan 2019 16:44:45 +0530 Subject: [PATCH 60/86] fix: Doctype Name correction --- erpnext/accounts/party.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py index f412506a7c..5855ac3bcd 100644 --- a/erpnext/accounts/party.py +++ b/erpnext/accounts/party.py @@ -163,7 +163,7 @@ def set_price_list(out, party, party_type, given_price_list, pos=None): if customer_price_list: price_list = customer_price_list else: - pos_price_list = frappe.get_value('Pos Profile', pos, 'selling_price_list') + pos_price_list = frappe.get_value('POS Profile', pos, 'selling_price_list') price_list = pos_price_list or given_price_list else: price_list = get_default_price_list(party) or given_price_list From 1187d61b5663d81efc1a4b8ef160c290defaf394 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 25 Jan 2019 17:07:29 +0530 Subject: [PATCH 61/86] fix(stock): Escaping issue in stock ledger report --- .../stock/report/stock_ledger/stock_ledger.py | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py index 578000bfa1..ef9fbe41c0 100644 --- a/erpnext/stock/report/stock_ledger/stock_ledger.py +++ b/erpnext/stock/report/stock_ledger/stock_ledger.py @@ -110,16 +110,22 @@ def get_item_details(items, sl_entries, include_uom): cf_field = cf_join = "" if include_uom: cf_field = ", ucd.conversion_factor" - cf_join = "left join `tabUOM Conversion Detail` ucd on ucd.parent=item.name and ucd.uom=%(include_uom)s" + cf_join = "left join `tabUOM Conversion Detail` ucd on ucd.parent=item.name and ucd.uom='%s'" \ + % frappe.db.escape(include_uom) - for item in frappe.db.sql(""" - select item.name, item.item_name, item.description, item.item_group, item.brand, item.stock_uom{cf_field} - from `tabItem` item - {cf_join} - where item.name in ({names}) - """.format(cf_field=cf_field, cf_join=cf_join, names=', '.join(['"' + frappe.db.escape(i, percent=False) + '"' for i in items])), - {"include_uom": include_uom}, as_dict=1): - item_details.setdefault(item.name, item) + item_codes = ', '.join(['"' + frappe.db.escape(i, percent=False) + '"' for i in items]) + res = frappe.db.sql(""" + select + item.name, item.item_name, item.description, item.item_group, item.brand, item.stock_uom {cf_field} + from + `tabItem` item + {cf_join} + where + item.name in ({item_codes}) + """.format(cf_field=cf_field, cf_join=cf_join, item_codes=item_codes), as_dict=1) + + for item in res: + item_details.setdefault(item.name, item) return item_details From c6c1628c8a4363fdcda2e6dadb84cf7cf6670276 Mon Sep 17 00:00:00 2001 From: scmmishra Date: Mon, 21 Jan 2019 19:35:46 +0530 Subject: [PATCH 62/86] [feat] Modified help config --- erpnext/public/js/conf.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/public/js/conf.js b/erpnext/public/js/conf.js index d256c08e13..040726957b 100644 --- a/erpnext/public/js/conf.js +++ b/erpnext/public/js/conf.js @@ -14,7 +14,7 @@ $(document).bind('toolbar_setup', function() { $('.navbar-home').html(''); - $('[data-link="docs"]').attr("href", "https://frappe.github.io/erpnext/") + $('[data-link="docs"]').attr("href", "https://erpnext.com/docs") $('[data-link="issues"]').attr("href", "https://github.com/frappe/erpnext/issues") @@ -23,7 +23,8 @@ $(document).bind('toolbar_setup', function() { // additional help links for erpnext var $help_menu = $('.dropdown-help ul .documentation-links'); - + $('
  • '+__('Documentation')+'
    • ').insertBefore($help_menu); $('
  • '+__('User Forum')+'
    • ').insertBefore($help_menu); $('
  • Date: Fri, 25 Jan 2019 12:56:27 +0530 Subject: [PATCH 63/86] [fix] Links now redirect to erpnext.com --- README.md | 2 +- erpnext/change_log/v6/v6_13_1.md | 2 +- erpnext/hooks.py | 2 -- erpnext/public/js/conf.js | 2 +- .../page/welcome_to_erpnext/welcome_to_erpnext.html | 2 +- erpnext/utilities/user_progress.py | 10 +++++----- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 74ea7fc8a5..d719873c76 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Includes: Accounting, Inventory, Manufacturing, CRM, Sales, Purchase, Project Ma ERPNext is built on the [Frappé](https://github.com/frappe/frappe) Framework, a full-stack web app framework in Python & JavaScript. -- [User Guide](https://erpnext.org/docs/user) +- [User Guide](https://erpnext.com/docs/user) - [Discussion Forum](https://discuss.erpnext.com/) --- diff --git a/erpnext/change_log/v6/v6_13_1.md b/erpnext/change_log/v6/v6_13_1.md index 4b2c4a9cca..d5a930e3b9 100644 --- a/erpnext/change_log/v6/v6_13_1.md +++ b/erpnext/change_log/v6/v6_13_1.md @@ -1 +1 @@ -- [ERPNext Manual in German](http://erpnext.org/docs/user/manual/de/) contributed by [CWT Connector & Wire Technology GmbH](http://www.cwt-assembly.com/) +- [ERPNext Manual in German](http://erpnext.com/docs/user/manual/de/) contributed by [CWT Connector & Wire Technology GmbH](http://www.cwt-assembly.com/) diff --git a/erpnext/hooks.py b/erpnext/hooks.py index ee31e32a3b..5f1e7d4243 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -15,8 +15,6 @@ develop_version = '10.x.x-develop' error_report_email = "support@erpnext.com" -docs_app = "foundation" - app_include_js = "assets/js/erpnext.min.js" app_include_css = "assets/css/erpnext.css" web_include_js = "assets/js/erpnext-web.min.js" diff --git a/erpnext/public/js/conf.js b/erpnext/public/js/conf.js index 040726957b..32cf065169 100644 --- a/erpnext/public/js/conf.js +++ b/erpnext/public/js/conf.js @@ -23,7 +23,7 @@ $(document).bind('toolbar_setup', function() { // additional help links for erpnext var $help_menu = $('.dropdown-help ul .documentation-links'); - $('
  • '+__('Documentation')+'
    • ').insertBefore($help_menu); $('
  • '+__('User Forum')+'
    • ').insertBefore($help_menu); diff --git a/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html b/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html index 57fce28eeb..5808ce73ee 100644 --- a/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +++ b/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html @@ -22,7 +22,7 @@ diff --git a/erpnext/utilities/user_progress.py b/erpnext/utilities/user_progress.py index 9f5935e3cb..a6b5b49f08 100644 --- a/erpnext/utilities/user_progress.py +++ b/erpnext/utilities/user_progress.py @@ -33,7 +33,7 @@ def get_slide_settings(): help_links=[ { "label": _("Chart of Accounts"), - "url": ["https://erpnext.org/docs/user/manual/en/accounts/chart-of-accounts"] + "url": ["https://erpnext.com/docs/user/manual/en/accounts/chart-of-accounts"] }, { "label": _("Opening Balances"), @@ -56,7 +56,7 @@ def get_slide_settings(): help_links=[ { "label": _('Learn More'), - "url": ["https://erpnext.org/docs/user/manual/en/setting-up/setting-company-sales-goal"] + "url": ["https://erpnext.com/docs/user/manual/en/setting-up/setting-company-sales-goal"] } ] ), @@ -80,7 +80,7 @@ def get_slide_settings(): help_links=[ { "label": _('Learn More'), - "url": ["https://erpnext.org/docs/user/manual/en/CRM/customer.html"] + "url": ["https://erpnext.com/docs/user/manual/en/CRM/customer.html"] } ] ), @@ -123,7 +123,7 @@ def get_slide_settings(): help_links=[ { "label": _('Learn More'), - "url": ["https://erpnext.org/docs/user/manual/en/buying/supplier"] + "url": ["https://erpnext.com/docs/user/manual/en/buying/supplier"] }, { "label": _('Customers and Suppliers'), @@ -261,7 +261,7 @@ def get_slide_settings(): help_links=[ { "label": _('Learn More'), - "url": ["https://erpnext.org/docs/user/manual/en/setting-up/users-and-permissions"] + "url": ["https://erpnext.com/docs/user/manual/en/setting-up/users-and-permissions"] }, { "label": _('Users and Permissions'), From 000e2163548e6cb26f5d98e7c2475c06dcb6d2f2 Mon Sep 17 00:00:00 2001 From: scmmishra Date: Fri, 25 Jan 2019 13:14:11 +0530 Subject: [PATCH 64/86] [feat] Added docsUrl variable to configure help_links --- erpnext/public/js/help_links.js | 368 ++++++++++++++++---------------- 1 file changed, 183 insertions(+), 185 deletions(-) diff --git a/erpnext/public/js/help_links.js b/erpnext/public/js/help_links.js index d8af0e516d..d3cc688cd2 100644 --- a/erpnext/public/js/help_links.js +++ b/erpnext/public/js/help_links.js @@ -1,528 +1,526 @@ frappe.provide('frappe.help.help_links'); +const docsUrl = 'https://erpnext.com/docs/' + frappe.help.help_links['Form/Rename Tool'] = [ - { label: 'Bulk Rename', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/data/bulk-rename' }, + { label: 'Bulk Rename', url: docsUrl + 'user/manual/en/setting-up/data/bulk-rename' }, ] //Setup frappe.help.help_links['List/User'] = [ - { label: 'New User', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/users-and-permissions/adding-users' }, - { label: 'Rename User', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/rename-user' }, + { label: 'New User', url: docsUrl + 'user/manual/en/setting-up/users-and-permissions/adding-users' }, + { label: 'Rename User', url: docsUrl + 'user/manual/en/setting-up/articles/rename-user' }, ] frappe.help.help_links['permission-manager'] = [ - { label: 'Role Permissions Manager', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/users-and-permissions/role-based-permissions' }, - { label: 'Managing Perm Level in Permissions Manager', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/managing-perm-level' }, - { label: 'User Permissions', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/users-and-permissions/user-permissions' }, - { label: 'Sharing', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/users-and-permissions/sharing' }, - { label: 'Password', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/change-password' }, + { label: 'Role Permissions Manager', url: docsUrl + 'user/manual/en/setting-up/users-and-permissions/role-based-permissions' }, + { label: 'Managing Perm Level in Permissions Manager', url: docsUrl + 'user/manual/en/setting-up/articles/managing-perm-level' }, + { label: 'User Permissions', url: docsUrl + 'user/manual/en/setting-up/users-and-permissions/user-permissions' }, + { label: 'Sharing', url: docsUrl + 'user/manual/en/setting-up/users-and-permissions/sharing' }, + { label: 'Password', url: docsUrl + 'user/manual/en/setting-up/articles/change-password' }, ] frappe.help.help_links['Form/System Settings'] = [ - { label: 'Naming Series', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/settings/system-settings' }, + { label: 'Naming Series', url: docsUrl + 'user/manual/en/setting-up/settings/system-settings' }, ] frappe.help.help_links['data-import-tool'] = [ - { label: 'Importing and Exporting Data', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/data/data-import-tool' }, - { label: 'Overwriting Data from Data Import Tool', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool' }, + { label: 'Importing and Exporting Data', url: docsUrl + 'user/manual/en/setting-up/data/data-import-tool' }, + { label: 'Overwriting Data from Data Import Tool', url: docsUrl + 'user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool' }, ] frappe.help.help_links['module_setup'] = [ - { label: 'Role Permissions Manager', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/users-and-permissions/role-based-permissions' }, + { label: 'Role Permissions Manager', url: docsUrl + 'user/manual/en/setting-up/users-and-permissions/role-based-permissions' }, ] frappe.help.help_links['Form/Naming Series'] = [ - { label: 'Naming Series', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/settings/naming-series' }, - { label: 'Setting the Current Value for Naming Series', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/naming-series-current-value' }, + { label: 'Naming Series', url: docsUrl + 'user/manual/en/setting-up/settings/naming-series' }, + { label: 'Setting the Current Value for Naming Series', url: docsUrl + 'user/manual/en/setting-up/articles/naming-series-current-value' }, ] frappe.help.help_links['Form/Global Defaults'] = [ - { label: 'Global Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/settings/global-defaults' }, + { label: 'Global Settings', url: docsUrl + 'user/manual/en/setting-up/settings/global-defaults' }, ] frappe.help.help_links['Form/Email Digest'] = [ - { label: 'Email Digest', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/email/email-digest' }, + { label: 'Email Digest', url: docsUrl + 'user/manual/en/setting-up/email/email-digest' }, ] frappe.help.help_links['List/Print Heading'] = [ - { label: 'Print Heading', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/print/print-headings' }, + { label: 'Print Heading', url: docsUrl + 'user/manual/en/setting-up/print/print-headings' }, ] frappe.help.help_links['List/Letter Head'] = [ - { label: 'Letter Head', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/print/letter-head' }, + { label: 'Letter Head', url: docsUrl + 'user/manual/en/setting-up/print/letter-head' }, ] frappe.help.help_links['List/Address Template'] = [ - { label: 'Address Template', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/print/address-template' }, + { label: 'Address Template', url: docsUrl + 'user/manual/en/setting-up/print/address-template' }, ] frappe.help.help_links['List/Terms and Conditions'] = [ - { label: 'Terms and Conditions', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/print/terms-and-conditions' }, + { label: 'Terms and Conditions', url: docsUrl + 'user/manual/en/setting-up/print/terms-and-conditions' }, ] frappe.help.help_links['List/Cheque Print Template'] = [ - { label: 'Cheque Print Template', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/print/cheque-print-template' }, + { label: 'Cheque Print Template', url: docsUrl + 'user/manual/en/setting-up/print/cheque-print-template' }, ] frappe.help.help_links['List/Email Account'] = [ - { label: 'Email Account', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/email/email-account' }, + { label: 'Email Account', url: docsUrl + 'user/manual/en/setting-up/email/email-account' }, ] -frappe.help.help_links['List/Email Alert'] = [ - { label: 'Email Alert', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/email/email-alerts' }, +frappe.help.help_links['List/Notification'] = [ + { label: 'Notification', url: docsUrl + 'user/manual/en/setting-up/email/notifications' }, ] -frappe.help.help_links['Form/Email Alert'] = [ - { label: 'Email Alert', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/email/email-alerts' }, +frappe.help.help_links['Form/Notification'] = [ + { label: 'Notification', url: docsUrl + 'user/manual/en/setting-up/email/notifications' }, ] frappe.help.help_links['List/Email Digest'] = [ - { label: 'Email Digest', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/email/email-digest' }, + { label: 'Email Digest', url: docsUrl + 'user/manual/en/setting-up/email/email-digest' }, ] frappe.help.help_links['List/Auto Email Report'] = [ - { label: 'Auto Email Reports', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/email/email-reports' }, + { label: 'Auto Email Reports', url: docsUrl + 'user/manual/en/setting-up/email/email-reports' }, ] frappe.help.help_links['Form/Print Settings'] = [ - { label: 'Print Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/print/print-settings' }, + { label: 'Print Settings', url: docsUrl + 'user/manual/en/setting-up/print/print-settings' }, ] frappe.help.help_links['print-format-builder'] = [ - { label: 'Print Format Builder', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/print/print-settings' }, + { label: 'Print Format Builder', url: docsUrl + 'user/manual/en/setting-up/print/print-settings' }, ] frappe.help.help_links['List/Print Heading'] = [ - { label: 'Print Heading', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/print/print-headings' }, + { label: 'Print Heading', url: docsUrl + 'user/manual/en/setting-up/print/print-headings' }, ] //setup-integrations frappe.help.help_links['Form/PayPal Settings'] = [ - { label: 'PayPal Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/integrations/paypal-integration' }, + { label: 'PayPal Settings', url: docsUrl + 'user/manual/en/setting-up/integrations/paypal-integration' }, ] frappe.help.help_links['Form/Razorpay Settings'] = [ - { label: 'Razorpay Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/integrations/razorpay-integration' }, + { label: 'Razorpay Settings', url: docsUrl + 'user/manual/en/setting-up/integrations/razorpay-integration' }, ] frappe.help.help_links['Form/Dropbox Settings'] = [ - { label: 'Dropbox Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/integrations/dropbox-backup' }, + { label: 'Dropbox Settings', url: docsUrl + 'user/manual/en/setting-up/integrations/dropbox-backup' }, ] frappe.help.help_links['Form/LDAP Settings'] = [ - { label: 'LDAP Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/integrations/ldap-integration' }, + { label: 'LDAP Settings', url: docsUrl + 'user/manual/en/setting-up/integrations/ldap-integration' }, ] frappe.help.help_links['Form/Stripe Settings'] = [ - { label: 'Stripe Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/integrations/stripe-integration' }, + { label: 'Stripe Settings', url: docsUrl + 'user/manual/en/setting-up/integrations/stripe-integration' }, ] //Sales frappe.help.help_links['Form/Quotation'] = [ - { label: 'Quotation', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/quotation' }, - { label: 'Applying Discount', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/applying-discount' }, - { label: 'Sales Person', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions' }, - { label: 'Applying Margin', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/adding-margin' }, + { label: 'Quotation', url: docsUrl + 'user/manual/en/selling/quotation' }, + { label: 'Applying Discount', url: docsUrl + 'user/manual/en/selling/articles/applying-discount' }, + { label: 'Sales Person', url: docsUrl + 'user/manual/en/selling/articles/sales-persons-in-the-sales-transactions' }, + { label: 'Applying Margin', url: docsUrl + 'user/manual/en/selling/articles/adding-margin' }, ] frappe.help.help_links['List/Customer'] = [ - { label: 'Customer', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/customer' }, - { label: 'Credit Limit', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/credit-limit' }, + { label: 'Customer', url: docsUrl + 'user/manual/en/CRM/customer' }, + { label: 'Credit Limit', url: docsUrl + 'user/manual/en/accounts/credit-limit' }, ] frappe.help.help_links['Form/Customer'] = [ - { label: 'Customer', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/customer' }, - { label: 'Credit Limit', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/credit-limit' }, + { label: 'Customer', url: docsUrl + 'user/manual/en/CRM/customer' }, + { label: 'Credit Limit', url: docsUrl + 'user/manual/en/accounts/credit-limit' }, ] frappe.help.help_links['List/Sales Taxes and Charges Template'] = [ - { label: 'Setting Up Taxes', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/setting-up-taxes' }, + { label: 'Setting Up Taxes', url: docsUrl + 'user/manual/en/setting-up/setting-up-taxes' }, ] frappe.help.help_links['Form/Sales Taxes and Charges Template'] = [ - { label: 'Setting Up Taxes', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/setting-up-taxes' }, + { label: 'Setting Up Taxes', url: docsUrl + 'user/manual/en/setting-up/setting-up-taxes' }, ] frappe.help.help_links['List/Sales Order'] = [ - { label: 'Sales Order', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/sales-order' }, - { label: 'Recurring Sales Order', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/recurring-orders-and-invoices' }, - { label: 'Applying Discount', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/applying-discount' }, + { label: 'Sales Order', url: docsUrl + 'user/manual/en/selling/sales-order' }, + { label: 'Recurring Sales Order', url: docsUrl + 'user/manual/en/accounts/recurring-orders-and-invoices' }, + { label: 'Applying Discount', url: docsUrl + 'user/manual/en/selling/articles/applying-discount' }, ] frappe.help.help_links['Form/Sales Order'] = [ - { label: 'Sales Order', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/sales-order' }, - { label: 'Recurring Sales Order', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/recurring-orders-and-invoices' }, - { label: 'Applying Discount', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/applying-discount' }, - { label: 'Drop Shipping', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/drop-shipping' }, - { label: 'Sales Person', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions' }, - { label: 'Close Sales Order', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/close-sales-order' }, - { label: 'Applying Margin', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/adding-margin' }, + { label: 'Sales Order', url: docsUrl + 'user/manual/en/selling/sales-order' }, + { label: 'Recurring Sales Order', url: docsUrl + 'user/manual/en/accounts/recurring-orders-and-invoices' }, + { label: 'Applying Discount', url: docsUrl + 'user/manual/en/selling/articles/applying-discount' }, + { label: 'Drop Shipping', url: docsUrl + 'user/manual/en/selling/articles/drop-shipping' }, + { label: 'Sales Person', url: docsUrl + 'user/manual/en/selling/articles/sales-persons-in-the-sales-transactions' }, + { label: 'Close Sales Order', url: docsUrl + 'user/manual/en/selling/articles/close-sales-order' }, + { label: 'Applying Margin', url: docsUrl + 'user/manual/en/selling/articles/adding-margin' }, ] frappe.help.help_links['Form/Product Bundle'] = [ - { label: 'Product Bundle', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/setup/product-bundle' }, + { label: 'Product Bundle', url: docsUrl + 'user/manual/en/selling/setup/product-bundle' }, ] frappe.help.help_links['Form/Selling Settings'] = [ - { label: 'Selling Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/setup/selling-settings' }, + { label: 'Selling Settings', url: docsUrl + 'user/manual/en/selling/setup/selling-settings' }, ] //Buying frappe.help.help_links['List/Supplier'] = [ - { label: 'Supplier', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/supplier' }, + { label: 'Supplier', url: docsUrl + 'user/manual/en/buying/supplier' }, ] frappe.help.help_links['Form/Supplier'] = [ - { label: 'Supplier', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/supplier' }, + { label: 'Supplier', url: docsUrl + 'user/manual/en/buying/supplier' }, ] frappe.help.help_links['Form/Request for Quotation'] = [ - { label: 'Request for Quotation', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/request-for-quotation' }, - { label: 'RFQ Video', url: 'https://frappe.github.io/erpnext/user/videos/learn/request-for-quotation.html' }, + { label: 'Request for Quotation', url: docsUrl + 'user/manual/en/buying/request-for-quotation' }, + { label: 'RFQ Video', url: docsUrl + 'user/videos/learn/request-for-quotation.html' }, ] frappe.help.help_links['Form/Supplier Quotation'] = [ - { label: 'Supplier Quotation', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/supplier-quotation' }, + { label: 'Supplier Quotation', url: docsUrl + 'user/manual/en/buying/supplier-quotation' }, ] frappe.help.help_links['Form/Buying Settings'] = [ - { label: 'Buying Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/setup/buying-settings' }, + { label: 'Buying Settings', url: docsUrl + 'user/manual/en/buying/setup/buying-settings' }, ] frappe.help.help_links['List/Purchase Order'] = [ - { label: 'Purchase Order', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/purchase-order' }, - { label: 'Recurring Purchase Order', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/recurring-orders-and-invoices' }, + { label: 'Purchase Order', url: docsUrl + 'user/manual/en/buying/purchase-order' }, + { label: 'Recurring Purchase Order', url: docsUrl + 'user/manual/en/accounts/recurring-orders-and-invoices' }, ] frappe.help.help_links['Form/Purchase Order'] = [ - { label: 'Purchase Order', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/purchase-order' }, - { label: 'Item UoM', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/articles/purchasing-in-different-unit' }, - { label: 'Supplier Item Code', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item' }, - { label: 'Recurring Purchase Order', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/recurring-orders-and-invoices' }, - { label: 'Subcontracting', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/subcontracting' }, + { label: 'Purchase Order', url: docsUrl + 'user/manual/en/buying/purchase-order' }, + { label: 'Item UoM', url: docsUrl + 'user/manual/en/buying/articles/purchasing-in-different-unit' }, + { label: 'Supplier Item Code', url: docsUrl + 'user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item' }, + { label: 'Recurring Purchase Order', url: docsUrl + 'user/manual/en/accounts/recurring-orders-and-invoices' }, + { label: 'Subcontracting', url: docsUrl + 'user/manual/en/manufacturing/subcontracting' }, ] frappe.help.help_links['List/Purchase Taxes and Charges Template'] = [ - { label: 'Setting Up Taxes', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/setting-up-taxes' }, + { label: 'Setting Up Taxes', url: docsUrl + 'user/manual/en/setting-up/setting-up-taxes' }, ] frappe.help.help_links['List/POS Profile'] = [ - { label: 'POS Profile', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/pos-setting' }, + { label: 'POS Profile', url: docsUrl + 'user/manual/en/setting-up/pos-setting' }, ] frappe.help.help_links['List/Price List'] = [ - { label: 'Price List', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/price-lists' }, + { label: 'Price List', url: docsUrl + 'user/manual/en/setting-up/price-lists' }, ] frappe.help.help_links['List/Authorization Rule'] = [ - { label: 'Authorization Rule', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/authorization-rule' }, + { label: 'Authorization Rule', url: docsUrl + 'user/manual/en/setting-up/authorization-rule' }, ] frappe.help.help_links['Form/SMS Settings'] = [ - { label: 'SMS Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/sms-setting' }, + { label: 'SMS Settings', url: docsUrl + 'user/manual/en/setting-up/sms-setting' }, ] frappe.help.help_links['List/Stock Reconciliation'] = [ - { label: 'Stock Reconciliation', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item' }, + { label: 'Stock Reconciliation', url: docsUrl + 'user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item' }, ] frappe.help.help_links['Tree/Territory'] = [ - { label: 'Territory', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/territory' }, + { label: 'Territory', url: docsUrl + 'user/manual/en/setting-up/territory' }, ] frappe.help.help_links['Form/Dropbox Backup'] = [ - { label: 'Dropbox Backup', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/third-party-backups' }, - { label: 'Setting Up Dropbox Backup', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/setting-up-dropbox-backups' }, + { label: 'Dropbox Backup', url: docsUrl + 'user/manual/en/setting-up/third-party-backups' }, + { label: 'Setting Up Dropbox Backup', url: docsUrl + 'user/manual/en/setting-up/articles/setting-up-dropbox-backups' }, ] frappe.help.help_links['List/Workflow'] = [ - { label: 'Workflow', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/workflows' }, + { label: 'Workflow', url: docsUrl + 'user/manual/en/setting-up/workflows' }, ] frappe.help.help_links['List/Company'] = [ - { label: 'Company', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/company-setup' }, - { label: 'Managing Multiple Companies', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/managing-multiple-companies' }, - { label: 'Delete All Related Transactions for a Company', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions' }, + { label: 'Company', url: docsUrl + 'user/manual/en/setting-up/company-setup' }, + { label: 'Managing Multiple Companies', url: docsUrl + 'user/manual/en/setting-up/articles/managing-multiple-companies' }, + { label: 'Delete All Related Transactions for a Company', url: docsUrl + 'user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions' }, ] //Accounts frappe.help.help_links['modules/Accounts'] = [ - { label: 'Introduction to Accounts', url: 'http://frappe.github.io/erpnext/user/manual/en/accounts/' }, - { label: 'Chart of Accounts', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/chart-of-accounts.html' }, - { label: 'Multi Currency Accounting', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/multi-currency-accounting' }, + { label: 'Introduction to Accounts', url: 'http://erpnext.com/docs/user/manual/en/accounts/' }, + { label: 'Chart of Accounts', url: docsUrl + 'user/manual/en/accounts/chart-of-accounts.html' }, + { label: 'Multi Currency Accounting', url: docsUrl + 'user/manual/en/accounts/multi-currency-accounting' }, ] frappe.help.help_links['Tree/Account'] = [ - { label: 'Chart of Accounts', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/chart-of-accounts' }, - { label: 'Managing Tree Mastes', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/managing-tree-structure-masters' }, + { label: 'Chart of Accounts', url: docsUrl + 'user/manual/en/accounts/chart-of-accounts' }, + { label: 'Managing Tree Mastes', url: docsUrl + 'user/manual/en/setting-up/articles/managing-tree-structure-masters' }, ] frappe.help.help_links['Form/Sales Invoice'] = [ - { label: 'Sales Invoice', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/sales-invoice' }, - { label: 'Accounts Opening Balance', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/opening-accounts' }, - { label: 'Sales Return', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/sales-return' }, - { label: 'Recurring Sales Invoice', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/recurring-orders-and-invoices' }, + { label: 'Sales Invoice', url: docsUrl + 'user/manual/en/accounts/sales-invoice' }, + { label: 'Accounts Opening Balance', url: docsUrl + 'user/manual/en/accounts/opening-accounts' }, + { label: 'Sales Return', url: docsUrl + 'user/manual/en/stock/sales-return' }, + { label: 'Recurring Sales Invoice', url: docsUrl + 'user/manual/en/accounts/recurring-orders-and-invoices' }, ] frappe.help.help_links['List/Sales Invoice'] = [ - { label: 'Sales Invoice', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/sales-invoice' }, - { label: 'Accounts Opening Balance', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/opening-accounts' }, - { label: 'Sales Return', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/sales-return' }, - { label: 'Recurring Sales Invoice', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/recurring-orders-and-invoices' }, + { label: 'Sales Invoice', url: docsUrl + 'user/manual/en/accounts/sales-invoice' }, + { label: 'Accounts Opening Balance', url: docsUrl + 'user/manual/en/accounts/opening-accounts' }, + { label: 'Sales Return', url: docsUrl + 'user/manual/en/stock/sales-return' }, + { label: 'Recurring Sales Invoice', url: docsUrl + 'user/manual/en/accounts/recurring-orders-and-invoices' }, ] frappe.help.help_links['pos'] = [ - { label: 'Point of Sale Invoice', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/point-of-sale-pos-invoice' }, + { label: 'Point of Sale Invoice', url: docsUrl + 'user/manual/en/accounts/point-of-sale-pos-invoice' }, ] frappe.help.help_links['List/POS Profile'] = [ - { label: 'Point of Sale Profile', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/pos-setting' }, + { label: 'Point of Sale Profile', url: docsUrl + 'user/manual/en/setting-up/pos-setting' }, ] frappe.help.help_links['List/Purchase Invoice'] = [ - { label: 'Purchase Invoice', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/purchase-invoice' }, - { label: 'Accounts Opening Balance', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/opening-accounts' }, - { label: 'Recurring Purchase Invoice', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/recurring-orders-and-invoices' }, + { label: 'Purchase Invoice', url: docsUrl + 'user/manual/en/accounts/purchase-invoice' }, + { label: 'Accounts Opening Balance', url: docsUrl + 'user/manual/en/accounts/opening-accounts' }, + { label: 'Recurring Purchase Invoice', url: docsUrl + 'user/manual/en/accounts/recurring-orders-and-invoices' }, ] frappe.help.help_links['List/Journal Entry'] = [ - { label: 'Journal Entry', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/journal-entry' }, - { label: 'Advance Payment Entry', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/advance-payment-entry' }, - { label: 'Accounts Opening Balance', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/opening-accounts' }, + { label: 'Journal Entry', url: docsUrl + 'user/manual/en/accounts/journal-entry' }, + { label: 'Advance Payment Entry', url: docsUrl + 'user/manual/en/accounts/advance-payment-entry' }, + { label: 'Accounts Opening Balance', url: docsUrl + 'user/manual/en/accounts/opening-accounts' }, ] frappe.help.help_links['List/Payment Entry'] = [ - { label: 'Payment Entry', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/payment-entry' }, + { label: 'Payment Entry', url: docsUrl + 'user/manual/en/accounts/payment-entry' }, ] frappe.help.help_links['List/Payment Request'] = [ - { label: 'Payment Request', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/payment-request' }, + { label: 'Payment Request', url: docsUrl + 'user/manual/en/accounts/payment-request' }, ] frappe.help.help_links['List/Asset'] = [ - { label: 'Managing Fixed Assets', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/managing-fixed-assets' }, + { label: 'Managing Fixed Assets', url: docsUrl + 'user/manual/en/accounts/managing-fixed-assets' }, ] frappe.help.help_links['List/Asset Category'] = [ - { label: 'Asset Category', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/managing-fixed-assets' }, + { label: 'Asset Category', url: docsUrl + 'user/manual/en/accounts/managing-fixed-assets' }, ] frappe.help.help_links['Tree/Cost Center'] = [ - { label: 'Budgeting', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/budgeting' }, + { label: 'Budgeting', url: docsUrl + 'user/manual/en/accounts/budgeting' }, ] frappe.help.help_links['List/Item'] = [ - { label: 'Item', url: 'http://frappe.github.io/erpnext/user/manual/en/stock/item' }, - { label: 'Item Price', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/item/item-price' }, - { label: 'Barcode', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/track-items-using-barcode' }, - { label: 'Item Wise Taxation', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/item-wise-taxation' }, - { label: 'Managing Fixed Assets', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/managing-fixed-assets' }, - { label: 'Item Codification', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/item/item-codification' }, - { label: 'Item Variants', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/item/item-variants' }, - { label: 'Item Valuation', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/item/item-valuation-fifo-and-moving-average' }, + { label: 'Item', url: 'http://erpnext.com/docs/user/manual/en/stock/item' }, + { label: 'Item Price', url: docsUrl + 'user/manual/en/stock/item/item-price' }, + { label: 'Barcode', url: docsUrl + 'user/manual/en/stock/articles/track-items-using-barcode' }, + { label: 'Item Wise Taxation', url: docsUrl + 'user/manual/en/accounts/item-wise-taxation' }, + { label: 'Managing Fixed Assets', url: docsUrl + 'user/manual/en/accounts/managing-fixed-assets' }, + { label: 'Item Codification', url: docsUrl + 'user/manual/en/stock/item/item-codification' }, + { label: 'Item Variants', url: docsUrl + 'user/manual/en/stock/item/item-variants' }, + { label: 'Item Valuation', url: docsUrl + 'user/manual/en/stock/item/item-valuation-fifo-and-moving-average' }, ] frappe.help.help_links['Form/Item'] = [ - { label: 'Item', url: 'http://frappe.github.io/erpnext/user/manual/en/stock/item' }, - { label: 'Item Price', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/item/item-price' }, - { label: 'Barcode', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/track-items-using-barcode' }, - { label: 'Item Wise Taxation', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/item-wise-taxation' }, - { label: 'Managing Fixed Assets', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/managing-fixed-assets' }, - { label: 'Item Codification', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/item/item-codification' }, - { label: 'Item Variants', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/item/item-variants' }, - { label: 'Item Valuation', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/item/item-valuation-fifo-and-moving-average' }, + { label: 'Item', url: 'http://erpnext.com/docs/user/manual/en/stock/item' }, + { label: 'Item Price', url: docsUrl + 'user/manual/en/stock/item/item-price' }, + { label: 'Barcode', url: docsUrl + 'user/manual/en/stock/articles/track-items-using-barcode' }, + { label: 'Item Wise Taxation', url: docsUrl + 'user/manual/en/accounts/item-wise-taxation' }, + { label: 'Managing Fixed Assets', url: docsUrl + 'user/manual/en/accounts/managing-fixed-assets' }, + { label: 'Item Codification', url: docsUrl + 'user/manual/en/stock/item/item-codification' }, + { label: 'Item Variants', url: docsUrl + 'user/manual/en/stock/item/item-variants' }, + { label: 'Item Valuation', url: docsUrl + 'user/manual/en/stock/item/item-valuation-fifo-and-moving-average' }, ] frappe.help.help_links['List/Purchase Receipt'] = [ - { label: 'Purchase Receipt', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/purchase-receipt' }, - { label: 'Barcode', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/track-items-using-barcode' }, + { label: 'Purchase Receipt', url: docsUrl + 'user/manual/en/stock/purchase-receipt' }, + { label: 'Barcode', url: docsUrl + 'user/manual/en/stock/articles/track-items-using-barcode' }, ] frappe.help.help_links['List/Delivery Note'] = [ - { label: 'Delivery Note', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/delivery-note' }, - { label: 'Barcode', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/track-items-using-barcode' }, - { label: 'Sales Return', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/sales-return' }, + { label: 'Delivery Note', url: docsUrl + 'user/manual/en/stock/delivery-note' }, + { label: 'Barcode', url: docsUrl + 'user/manual/en/stock/articles/track-items-using-barcode' }, + { label: 'Sales Return', url: docsUrl + 'user/manual/en/stock/sales-return' }, ] frappe.help.help_links['Form/Delivery Note'] = [ - { label: 'Delivery Note', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/delivery-note' }, - { label: 'Sales Return', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/sales-return' }, - { label: 'Barcode', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/track-items-using-barcode' }, - { label: 'Subcontracting', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/subcontracting' }, + { label: 'Delivery Note', url: docsUrl + 'user/manual/en/stock/delivery-note' }, + { label: 'Sales Return', url: docsUrl + 'user/manual/en/stock/sales-return' }, + { label: 'Barcode', url: docsUrl + 'user/manual/en/stock/articles/track-items-using-barcode' }, + { label: 'Subcontracting', url: docsUrl + 'user/manual/en/manufacturing/subcontracting' }, ] frappe.help.help_links['List/Installation Note'] = [ - { label: 'Installation Note', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/installation-note' }, + { label: 'Installation Note', url: docsUrl + 'user/manual/en/stock/installation-note' }, ] frappe.help.help_links['Tree'] = [ - { label: 'Managing Tree Structure Masters', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/managing-tree-structure-masters' }, + { label: 'Managing Tree Structure Masters', url: docsUrl + 'user/manual/en/setting-up/articles/managing-tree-structure-masters' }, ] frappe.help.help_links['List/Budget'] = [ - { label: 'Budgeting', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/budgeting' }, + { label: 'Budgeting', url: docsUrl + 'user/manual/en/accounts/budgeting' }, ] //Stock frappe.help.help_links['List/Material Request'] = [ - { label: 'Material Request', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/material-request' }, - { label: 'Auto-creation of Material Request', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/auto-creation-of-material-request' }, + { label: 'Material Request', url: docsUrl + 'user/manual/en/stock/material-request' }, + { label: 'Auto-creation of Material Request', url: docsUrl + 'user/manual/en/stock/articles/auto-creation-of-material-request' }, ] frappe.help.help_links['Form/Material Request'] = [ - { label: 'Material Request', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/material-request' }, - { label: 'Auto-creation of Material Request', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/auto-creation-of-material-request' }, + { label: 'Material Request', url: docsUrl + 'user/manual/en/stock/material-request' }, + { label: 'Auto-creation of Material Request', url: docsUrl + 'user/manual/en/stock/articles/auto-creation-of-material-request' }, ] frappe.help.help_links['Form/Stock Entry'] = [ - { label: 'Stock Entry', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/stock-entry' }, - { label: 'Stock Entry Types', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/stock-entry-purpose' }, - { label: 'Repack Entry', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/repack-entry' }, - { label: 'Opening Stock', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/opening-stock' }, - { label: 'Subcontracting', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/subcontracting' }, + { label: 'Stock Entry', url: docsUrl + 'user/manual/en/stock/stock-entry' }, + { label: 'Stock Entry Types', url: docsUrl + 'user/manual/en/stock/articles/stock-entry-purpose' }, + { label: 'Repack Entry', url: docsUrl + 'user/manual/en/stock/articles/repack-entry' }, + { label: 'Opening Stock', url: docsUrl + 'user/manual/en/stock/opening-stock' }, + { label: 'Subcontracting', url: docsUrl + 'user/manual/en/manufacturing/subcontracting' }, ] frappe.help.help_links['List/Stock Entry'] = [ - { label: 'Stock Entry', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/stock-entry' }, + { label: 'Stock Entry', url: docsUrl + 'user/manual/en/stock/stock-entry' }, ] frappe.help.help_links['Tree/Warehouse'] = [ - { label: 'Warehouse', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/warehouse' }, + { label: 'Warehouse', url: docsUrl + 'user/manual/en/stock/warehouse' }, ] frappe.help.help_links['List/Serial No'] = [ - { label: 'Serial No', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/serial-no' }, + { label: 'Serial No', url: docsUrl + 'user/manual/en/stock/serial-no' }, ] frappe.help.help_links['Form/Serial No'] = [ - { label: 'Serial No', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/serial-no' }, + { label: 'Serial No', url: docsUrl + 'user/manual/en/stock/serial-no' }, ] frappe.help.help_links['Form/Batch'] = [ - { label: 'Batch', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/batch' }, + { label: 'Batch', url: docsUrl + 'user/manual/en/stock/batch' }, ] frappe.help.help_links['Form/Packing Slip'] = [ - { label: 'Packing Slip', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/tools/packing-slip' }, + { label: 'Packing Slip', url: docsUrl + 'user/manual/en/stock/tools/packing-slip' }, ] frappe.help.help_links['Form/Quality Inspection'] = [ - { label: 'Quality Inspection', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/tools/quality-inspection' }, + { label: 'Quality Inspection', url: docsUrl + 'user/manual/en/stock/tools/quality-inspection' }, ] frappe.help.help_links['Form/Landed Cost Voucher'] = [ - { label: 'Landed Cost Voucher', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/tools/landed-cost-voucher' }, + { label: 'Landed Cost Voucher', url: docsUrl + 'user/manual/en/stock/tools/landed-cost-voucher' }, ] frappe.help.help_links['Tree/Item Group'] = [ - { label: 'Item Group', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/setup/item-group' }, + { label: 'Item Group', url: docsUrl + 'user/manual/en/stock/setup/item-group' }, ] frappe.help.help_links['Form/Item Attribute'] = [ - { label: 'Item Attribute', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/setup/item-attribute' }, + { label: 'Item Attribute', url: docsUrl + 'user/manual/en/stock/setup/item-attribute' }, ] frappe.help.help_links['Form/UOM'] = [ - { label: 'Fractions in UOM', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/managing-fractions-in-uom' }, + { label: 'Fractions in UOM', url: docsUrl + 'user/manual/en/stock/articles/managing-fractions-in-uom' }, ] frappe.help.help_links['Form/Stock Reconciliation'] = [ - { label: 'Opening Stock Entry', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/opening-stock' }, + { label: 'Opening Stock Entry', url: docsUrl + 'user/manual/en/stock/opening-stock' }, ] //CRM frappe.help.help_links['Form/Lead'] = [ - { label: 'Lead', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/lead' }, + { label: 'Lead', url: docsUrl + 'user/manual/en/CRM/lead' }, ] frappe.help.help_links['Form/Opportunity'] = [ - { label: 'Opportunity', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/opportunity' }, + { label: 'Opportunity', url: docsUrl + 'user/manual/en/CRM/opportunity' }, ] frappe.help.help_links['Form/Address'] = [ - { label: 'Address', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/contact' }, + { label: 'Address', url: docsUrl + 'user/manual/en/CRM/contact' }, ] frappe.help.help_links['Form/Contact'] = [ - { label: 'Contact', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/contact' }, + { label: 'Contact', url: docsUrl + 'user/manual/en/CRM/contact' }, ] frappe.help.help_links['Form/Newsletter'] = [ - { label: 'Newsletter', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/newsletter' }, + { label: 'Newsletter', url: docsUrl + 'user/manual/en/CRM/newsletter' }, ] frappe.help.help_links['Form/Campaign'] = [ - { label: 'Campaign', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/setup/campaign' }, + { label: 'Campaign', url: docsUrl + 'user/manual/en/CRM/setup/campaign' }, ] frappe.help.help_links['Tree/Sales Person'] = [ - { label: 'Sales Person', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/setup/sales-person' }, + { label: 'Sales Person', url: docsUrl + 'user/manual/en/CRM/setup/sales-person' }, ] frappe.help.help_links['Form/Sales Person'] = [ - { label: 'Sales Person Target', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/setup/sales-person-target-allocation' }, + { label: 'Sales Person Target', url: docsUrl + 'user/manual/en/selling/setup/sales-person-target-allocation' }, ] //Support frappe.help.help_links['List/Feedback Trigger'] = [ - { label: 'Feedback Trigger', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/feedback/setting-up-feedback' }, + { label: 'Feedback Trigger', url: docsUrl + 'user/manual/en/setting-up/feedback/setting-up-feedback' }, ] frappe.help.help_links['List/Feedback Request'] = [ - { label: 'Feedback Request', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/feedback/submit-feedback' }, + { label: 'Feedback Request', url: docsUrl + 'user/manual/en/setting-up/feedback/submit-feedback' }, ] frappe.help.help_links['List/Feedback Request'] = [ - { label: 'Feedback Request', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/feedback/submit-feedback' }, + { label: 'Feedback Request', url: docsUrl + 'user/manual/en/setting-up/feedback/submit-feedback' }, ] //Manufacturing frappe.help.help_links['Form/BOM'] = [ - { label: 'Bill of Material', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/bill-of-materials' }, - { label: 'Nested BOM Structure', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/articles/nested-bom-structure' }, + { label: 'Bill of Material', url: docsUrl + 'user/manual/en/manufacturing/bill-of-materials' }, + { label: 'Nested BOM Structure', url: docsUrl + 'user/manual/en/manufacturing/articles/nested-bom-structure' }, ] -frappe.help.help_links['Form/Production Order'] = [ - { label: 'Production Order', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/production-order' }, +frappe.help.help_links['Form/Work Order'] = [ + { label: 'Work Order', url: docsUrl + 'user/manual/en/manufacturing/work-order' }, ] frappe.help.help_links['Form/Workstation'] = [ - { label: 'Workstation', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/workstation' }, + { label: 'Workstation', url: docsUrl + 'user/manual/en/manufacturing/workstation' }, ] frappe.help.help_links['Form/Operation'] = [ - { label: 'Operation', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/operation' }, -] - -frappe.help.help_links['Form/Production Planning Tool'] = [ - { label: 'Production Planning Tool', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/tools/production-planning-tool' }, + { label: 'Operation', url: docsUrl + 'user/manual/en/manufacturing/operation' }, ] frappe.help.help_links['Form/BOM Update Tool'] = [ - { label: 'BOM Update Tool', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/tools/bom-update-tool' }, + { label: 'BOM Update Tool', url: docsUrl + 'user/manual/en/manufacturing/tools/bom-update-tool' }, ] //Customize frappe.help.help_links['Form/Customize Form'] = [ - { label: 'Custom Field', url: 'https://frappe.github.io/erpnext/user/manual/en/customize-erpnext/custom-field' }, - { label: 'Customize Field', url: 'https://frappe.github.io/erpnext/user/manual/en/customize-erpnext/customize-form' }, + { label: 'Custom Field', url: docsUrl + 'user/manual/en/customize-erpnext/custom-field' }, + { label: 'Customize Field', url: docsUrl + 'user/manual/en/customize-erpnext/customize-form' }, ] frappe.help.help_links['Form/Custom Field'] = [ - { label: 'Custom Field', url: 'https://frappe.github.io/erpnext/user/manual/en/customize-erpnext/custom-field' }, + { label: 'Custom Field', url: docsUrl + 'user/manual/en/customize-erpnext/custom-field' }, ] frappe.help.help_links['Form/Custom Field'] = [ - { label: 'Custom Field', url: 'https://frappe.github.io/erpnext/user/manual/en/customize-erpnext/custom-field' }, + { label: 'Custom Field', url: docsUrl + 'user/manual/en/customize-erpnext/custom-field' }, ] \ No newline at end of file From e1f5d22a02e2a139867c296edfc5b0b09a0035c2 Mon Sep 17 00:00:00 2001 From: scmmishra Date: Fri, 25 Jan 2019 14:27:23 +0530 Subject: [PATCH 65/86] [fix] Code formatting, removed trailing spaces --- erpnext/public/js/help_links.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/erpnext/public/js/help_links.js b/erpnext/public/js/help_links.js index d3cc688cd2..23e7deb6e9 100644 --- a/erpnext/public/js/help_links.js +++ b/erpnext/public/js/help_links.js @@ -1,6 +1,6 @@ frappe.provide('frappe.help.help_links'); -const docsUrl = 'https://erpnext.com/docs/' +const docsUrl = 'https://erpnext.com/docs/'; frappe.help.help_links['Form/Rename Tool'] = [ { label: 'Bulk Rename', url: docsUrl + 'user/manual/en/setting-up/data/bulk-rename' }, @@ -320,12 +320,12 @@ frappe.help.help_links['Tree/Cost Center'] = [ frappe.help.help_links['List/Item'] = [ { label: 'Item', url: 'http://erpnext.com/docs/user/manual/en/stock/item' }, - { label: 'Item Price', url: docsUrl + 'user/manual/en/stock/item/item-price' }, + { label: 'Item Price', url: docsUrl + 'user/manual/en/stock/item/item-price' }, { label: 'Barcode', url: docsUrl + 'user/manual/en/stock/articles/track-items-using-barcode' }, { label: 'Item Wise Taxation', url: docsUrl + 'user/manual/en/accounts/item-wise-taxation' }, { label: 'Managing Fixed Assets', url: docsUrl + 'user/manual/en/accounts/managing-fixed-assets' }, { label: 'Item Codification', url: docsUrl + 'user/manual/en/stock/item/item-codification' }, - { label: 'Item Variants', url: docsUrl + 'user/manual/en/stock/item/item-variants' }, + { label: 'Item Variants', url: docsUrl + 'user/manual/en/stock/item/item-variants' }, { label: 'Item Valuation', url: docsUrl + 'user/manual/en/stock/item/item-valuation-fifo-and-moving-average' }, ] @@ -336,8 +336,8 @@ frappe.help.help_links['Form/Item'] = [ { label: 'Item Wise Taxation', url: docsUrl + 'user/manual/en/accounts/item-wise-taxation' }, { label: 'Managing Fixed Assets', url: docsUrl + 'user/manual/en/accounts/managing-fixed-assets' }, { label: 'Item Codification', url: docsUrl + 'user/manual/en/stock/item/item-codification' }, - { label: 'Item Variants', url: docsUrl + 'user/manual/en/stock/item/item-variants' }, - { label: 'Item Valuation', url: docsUrl + 'user/manual/en/stock/item/item-valuation-fifo-and-moving-average' }, + { label: 'Item Variants', url: docsUrl + 'user/manual/en/stock/item/item-variants' }, + { label: 'Item Valuation', url: docsUrl + 'user/manual/en/stock/item/item-valuation-fifo-and-moving-average' }, ] frappe.help.help_links['List/Purchase Receipt'] = [ From 1b63fa19207977cc5c7ccdf0343afc30fe914b0a Mon Sep 17 00:00:00 2001 From: scmmishra Date: Fri, 25 Jan 2019 14:56:30 +0530 Subject: [PATCH 66/86] [fix] Formatting issues --- erpnext/public/js/help_links.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/public/js/help_links.js b/erpnext/public/js/help_links.js index 23e7deb6e9..458276eceb 100644 --- a/erpnext/public/js/help_links.js +++ b/erpnext/public/js/help_links.js @@ -326,12 +326,12 @@ frappe.help.help_links['List/Item'] = [ { label: 'Managing Fixed Assets', url: docsUrl + 'user/manual/en/accounts/managing-fixed-assets' }, { label: 'Item Codification', url: docsUrl + 'user/manual/en/stock/item/item-codification' }, { label: 'Item Variants', url: docsUrl + 'user/manual/en/stock/item/item-variants' }, - { label: 'Item Valuation', url: docsUrl + 'user/manual/en/stock/item/item-valuation-fifo-and-moving-average' }, + { label: 'Item Valuation', url: docsUrl + 'user/manual/en/stock/item/item-valuation-fifo-and-moving-average' }, ] frappe.help.help_links['Form/Item'] = [ { label: 'Item', url: 'http://erpnext.com/docs/user/manual/en/stock/item' }, - { label: 'Item Price', url: docsUrl + 'user/manual/en/stock/item/item-price' }, + { label: 'Item Price', url: docsUrl + 'user/manual/en/stock/item/item-price' }, { label: 'Barcode', url: docsUrl + 'user/manual/en/stock/articles/track-items-using-barcode' }, { label: 'Item Wise Taxation', url: docsUrl + 'user/manual/en/accounts/item-wise-taxation' }, { label: 'Managing Fixed Assets', url: docsUrl + 'user/manual/en/accounts/managing-fixed-assets' }, From c2ffcc5e71a0112c0044a023200263a783fe4beb Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Sun, 27 Jan 2019 16:09:07 +0530 Subject: [PATCH 67/86] feat(POS): Customer wise price list in offline mode and enhancement in POS closing voucher --- erpnext/accounts/doctype/sales_invoice/pos.py | 16 ++ erpnext/accounts/page/pos/pos.js | 31 ++- .../pos_closing_voucher.js | 14 ++ .../pos_closing_voucher.json | 194 +++++++++++++++++- 4 files changed, 249 insertions(+), 6 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py index 287da08ef5..74ec0b30c7 100755 --- a/erpnext/accounts/doctype/sales_invoice/pos.py +++ b/erpnext/accounts/doctype/sales_invoice/pos.py @@ -55,6 +55,7 @@ def get_pos_data(): 'barcode_data': get_barcode_data(items_list), 'tax_data': get_item_tax_data(), 'price_list_data': get_price_list_data(doc.selling_price_list), + 'customer_wise_price_list': get_customer_wise_price_list(), 'bin_data': get_bin_data(pos_profile), 'pricing_rules': get_pricing_rule_data(doc), 'print_template': print_template, @@ -328,6 +329,21 @@ def get_price_list_data(selling_price_list): return itemwise_price_list +def get_customer_wise_price_list(): + customer_wise_price = {} + customer_price_list_mapping = frappe._dict(frappe.get_all('Customer',fields = ['default_price_list', 'name'], as_list=1)) + + price_lists = frappe.db.sql(""" Select ifnull(price_list_rate, 0) as price_list_rate, + item_code, price_list from `tabItem Price` """, as_dict=1) + + for item in price_lists: + if item.price_list and customer_price_list_mapping.get(item.price_list): + + customer_wise_price.setdefault(customer_price_list_mapping.get(item.price_list),{}).setdefault( + item.item_code, item.price_list_rate + ) + + return customer_wise_price def get_bin_data(pos_profile): itemwise_bin_data = {} diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js index c89035c33f..17d6d0ddfc 100755 --- a/erpnext/accounts/page/pos/pos.js +++ b/erpnext/accounts/page/pos/pos.js @@ -125,7 +125,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ this.page.add_menu_item(__("Cashier Closing"), function () { frappe.set_route('List', 'Cashier Closing'); - }); + }); this.page.add_menu_item(__("POS Profile"), function () { frappe.set_route('List', 'POS Profile'); @@ -313,6 +313,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ this.contacts = r.message.contacts; this.address = r.message.address || {}; this.price_list_data = r.message.price_list_data; + this.customer_wise_price_list = r.message.customer_wise_price_list this.bin_data = r.message.bin_data; this.pricing_rules = r.message.pricing_rules; this.print_template = r.message.print_template; @@ -798,6 +799,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ if (item.action) { $(this).val(""); } + me.make_item_list(item.customer_name); }); }, @@ -1037,7 +1039,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ this.numeric_keypad.show(); }, - make_item_list: function () { + make_item_list: function (customer=null) { var me = this; if (!this.price_list) { frappe.msgprint(__("Price List not found or disabled")); @@ -1051,10 +1053,17 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ if (this.items.length > 0) { $.each(this.items, function(index, obj) { + let customer_price_list = me.customer_wise_price_list[customer]; + let item_price + if (customer && customer_price_list && customer_price_list[obj.name]) { + item_price = format_currency(customer_price_list[obj.name], me.frm.doc.currency); + } else { + item_price = format_currency(me.price_list_data[obj.name], me.frm.doc.currency); + } if(index < me.page_len) { $(frappe.render_template("pos_item", { item_code: obj.name, - item_price: format_currency(me.price_list_data[obj.name], me.frm.doc.currency), + item_price: item_price, item_name: obj.name === obj.item_name ? "" : obj.item_name, item_image: obj.image, item_stock: __('Stock Qty') + ": " + me.get_actual_qty(obj), @@ -1417,8 +1426,20 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ this.child.income_account = this.pos_profile_data['income_account'] || this.items[0].income_account; this.child.warehouse = (this.item_serial_no[this.child.item_code] ? this.item_serial_no[this.child.item_code][1] : (this.pos_profile_data['warehouse'] || this.items[0].default_warehouse)); - this.child.price_list_rate = flt(this.price_list_data[this.child.item_code] * this.child.conversion_factor, 9) / flt(this.frm.doc.conversion_rate, 9); - this.child.rate = flt(this.price_list_data[this.child.item_code] * this.child.conversion_factor, 9) / flt(this.frm.doc.conversion_rate, 9); + + customer = this.frm.doc.customer; + let rate + + customer_price_list = this.customer_wise_price_list[customer] + if (customer_price_list && customer_price_list[this.child.item_code]){ + rate = flt(this.customer_wise_price_list[customer][this.child.item_code] * this.child.conversion_factor, 9) / flt(this.frm.doc.conversion_rate, 9); + } + else{ + rate = flt(this.price_list_data[this.child.item_code] * this.child.conversion_factor, 9) / flt(this.frm.doc.conversion_rate, 9); + } + + this.child.price_list_rate = rate; + this.child.rate = rate; this.child.actual_qty = me.get_actual_qty(this.items[0]); this.child.amount = flt(this.child.qty) * flt(this.child.rate); this.child.batch_no = this.item_batch_no[this.child.item_code]; diff --git a/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.js b/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.js index 67ff8cb649..13bd87867b 100644 --- a/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.js +++ b/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.js @@ -20,6 +20,16 @@ frappe.ui.form.on('POS Closing Voucher', { }; }); }, + + total_amount: function(frm) { + get_difference_amount(frm); + }, + custody_amount: function(frm){ + get_difference_amount(frm); + }, + expense_amount: function(frm){ + get_difference_amount(frm); + }, refresh: function(frm) { get_closing_voucher_details(frm); }, @@ -47,6 +57,10 @@ frappe.ui.form.on('POS Closing Voucher Details', { } }); +var get_difference_amount = function(frm){ + frm.doc.difference = frm.doc.total_amount - frm.doc.custody_amount - frm.doc.expense_amount; + refresh_field("difference"); +}; var get_closing_voucher_details = function(frm) { if (frm.doc.period_end_date && frm.doc.period_start_date && frm.doc.company && frm.doc.pos_profile && frm.doc.user) { diff --git a/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.json b/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.json index e24239526a..0ebea83e60 100644 --- a/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.json +++ b/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.json @@ -1,5 +1,6 @@ { "allow_copy": 0, + "allow_events_in_timeline": 0, "allow_guest_to_view": 0, "allow_import": 0, "allow_rename": 0, @@ -307,6 +308,197 @@ "translatable": 0, "unique": 0 }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "expense_details_section", + "fieldtype": "Section Break", + "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": "Expense Details", + "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, + "fieldname": "expense_amount", + "fieldtype": "Currency", + "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": "Expense Amount", + "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, + "fieldname": "custody_amount", + "fieldtype": "Data", + "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": "Amount in Custody", + "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, + "fieldname": "column_break_13", + "fieldtype": "Column Break", + "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, + "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, + "fieldname": "total_amount", + "fieldtype": "Currency", + "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": "Total Collected Amount", + "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, + "fieldname": "difference", + "fieldtype": "Currency", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Difference", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "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, @@ -766,7 +958,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2018-08-21 16:15:54.363636", + "modified": "2019-01-26 13:23:49.192650", "modified_by": "Administrator", "module": "Selling", "name": "POS Closing Voucher", From aac404a155c5d0d3b2a7cfcc5b940ee2aa33248d Mon Sep 17 00:00:00 2001 From: navdeepghai1 Date: Mon, 28 Jan 2019 10:42:16 +0400 Subject: [PATCH 68/86] Fixed net_pay calculation issue --- erpnext/hr/doctype/salary_slip/salary_slip.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py index 3ee98e6be0..901ede1197 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.py +++ b/erpnext/hr/doctype/salary_slip/salary_slip.py @@ -360,7 +360,7 @@ class SalarySlip(TransactionBase): elif not d.amount: d.amount = d.default_amount if not d.do_not_include_in_total: - self.set(total_field, self.get(total_field) + flt(d.amount)) + self.set(total_field, self.get(total_field) + flt(d.amount, 2)) def calculate_net_pay(self): if self.salary_structure: @@ -473,4 +473,4 @@ def unlink_ref_doc_from_salary_slip(ref_no): if linked_ss: for ss in linked_ss: ss_doc = frappe.get_doc("Salary Slip", ss) - frappe.db.set_value("Salary Slip", ss_doc.name, "journal_entry", "") \ No newline at end of file + frappe.db.set_value("Salary Slip", ss_doc.name, "journal_entry", "") From 0bee62b460865fda32ad5f1d2a32ec1c387402e2 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Mon, 28 Jan 2019 12:45:11 +0530 Subject: [PATCH 69/86] fix: Made period fields read only and added validation for multiple entries by same user --- .../pos_closing_voucher/pos_closing_voucher.js | 1 + .../pos_closing_voucher.json | 6 +++--- .../pos_closing_voucher/pos_closing_voucher.py | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.js b/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.js index 13bd87867b..f24caf767f 100644 --- a/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.js +++ b/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.js @@ -76,6 +76,7 @@ var get_closing_voucher_details = function(frm) { refresh_field("grand_total"); refresh_field("net_total"); refresh_field("total_quantity"); + refresh_field("total_amount"); frm.get_field("payment_reconciliation_details").$wrapper.html(r.message); } diff --git a/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.json b/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.json index 0ebea83e60..2ac57794b4 100644 --- a/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.json +++ b/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.json @@ -39,7 +39,7 @@ "precision": "", "print_hide": 0, "print_hide_if_no_value": 0, - "read_only": 0, + "read_only": 1, "remember_last_selected_value": 0, "report_hide": 0, "reqd": 1, @@ -72,7 +72,7 @@ "precision": "", "print_hide": 0, "print_hide_if_no_value": 0, - "read_only": 0, + "read_only": 1, "remember_last_selected_value": 0, "report_hide": 0, "reqd": 1, @@ -958,7 +958,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2019-01-26 13:23:49.192650", + "modified": "2019-01-28 12:33:45.217813", "modified_by": "Administrator", "module": "Selling", "name": "POS Closing Voucher", diff --git a/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py b/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py index e7fc85e05a..c45571f57c 100644 --- a/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py +++ b/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py @@ -4,6 +4,7 @@ from __future__ import unicode_literals import frappe +from frappe import _ from frappe.model.document import Document from collections import defaultdict from erpnext.controllers.taxes_and_totals import get_itemised_tax_breakup_data @@ -26,6 +27,7 @@ class POSClosingVoucher(Document): sales_summary = get_sales_summary(invoice_list) self.set_sales_summary_values(sales_summary) + self.total_amount = sales_summary['grand_total'] if not self.get('payment_reconciliation'): mop = get_mode_of_payment_details(invoice_list) @@ -36,6 +38,21 @@ class POSClosingVoucher(Document): return self.get_payment_reconciliation_details() + def validate(self): + user = frappe.get_all('POS Closing Voucher', + filters = { + 'user': self.user, + 'docstatus': 1 + }, + or_filters = { + 'period_start_date': ('between', [self.period_start_date, self.period_end_date]), + 'period_end_date': ('between', [self.period_start_date, self.period_end_date]) + }) + + if user: + frappe.throw(_("POS Closing Voucher alreday exists for {0} between date {1} and {2}" + .format(self.user, self.period_start_date, self.period_end_date))) + def set_invoice_list(self, invoice_list): self.sales_invoices_summary = [] for invoice in invoice_list: From f0cfe98860b468a7ca72c6094d871a630bf4adec Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Mon, 28 Jan 2019 17:58:44 +0530 Subject: [PATCH 70/86] fix: Added missing semicolon and removed null from parameter --- erpnext/accounts/page/pos/pos.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js index 17d6d0ddfc..1dcbdc6789 100755 --- a/erpnext/accounts/page/pos/pos.js +++ b/erpnext/accounts/page/pos/pos.js @@ -1039,7 +1039,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ this.numeric_keypad.show(); }, - make_item_list: function (customer=null) { + make_item_list: function (customer) { var me = this; if (!this.price_list) { frappe.msgprint(__("Price List not found or disabled")); @@ -1428,7 +1428,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ ? this.item_serial_no[this.child.item_code][1] : (this.pos_profile_data['warehouse'] || this.items[0].default_warehouse)); customer = this.frm.doc.customer; - let rate + let rate; customer_price_list = this.customer_wise_price_list[customer] if (customer_price_list && customer_price_list[this.child.item_code]){ From 92bb84aa70270a8f6b278c040eff9dbd1097b1b5 Mon Sep 17 00:00:00 2001 From: navdeepghai1 Date: Mon, 28 Jan 2019 16:54:58 +0400 Subject: [PATCH 71/86] Changed static precision(2) value to system setting currency_precision value --- erpnext/hr/doctype/salary_slip/salary_slip.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py index 901ede1197..11538cc368 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.py +++ b/erpnext/hr/doctype/salary_slip/salary_slip.py @@ -330,7 +330,7 @@ class SalarySlip(TransactionBase): if frappe.db.get_value('Timesheet', data.time_sheet, 'status') == 'Payrolled': frappe.throw(_("Salary Slip of employee {0} already created for time sheet {1}").format(self.employee, data.time_sheet)) - def sum_components(self, component_type, total_field): + def sum_components(self, component_type, total_field, precision): joining_date, relieving_date = frappe.db.get_value("Employee", self.employee, ["date_of_joining", "relieving_date"]) @@ -350,7 +350,7 @@ class SalarySlip(TransactionBase): )): d.amount = rounded( - (flt(d.default_amount) * flt(self.payment_days) + (flt(d.default_amount, precision) * flt(self.payment_days) / cint(self.total_working_days)), self.precision("amount", component_type) ) @@ -360,19 +360,19 @@ class SalarySlip(TransactionBase): elif not d.amount: d.amount = d.default_amount if not d.do_not_include_in_total: - self.set(total_field, self.get(total_field) + flt(d.amount, 2)) + self.set(total_field, self.get(total_field) + flt(d.amount, precision)) def calculate_net_pay(self): if self.salary_structure: self.calculate_component_amounts() disable_rounded_total = cint(frappe.db.get_value("Global Defaults", None, "disable_rounded_total")) - + precision = frappe.defaults.get_global_default("currency_precision") self.total_deduction = 0 self.gross_pay = 0 - self.sum_components('earnings', 'gross_pay') - self.sum_components('deductions', 'total_deduction') + self.sum_components('earnings', 'gross_pay', precision) + self.sum_components('deductions', 'total_deduction', precision) self.set_loan_repayment() From 9acb885e60f77cd4e9ea8c98bdc39c18abcac731 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Tue, 29 Jan 2019 10:52:37 +0530 Subject: [PATCH 72/86] fix(sqli): Avoid SQL Injection with sender param (#16509) --- erpnext/templates/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/templates/utils.py b/erpnext/templates/utils.py index eb84bcc8d8..8e14c067f1 100644 --- a/erpnext/templates/utils.py +++ b/erpnext/templates/utils.py @@ -16,7 +16,7 @@ def send_message(subject="Website Query", message="", sender="", status="Open"): customer = frappe.db.sql("""select distinct dl.link_name from `tabDynamic Link` dl left join `tabContact` c on dl.parent=c.name where dl.link_doctype='Customer' - and c.email_id='{email_id}'""".format(email_id=sender)) + and c.email_id = %s""", sender) if not customer: lead = frappe.db.get_value('Lead', dict(email_id=sender)) From a8e743e3c42b3d48ab443384c76279c30a2324a1 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 28 Jan 2019 11:27:35 +0530 Subject: [PATCH 73/86] fix: fiscal year always be for 12 months --- erpnext/accounts/doctype/fiscal_year/fiscal_year.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py index a00aebe5a2..d749c89f34 100644 --- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py @@ -37,9 +37,10 @@ class FiscalYear(Document): if getdate(self.year_start_date) > getdate(self.year_end_date): frappe.throw(_("Fiscal Year Start Date should not be greater than Fiscal Year End Date")) - if (getdate(self.year_end_date) - getdate(self.year_start_date)).days > 366: - date = getdate(self.year_start_date) + relativedelta(years=1) - relativedelta(days=1) - self.year_end_date = date.strftime("%Y-%m-%d") + date = getdate(self.year_start_date) + relativedelta(years=1) - relativedelta(days=1) + + if getdate(self.year_end_date) != date: + frappe.throw(_("The difference between the year start date and year end date must be 12 months.")) def on_update(self): check_duplicate_fiscal_year(self) From 07f75a3e549c4a5ee7b6edd8d0f2bb3aa92e9e6f Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 29 Jan 2019 12:01:54 +0530 Subject: [PATCH 74/86] feat: on click of pay button and on focus out of qty field remove the zero qty items from the cart --- erpnext/accounts/page/pos/pos.js | 46 +++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js index c89035c33f..7fcd2cb27d 100755 --- a/erpnext/accounts/page/pos/pos.js +++ b/erpnext/accounts/page/pos/pos.js @@ -602,7 +602,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ this.remove_item = [] idx = $(this.wrapper).find(".pos-selected-item-action").attr("data-idx") this.remove_item.push(idx) - this.remove_zero_qty_item() + this.remove_zero_qty_items_from_cart() this.update_paid_amount_status(false) }, @@ -1167,20 +1167,27 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ $(this.wrapper).on("change", ".pos-item-qty", function () { var item_code = $(this).parents(".pos-selected-item-action").attr("data-item-code"); var qty = $(this).val(); - me.update_qty(item_code, qty) - me.update_value() + me.update_qty(item_code, qty); + me.update_value(); + }) + + $(this.wrapper).on("focusout", ".pos-item-qty", function () { + var item_code = $(this).parents(".pos-selected-item-action").attr("data-item-code"); + var qty = $(this).val(); + me.update_qty(item_code, qty, true); + me.update_value(); }) $(this.wrapper).find("[data-action='increase-qty']").on("click", function () { var item_code = $(this).parents(".pos-bill-item").attr("data-item-code"); var qty = flt($(this).parents(".pos-bill-item").find('.pos-item-qty').val()) + 1; - me.update_qty(item_code, qty) + me.update_qty(item_code, qty); }) $(this.wrapper).find("[data-action='decrease-qty']").on("click", function () { var item_code = $(this).parents(".pos-bill-item").attr("data-item-code"); var qty = flt($(this).parents(".pos-bill-item").find('.pos-item-qty').val()) - 1; - me.update_qty(item_code, qty) + me.update_qty(item_code, qty); }) $(this.wrapper).on("change", ".pos-item-disc", function () { @@ -1219,11 +1226,11 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ me.bind_delete_event() }, - update_qty: function (item_code, qty) { + update_qty: function (item_code, qty, remove_zero_qty_items) { var me = this; this.items = this.get_items(item_code); this.validate_serial_no() - this.set_item_details(item_code, "qty", qty); + this.set_item_details(item_code, "qty", qty, remove_zero_qty_items); }, update_discount: function(item_code, discount) { @@ -1284,7 +1291,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ }) }, - set_item_details: function (item_code, field, value) { + set_item_details: function (item_code, field, value, remove_zero_qty_items) { var me = this; if (value < 0) { frappe.throw(__("Enter value must be positive")); @@ -1299,7 +1306,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ d[field] = flt(value); d.amount = flt(d.rate) * flt(d.qty); - if (d.qty == 0) { + if (d.qty == 0 && remove_zero_qty_items) { me.remove_item.push(d.idx) } @@ -1309,10 +1316,14 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ } }); + if (field == 'qty') { + this.remove_zero_qty_items_from_cart(); + } + this.update_paid_amount_status(false) }, - remove_zero_qty_item: function () { + remove_zero_qty_items_from_cart: function () { var me = this; var idx = 0; this.items = [] @@ -1826,10 +1837,25 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ validate: function () { var me = this; this.customer_validate(); + this.validate_zero_qty_items(); this.item_validate(); this.validate_mode_of_payments(); }, + validate_zero_qty_items: function() { + this.remove_item = []; + + this.frm.doc.items.forEach(d => { + if (d.qty == 0) { + this.remove_item.push(d.idx); + } + }); + + if(this.remove_item) { + this.remove_zero_qty_items_from_cart(); + } + }, + item_validate: function () { if (this.frm.doc.items.length == 0) { frappe.throw(__("Select items to save the invoice")) From 9520e345bd1f61e242c3f8d3e2a1c2b4d1cded17 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 29 Jan 2019 13:03:46 +0530 Subject: [PATCH 75/86] fix: better error messages --- erpnext/accounts/doctype/fiscal_year/fiscal_year.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py index d749c89f34..6bb71b667f 100644 --- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py @@ -35,12 +35,12 @@ class FiscalYear(Document): def validate_dates(self): if getdate(self.year_start_date) > getdate(self.year_end_date): - frappe.throw(_("Fiscal Year Start Date should not be greater than Fiscal Year End Date")) + frappe.throw(_("Fiscal Year Start Date should be one year earlier than Fiscal Year End Date")) date = getdate(self.year_start_date) + relativedelta(years=1) - relativedelta(days=1) if getdate(self.year_end_date) != date: - frappe.throw(_("The difference between the year start date and year end date must be 12 months.")) + frappe.throw(_("Fiscal Year End Date should be one year after Fiscal Year Start Date")) def on_update(self): check_duplicate_fiscal_year(self) From 4e45663297d01d2621e2ed2cdd6aa9702481cc67 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 29 Jan 2019 14:02:08 +0530 Subject: [PATCH 76/86] fix(stock): get item price based on party --- erpnext/stock/get_item_details.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index e1607a927f..ec1031c70f 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -440,13 +440,12 @@ def get_item_price(args, item_code, ignore_party=False): and ifnull(uom, '') in ('', %(uom)s)""" if not ignore_party: - conditions += " and (customer is null or customer = '') and (supplier is null or supplier = '')" if args.get("customer"): conditions += " and customer=%(customer)s" - - if args.get("supplier"): + elif args.get("supplier"): conditions += " and supplier=%(supplier)s" - + else: + conditions += " and (customer is null or customer = '') and (supplier is null or supplier = '')" if args.get('min_qty'): conditions += " and ifnull(min_qty, 0) <= %(min_qty)s" From 115a252f55393b3753b6fddbdb8cbfa5b669be0c Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 29 Jan 2019 14:40:10 +0530 Subject: [PATCH 77/86] docs: changelog for v11.0.4 --- erpnext/change_log/v11/v11_0_4.md | 72 +++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 erpnext/change_log/v11/v11_0_4.md diff --git a/erpnext/change_log/v11/v11_0_4.md b/erpnext/change_log/v11/v11_0_4.md new file mode 100644 index 0000000000..0c4325f3b4 --- /dev/null +++ b/erpnext/change_log/v11/v11_0_4.md @@ -0,0 +1,72 @@ +- Enhancements + + - Accounting + + - Company Tree + - Multiple Finance Books + - Bank Statement Upload + - Tax Withholding + - Subscriptions and Deferred Revenue + - Inter Company Transactions + - Standalone Credit / Debit Note + - Reverse Journal Entry + - Enhanced Bank Guarantee + - Cost Center Numbering + + - Human Resource + + - Department Hierarchy + - Leave Management + - Leave Period + - New Leave Types + - Leave Encashment + - Compensatory Leave + - Attendance Request + - Enhanced Payroll + - New Salary Structure + - Additional Salary + - Payroll Period + - Employee Benefits + - Employee Tax Exemptions + - Auto Calculation of Tax Deduction + - Enhanced Salary Processing + - Employee Lifecycle + - Employee Onboarding + - Employee Separation + - Employee Transfer and Promotion + - Shift Planning + - Staffing Plan + + - Asset Management + + - Capital-Work-in-Progress (CWIP) Accounting + - Multiple depreciation schedule based on finance book + - Asset Value Adjustment + - Improved Asset Movement between location or employee + - New Depreciation method Written Down Value (WDV) + + - POS + + - Allow draft mode print in online POS + - Allowed print before pay + - Save the invoice before print + + - Other Features + + - A free marketplace where any ERPNext user can list their products and be discovered by thousands of other companies using ERPNext + - Loyalty Management + - Subscriptions + - Shareholder Management + - Production Plan and Job Card + - Delivery Trip + - Updated Timesheets + - Lead Notes + + - GST (India) + - Auto selection of GST tax template based on company and shipping address + - GSTR-1 based on the address + - HSN-wise summary of outwards supplies + +- Changes have been made to ensure ERPNext is compatible with Python 3 +- Better documentation is now available with support for more languages +- A lot of other fixes have been done to ensure a better overall user experience \ No newline at end of file From 7ef69b68f80ca3cda0055aeb4b1014c69d332758 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 29 Jan 2019 15:52:57 +0530 Subject: [PATCH 78/86] Update v11_0_4.md --- erpnext/change_log/v11/v11_0_4.md | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/erpnext/change_log/v11/v11_0_4.md b/erpnext/change_log/v11/v11_0_4.md index 0c4325f3b4..771c80be01 100644 --- a/erpnext/change_log/v11/v11_0_4.md +++ b/erpnext/change_log/v11/v11_0_4.md @@ -6,14 +6,17 @@ - Multiple Finance Books - Bank Statement Upload - Tax Withholding - - Subscriptions and Deferred Revenue + - Subscriptions + - Deferred Revenue and Expenses + - Exchange Rate Revaluation - Inter Company Transactions - Standalone Credit / Debit Note - Reverse Journal Entry - Enhanced Bank Guarantee - Cost Center Numbering + - Loyalty Points Management - - Human Resource + - Human Resources - Department Hierarchy - Leave Management @@ -30,10 +33,12 @@ - Employee Tax Exemptions - Auto Calculation of Tax Deduction - Enhanced Salary Processing - - Employee Lifecycle - Employee Onboarding - Employee Separation - - Employee Transfer and Promotion + - Employee Transfer + - Employee Promotion + - Employee Incentive + - Retention Bonus - Shift Planning - Staffing Plan @@ -54,8 +59,8 @@ - Other Features - A free marketplace where any ERPNext user can list their products and be discovered by thousands of other companies using ERPNext - - Loyalty Management - - Subscriptions + - Add/Update quantity in Sales & Purchase Order without amending document + - Enhanced Item Price (Based on UOM, Party, Min. Qty, etc.) - Shareholder Management - Production Plan and Job Card - Delivery Trip @@ -69,4 +74,4 @@ - Changes have been made to ensure ERPNext is compatible with Python 3 - Better documentation is now available with support for more languages -- A lot of other fixes have been done to ensure a better overall user experience \ No newline at end of file +- A lot of other fixes have been done to ensure a better overall user experience From bad36ef3efbef8c724d6e5c1fa0d4d9aad47bfed Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 29 Jan 2019 16:00:45 +0530 Subject: [PATCH 79/86] fix: add node_modules to gitignore (#16515) --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 68272c7d4d..16522447c2 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ erpnext/docs/current *.swo __pycache__ *~ +node_modules/ \ No newline at end of file From 9f33c208d7bb0ea9c2af6c5f8d29daa70b9c2225 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 29 Jan 2019 16:07:07 +0530 Subject: [PATCH 80/86] Update v11_0_4.md --- erpnext/change_log/v11/v11_0_4.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/erpnext/change_log/v11/v11_0_4.md b/erpnext/change_log/v11/v11_0_4.md index 771c80be01..f4dfe16faf 100644 --- a/erpnext/change_log/v11/v11_0_4.md +++ b/erpnext/change_log/v11/v11_0_4.md @@ -15,6 +15,7 @@ - Enhanced Bank Guarantee - Cost Center Numbering - Loyalty Points Management + - Enhanced General ledger report - Human Resources @@ -66,6 +67,8 @@ - Delivery Trip - Updated Timesheets - Lead Notes + - Better Sales / Purchase / Stock Analytics report + - Currency exchange API is changed to frankfurter public domain - GST (India) - Auto selection of GST tax template based on company and shipping address From a95ed44d3df7f8534956db71ddf8c5cc37e8783f Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 29 Jan 2019 16:24:53 +0530 Subject: [PATCH 81/86] fix: test case for fiscal year (#16516) --- erpnext/accounts/doctype/fiscal_year/fiscal_year.py | 8 ++++++-- erpnext/accounts/doctype/fiscal_year/test_fiscal_year.py | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py index 6bb71b667f..d80bc7fad1 100644 --- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py @@ -9,6 +9,8 @@ from dateutil.relativedelta import relativedelta from frappe.model.document import Document +class FiscalYearIncorrectDate(frappe.ValidationError): pass + class FiscalYear(Document): def set_as_default(self): frappe.db.set_value("Global Defaults", None, "current_fiscal_year", self.name) @@ -35,12 +37,14 @@ class FiscalYear(Document): def validate_dates(self): if getdate(self.year_start_date) > getdate(self.year_end_date): - frappe.throw(_("Fiscal Year Start Date should be one year earlier than Fiscal Year End Date")) + frappe.throw(_("Fiscal Year Start Date should be one year earlier than Fiscal Year End Date"), + FiscalYearIncorrectDate) date = getdate(self.year_start_date) + relativedelta(years=1) - relativedelta(days=1) if getdate(self.year_end_date) != date: - frappe.throw(_("Fiscal Year End Date should be one year after Fiscal Year Start Date")) + frappe.throw(_("Fiscal Year End Date should be one year after Fiscal Year Start Date"), + FiscalYearIncorrectDate) def on_update(self): check_duplicate_fiscal_year(self) diff --git a/erpnext/accounts/doctype/fiscal_year/test_fiscal_year.py b/erpnext/accounts/doctype/fiscal_year/test_fiscal_year.py index 5f90bb3867..f7b7782766 100644 --- a/erpnext/accounts/doctype/fiscal_year/test_fiscal_year.py +++ b/erpnext/accounts/doctype/fiscal_year/test_fiscal_year.py @@ -5,6 +5,8 @@ from __future__ import unicode_literals import frappe, unittest +from erpnext.accounts.doctype.fiscal_year.fiscal_year import FiscalYearIncorrectDate + test_records = frappe.get_test_records('Fiscal Year') test_ignore = ["Company"] @@ -12,12 +14,12 @@ class TestFiscalYear(unittest.TestCase): def test_extra_year(self): if frappe.db.exists("Fiscal Year", "_Test Fiscal Year 2000"): frappe.delete_doc("Fiscal Year", "_Test Fiscal Year 2000") + fy = frappe.get_doc({ "doctype": "Fiscal Year", "year": "_Test Fiscal Year 2000", "year_end_date": "2002-12-31", "year_start_date": "2000-04-01" }) - fy.insert() - self.assertEqual(fy.year_end_date, '2001-03-31') + self.assertRaises(FiscalYearIncorrectDate, fy.insert) From b32d9458b5ed456fbb3c629cfd886fcb7eb1375d Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 29 Jan 2019 17:30:19 +0550 Subject: [PATCH 82/86] bumped to version 10.1.81 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 847618232c..c1090e9e0a 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '10.1.80' +__version__ = '10.1.81' def get_default_company(user=None): '''Get default company for user''' From 51a27b3524d79adee63b3a0d86fcc091f89581d3 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 29 Jan 2019 17:52:47 +0530 Subject: [PATCH 83/86] fix: unsaved merge conflict --- .../hr/doctype/payroll_entry/payroll_entry.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.py b/erpnext/hr/doctype/payroll_entry/payroll_entry.py index 9dbca5ec66..af5e3d0570 100644 --- a/erpnext/hr/doctype/payroll_entry/payroll_entry.py +++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.py @@ -115,7 +115,7 @@ class PayrollEntry(Document): frappe.enqueue(create_salary_slips_for_employees, timeout=600, employees=emp_list, args=args) else: create_salary_slips_for_employees(emp_list, args, publish_progress=False) - + def get_sal_slip_list(self, ss_status, as_dict=False): """ Returns list of salary slips based on selected criteria @@ -196,7 +196,7 @@ class PayrollEntry(Document): return account_dict def get_default_payroll_payable_account(self): - payroll_payable_account = frappe.get_cached_value('Company', + payroll_payable_account = frappe.get_cached_value('Company', {"company_name": self.company}, "default_payroll_payable_account") if not payroll_payable_account: @@ -482,7 +482,6 @@ def payroll_entry_has_bank_entries(name): return response -<<<<<<< HEAD def create_salary_slips_for_employees(employees, args, publish_progress=True): salary_slips_exists_for = get_existing_salary_slips(employees, args) count=0 @@ -505,9 +504,9 @@ def create_salary_slips_for_employees(employees, args, publish_progress=True): def get_existing_salary_slips(employees, args): return frappe.db.sql_list(""" - select distinct employee from `tabSalary Slip` + select distinct employee from `tabSalary Slip` where docstatus!= 2 and company = %s - and start_date >= %s and end_date <= %s + and start_date >= %s and end_date <= %s and employee in (%s) """ % ('%s', '%s', '%s', ', '.join(['%s']*len(employees))), [args.company, args.start_date, args.end_date] + employees) @@ -528,7 +527,7 @@ def submit_salary_slips_for_employees(payroll_entry, salary_slips, publish_progr submitted_ss.append(ss_obj) except frappe.ValidationError: not_submitted_ss.append(ss[0]) - + count += 1 if publish_progress: frappe.publish_progress(count*100/len(salary_slips), title = _("Submitting Salary Slips...")) @@ -539,7 +538,7 @@ def submit_salary_slips_for_employees(payroll_entry, salary_slips, publish_progr .format(ss_obj.start_date, ss_obj.end_date)) payroll_entry.email_salary_slip(submitted_ss) - + payroll_entry.db_set("salary_slips_submitted", 1) payroll_entry.notify_update() @@ -547,8 +546,7 @@ def submit_salary_slips_for_employees(payroll_entry, salary_slips, publish_progr frappe.msgprint(_("No salary slip found to submit for the above selected criteria OR salary slip already submitted")) if not_submitted_ss: - frappe.msgprint(_("Could not submit some Salary Slips")) -======= + frappe.msgprint(_("Could not submit some Salary Slips")) def get_payroll_entries_for_jv(doctype, txt, searchfield, start, page_len, filters): return frappe.db.sql(""" select name from `tabPayroll Entry` @@ -561,4 +559,3 @@ def get_payroll_entries_for_jv(doctype, txt, searchfield, start, page_len, filte 'txt': "%%%s%%" % frappe.db.escape(txt), 'start': start, 'page_len': page_len }) ->>>>>>> master From b5dda63dddf6bddc9acb660b01bd36e84d33aa72 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 29 Jan 2019 17:54:47 +0530 Subject: [PATCH 84/86] fix: change changelog version to 11.1.0 --- erpnext/change_log/v11/v11_0_4.md | 80 ------------------------------- 1 file changed, 80 deletions(-) delete mode 100644 erpnext/change_log/v11/v11_0_4.md diff --git a/erpnext/change_log/v11/v11_0_4.md b/erpnext/change_log/v11/v11_0_4.md deleted file mode 100644 index f4dfe16faf..0000000000 --- a/erpnext/change_log/v11/v11_0_4.md +++ /dev/null @@ -1,80 +0,0 @@ -- Enhancements - - - Accounting - - - Company Tree - - Multiple Finance Books - - Bank Statement Upload - - Tax Withholding - - Subscriptions - - Deferred Revenue and Expenses - - Exchange Rate Revaluation - - Inter Company Transactions - - Standalone Credit / Debit Note - - Reverse Journal Entry - - Enhanced Bank Guarantee - - Cost Center Numbering - - Loyalty Points Management - - Enhanced General ledger report - - - Human Resources - - - Department Hierarchy - - Leave Management - - Leave Period - - New Leave Types - - Leave Encashment - - Compensatory Leave - - Attendance Request - - Enhanced Payroll - - New Salary Structure - - Additional Salary - - Payroll Period - - Employee Benefits - - Employee Tax Exemptions - - Auto Calculation of Tax Deduction - - Enhanced Salary Processing - - Employee Onboarding - - Employee Separation - - Employee Transfer - - Employee Promotion - - Employee Incentive - - Retention Bonus - - Shift Planning - - Staffing Plan - - - Asset Management - - - Capital-Work-in-Progress (CWIP) Accounting - - Multiple depreciation schedule based on finance book - - Asset Value Adjustment - - Improved Asset Movement between location or employee - - New Depreciation method Written Down Value (WDV) - - - POS - - - Allow draft mode print in online POS - - Allowed print before pay - - Save the invoice before print - - - Other Features - - - A free marketplace where any ERPNext user can list their products and be discovered by thousands of other companies using ERPNext - - Add/Update quantity in Sales & Purchase Order without amending document - - Enhanced Item Price (Based on UOM, Party, Min. Qty, etc.) - - Shareholder Management - - Production Plan and Job Card - - Delivery Trip - - Updated Timesheets - - Lead Notes - - Better Sales / Purchase / Stock Analytics report - - Currency exchange API is changed to frankfurter public domain - - - GST (India) - - Auto selection of GST tax template based on company and shipping address - - GSTR-1 based on the address - - HSN-wise summary of outwards supplies - -- Changes have been made to ensure ERPNext is compatible with Python 3 -- Better documentation is now available with support for more languages -- A lot of other fixes have been done to ensure a better overall user experience From 606bd37316c96b9e2750610c3638adcfc4f260eb Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 29 Jan 2019 17:55:46 +0530 Subject: [PATCH 85/86] fix: change changelog version to 11.1.0 --- erpnext/change_log/v11/v11_1_0.md | 80 +++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 erpnext/change_log/v11/v11_1_0.md diff --git a/erpnext/change_log/v11/v11_1_0.md b/erpnext/change_log/v11/v11_1_0.md new file mode 100644 index 0000000000..f4dfe16faf --- /dev/null +++ b/erpnext/change_log/v11/v11_1_0.md @@ -0,0 +1,80 @@ +- Enhancements + + - Accounting + + - Company Tree + - Multiple Finance Books + - Bank Statement Upload + - Tax Withholding + - Subscriptions + - Deferred Revenue and Expenses + - Exchange Rate Revaluation + - Inter Company Transactions + - Standalone Credit / Debit Note + - Reverse Journal Entry + - Enhanced Bank Guarantee + - Cost Center Numbering + - Loyalty Points Management + - Enhanced General ledger report + + - Human Resources + + - Department Hierarchy + - Leave Management + - Leave Period + - New Leave Types + - Leave Encashment + - Compensatory Leave + - Attendance Request + - Enhanced Payroll + - New Salary Structure + - Additional Salary + - Payroll Period + - Employee Benefits + - Employee Tax Exemptions + - Auto Calculation of Tax Deduction + - Enhanced Salary Processing + - Employee Onboarding + - Employee Separation + - Employee Transfer + - Employee Promotion + - Employee Incentive + - Retention Bonus + - Shift Planning + - Staffing Plan + + - Asset Management + + - Capital-Work-in-Progress (CWIP) Accounting + - Multiple depreciation schedule based on finance book + - Asset Value Adjustment + - Improved Asset Movement between location or employee + - New Depreciation method Written Down Value (WDV) + + - POS + + - Allow draft mode print in online POS + - Allowed print before pay + - Save the invoice before print + + - Other Features + + - A free marketplace where any ERPNext user can list their products and be discovered by thousands of other companies using ERPNext + - Add/Update quantity in Sales & Purchase Order without amending document + - Enhanced Item Price (Based on UOM, Party, Min. Qty, etc.) + - Shareholder Management + - Production Plan and Job Card + - Delivery Trip + - Updated Timesheets + - Lead Notes + - Better Sales / Purchase / Stock Analytics report + - Currency exchange API is changed to frankfurter public domain + + - GST (India) + - Auto selection of GST tax template based on company and shipping address + - GSTR-1 based on the address + - HSN-wise summary of outwards supplies + +- Changes have been made to ensure ERPNext is compatible with Python 3 +- Better documentation is now available with support for more languages +- A lot of other fixes have been done to ensure a better overall user experience From 1a4cd3b66a1fdb835eb7991e4e400a27ab4cd335 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 29 Jan 2019 18:46:34 +0550 Subject: [PATCH 86/86] bumped to version 11.1.0 --- erpnext/hooks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/hooks.py b/erpnext/hooks.py index fd129e5b8e..5fdef885ff 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -12,7 +12,7 @@ app_license = "GNU General Public License (v3)" source_link = "https://github.com/frappe/erpnext" develop_version = '12.x.x-develop' -staging_version = '11.0.3-beta.37' +staging_version = '11.1.0' error_report_email = "support@erpnext.com"