+
+#### Final Score and Standings
+The supplier scorecard consists of a set evaluation periods, during which the performance of a supplier is
+evaluated. This period can be daily, monthly or yearly. The current score is calculated from the score of each evaluation
+period based on the weighting function. The default formula is linearly weight over the previous 12 scoring periods.
+
+This formula is customizable.
+
+The supplier standing is used to quickly sort suppliers based on their performance. These are customizable for each supplier.
+The scorecard standing of a supplier can also be used to restrict suppliers from being included in Request for Quotations or
+being issued Purchase Orders.
+
+
+#### Evaluation Criteria and Variables
+A supplier can be evaluated on several individual evaluation criteria, including (but not limited to) quotation response time,
+delivered item quality, and delivery timeliness. These criteria are weighed to determine the final period score.
+
+The method for calculating each criteria is determined through the criteria formula field, which can use a number of pre-established variables.
+The value of each of these variables is calculated over the scoring period for each supplier. Examples of such variables include:
+ - The total number of items received from the supplier
+ - The total number of accepted items from the supplier
+ - The total number of rejected items from the supplier
+ - The total number of deliveries from the supplier
+ - The total amount (in dollars) received from a supplier
+Additional variables can be added through server-side customizations.
+
+The criteria formula should be customized to evaluate the suppliers in each criteria in a way that best fits the Company requirements.
+
+##### Evaluation Formulas
+The evaluation formula uses the pre-established or custom variables to evaluate an aspect of supplier performance over the scoring period. Formulas can use the following mathematical functions:
+
+* addition: +
+* subtraction: -
+* multiplication: *
+* division: /
+* min: min(x,y)
+* max: max(x,y)
+* if/else: (x) if (formula) else (y)
+* less than: <
+* greated than: >
+* variables: {variable_name}
+
+It is crucial that the formula be solvable for all variable values. This is most often an issue if the value resolves to 0. For example:
+```
+{total_accepted_items} / {total_received_items}
+```
+
+This example would resolve to 0 / 0 in periods where there are no received items, and therefore should have a check to protect in this case:
+```
+({total_accepted_items} / {total_received_items}) if {total_received_items} > 0 else 1.
+```
+
+### Evaluating the Supplier
+An evaluation is generated for each Supplier Scorecard Period by clicking the "Generate Missing Scorecard Periods" button. The supplier
+current score can be seen, as well as a visual graphic showing the performance of the supplier over time. Any actions against the supplier
+are also noted here, including warnings when create RFQs and POs or locking out those features for this supplier altogether.
+
+
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-account.md b/erpnext/docs/user/manual/en/setting-up/email/email-account.md
index ad448b0ae2a..d5aca1a0068 100644
--- a/erpnext/docs/user/manual/en/setting-up/email/email-account.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-account.md
@@ -26,6 +26,12 @@ To setup an incoming Email Account, check on **Enable Incoming** and set your PO
+### Setting Import Conditions for Email Import
+
+Email Accounts allows you to set conditions according to the data of the incoming emails. The email will be imported to ERPNext only if the all conditions are true. For example if you want to import an email if the subject is "Some important email", you put doc.subject == "Some important email" in the conditions textbox. You can also set more complex conditions by combining them, as shown on the following screenshot.
+
+
+
### How ERPNext handles replies
In ERPNext when you send an email to a contact like a customer, the sender will be the user who sent the email. In the **Reply-To** property, the Email Address will be of the default incoming account (like `replies@yourcompany.com`). ERPNext will automatically extract these emails from the incoming account and tag it to the relevant communication
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 472d8f9a9e2..37fd8692e58 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -72,14 +72,20 @@ website_route_rules = [
"parents": [{"title": _("Invoices"), "name": "invoices"}]
}
},
- {"from_route": "/quotations", "to_route": "Supplier Quotation"},
- {"from_route": "/quotations/
ERPNext`);
- }
});
var test_values_edu = {
diff --git a/erpnext/schools/doctype/academic_term/test_academic_term.js b/erpnext/schools/doctype/academic_term/test_academic_term.js
new file mode 100644
index 00000000000..c74071b7e75
--- /dev/null
+++ b/erpnext/schools/doctype/academic_term/test_academic_term.js
@@ -0,0 +1,25 @@
+// Testing Setup Module in Schools
+QUnit.module('setup');
+
+// Testing Academic Term option
+QUnit.test('test academic term', function(assert){
+ assert.expect(4);
+ let done = assert.async();
+ frappe.run_serially([
+ () => {
+ return frappe.tests.make('Academic Term', [
+ {academic_year: '2016-17'},
+ {term_name: "Semester 1"},
+ {term_start_date: '2016-07-20'},
+ {term_end_date:'2017-06-20'},
+ ]);
+ },
+ () => {
+ assert.ok(cur_frm.doc.academic_year=='2016-17');
+ assert.ok(cur_frm.doc.term_name=='Semester 1');
+ assert.ok(cur_frm.doc.term_start_date=='2016-07-20');
+ assert.ok(cur_frm.doc.term_end_date=='2017-06-20');
+ },
+ () => done()
+ ]);
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/academic_year/test_academic_year.js b/erpnext/schools/doctype/academic_year/test_academic_year.js
new file mode 100644
index 00000000000..5123b6e4549
--- /dev/null
+++ b/erpnext/schools/doctype/academic_year/test_academic_year.js
@@ -0,0 +1,24 @@
+// Testing Setup Module in Schools
+QUnit.module('setup');
+
+// Testing Academic Year Testing option
+QUnit.test('test academic year', function(assert){
+ assert.expect(3);
+ let done = assert.async();
+ frappe.run_serially([
+ () => {
+ return frappe.tests.make('Academic Year', [
+ {academic_year_name: '2015-16'},
+ {year_start_date: '2015-07-20'},
+ {year_end_date:'2016-06-20'},
+ ]);
+ },
+
+ () => {
+ assert.ok(cur_frm.doc.academic_year_name=='2015-16');
+ assert.ok(cur_frm.doc.year_start_date=='2015-07-20');
+ assert.ok(cur_frm.doc.year_end_date=='2016-06-20');
+ },
+ () => done()
+ ]);
+});
\ No newline at end of file
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index 1b77418bd27..52c6b6db862 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -81,6 +81,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "depends_on": "eval:doc.customer_type!='Company'",
"fieldname": "salutation",
"fieldtype": "Link",
"hidden": 0,
@@ -143,6 +144,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "depends_on": "eval:doc.customer_type != 'Company'",
"fieldname": "gender",
"fieldtype": "Link",
"hidden": 0,
@@ -1200,7 +1202,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-06-28 14:55:39.910819",
+ "modified": "2017-07-24 00:55:07.445783",
"modified_by": "Administrator",
"module": "Selling",
"name": "Customer",
diff --git a/erpnext/setup/doctype/company/test_company.js b/erpnext/setup/doctype/company/test_company.js
new file mode 100644
index 00000000000..afa3296e896
--- /dev/null
+++ b/erpnext/setup/doctype/company/test_company.js
@@ -0,0 +1,23 @@
+QUnit.module('setup');
+
+QUnit.test("Test: Company [SetUp]", function (assert) {
+ assert.expect(1);
+ let done = assert.async();
+
+ frappe.run_serially([
+ // test company creation
+ () => frappe.set_route("List", "Company", "List"),
+ () => frappe.new_doc("Company"),
+ () => frappe.timeout(1),
+ () => cur_frm.set_value("company_name", "Test Company"),
+ () => cur_frm.set_value("abbr", "TC"),
+ () => cur_frm.set_value("domain", "Services"),
+ () => cur_frm.set_value("default_currency", "INR"),
+ // save form
+ () => cur_frm.save(),
+ () => frappe.timeout(1),
+ () => assert.equal("Test Company", cur_frm.doc.company_name,
+ 'name of company correctly saved'),
+ () => done()
+ ]);
+});
\ No newline at end of file
diff --git a/erpnext/setup/setup_wizard/install_fixtures.py b/erpnext/setup/setup_wizard/install_fixtures.py
index 43baf2f4fb2..f139d92f350 100644
--- a/erpnext/setup/setup_wizard/install_fixtures.py
+++ b/erpnext/setup/setup_wizard/install_fixtures.py
@@ -185,6 +185,10 @@ def install(country=None):
{'doctype': "Party Type", "party_type": "Supplier"},
{'doctype': "Party Type", "party_type": "Employee"},
+ {'doctype': "Project Type", "project_type": "Internal"},
+ {'doctype': "Project Type", "project_type": "External"},
+ {'doctype': "Project Type", "project_type": "Other"},
+
{"doctype": "Offer Term", "offer_term": _("Date of Joining")},
{"doctype": "Offer Term", "offer_term": _("Annual Salary")},
{"doctype": "Offer Term", "offer_term": _("Probationary Period")},
@@ -213,6 +217,10 @@ def install(country=None):
records += [{'doctype': 'Lead Source', 'source_name': _(d)} for d in default_lead_sources]
+ # Records for the Supplier Scorecard
+ from erpnext.buying.doctype.supplier_scorecard.supplier_scorecard import make_default_records
+ make_default_records()
+
from frappe.modules import scrub
for r in records:
doc = frappe.new_doc(r.get("doctype"))
diff --git a/erpnext/setup/utils.py b/erpnext/setup/utils.py
index 93dad165de8..086235e1cb2 100644
--- a/erpnext/setup/utils.py
+++ b/erpnext/setup/utils.py
@@ -50,6 +50,7 @@ def before_tests():
frappe.db.sql("delete from `tabItem Price`")
frappe.db.set_value("Stock Settings", None, "auto_insert_price_list_rate_if_missing", 0)
+ enable_all_roles_and_domains()
frappe.db.commit()
@@ -94,3 +95,29 @@ def get_exchange_rate(from_currency, to_currency, transaction_date=None):
except:
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
+
+def enable_all_roles_and_domains():
+ """ enable all roles and domain for testing """
+ roles = frappe.get_list("Role", filters={"disabled": 1})
+ for role in roles:
+ _role = frappe.get_doc("Role", role.get("name"))
+ _role.disabled = 0
+ _role.flags.ignore_mandatory = True
+ _role.flags.ignore_permissions = True
+ _role.save()
+
+ # add all roles to users
+ user = frappe.get_doc("User", "test@erpnext.com")
+ user.add_roles(*[role.get("name") for role in roles])
+
+ domains = frappe.get_list("Domain")
+ if not domains:
+ return
+
+ domain_settings = frappe.get_doc("Domain Settings", "Domain Settings")
+ domain_settings.set("active_domains", [])
+ for domain in domains:
+ row = domain_settings.append("active_domains", {})
+ row.domain=domain.get("name")
+
+ domain_settings.save()
diff --git a/erpnext/startup/boot.py b/erpnext/startup/boot.py
index ceeceaa3c93..6b503b3eec2 100644
--- a/erpnext/startup/boot.py
+++ b/erpnext/startup/boot.py
@@ -16,8 +16,10 @@ def boot_session(bootinfo):
update_page_info(bootinfo)
load_country_and_currency(bootinfo)
- bootinfo.sysdefaults.territory = get_root_of('Territory')
- bootinfo.sysdefaults.customer_group = get_root_of('Customer Group')
+ bootinfo.sysdefaults.territory = frappe.db.get_single_value('Selling Settings',
+ 'territory') or get_root_of('Territory')
+ bootinfo.sysdefaults.customer_group = frappe.db.get_single_value('Selling Settings',
+ 'customer_group') or get_root_of('Customer Group')
bootinfo.notification_settings = frappe.get_doc("Notification Control",
"Notification Control")
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index a3ae0eb121e..80ef70805a2 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -243,7 +243,8 @@ def get_price_list_rate(args, item_doc, out):
if meta.get_field("currency"):
validate_price_list(args)
- validate_conversion_rate(args, meta)
+ if args.price_list:
+ validate_conversion_rate(args, meta)
price_list_rate = get_price_list_rate_for(args.price_list, item_doc.name)
diff --git a/erpnext/support/doctype/issue/issue.js b/erpnext/support/doctype/issue/issue.js
index 2bee422ca52..bef8cb4d2ba 100644
--- a/erpnext/support/doctype/issue/issue.js
+++ b/erpnext/support/doctype/issue/issue.js
@@ -20,9 +20,11 @@ frappe.ui.form.on("Issue", {
timeline_refresh: function(frm) {
// create button for "Add to Knowledge Base"
if(frappe.model.can_create('Help Article')) {
- $('