From 1c1dd08a3423ee623ff127d924da3b8fc8f366aa Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Thu, 21 Sep 2017 12:01:20 +0530 Subject: [PATCH 1/3] only validate party account and ref doc party account in selected case (#10863) * only validate party account and ref doc party account in selected case * fix for fee structure test * fix the assessment result test --- erpnext/accounts/doctype/payment_entry/payment_entry.py | 6 +++--- .../doctype/assessment_result/test_assessment_result.js | 5 +++-- erpnext/schools/doctype/fee_structure/test_records.json | 8 ++++---- erpnext/schools/doctype/fees/fees.json | 4 ++-- erpnext/schools/doctype/fees/fees.py | 9 +++++++-- erpnext/schools/doctype/fees/test_fees.py | 4 ++-- 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index c93e5f9d3a..31869fb99c 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -221,9 +221,9 @@ class PaymentEntry(AccountsController): elif self.party_type=="Employee": ref_party_account = ref_doc.payable_account - if ref_party_account != self.party_account: - frappe.throw(_("{0} {1} is associated with {2}, but Party Account is {3}") - .format(d.reference_doctype, d.reference_name, ref_party_account, self.party_account)) + if ref_party_account != self.party_account: + frappe.throw(_("{0} {1} is associated with {2}, but Party Account is {3}") + .format(d.reference_doctype, d.reference_name, ref_party_account, self.party_account)) if ref_doc.docstatus != 1: frappe.throw(_("{0} {1} must be submitted") diff --git a/erpnext/schools/doctype/assessment_result/test_assessment_result.js b/erpnext/schools/doctype/assessment_result/test_assessment_result.js index 83aca6bcba..1ed249a75b 100644 --- a/erpnext/schools/doctype/assessment_result/test_assessment_result.js +++ b/erpnext/schools/doctype/assessment_result/test_assessment_result.js @@ -20,8 +20,9 @@ QUnit.test('Test: Assessment Result', function(assert){ () => cur_frm.refresh(), () => frappe.timeout(1), () => { - for(i = 0; i < $('tbody tr').size() * 4; i = (i + 4)) - student_list.push($(`tbody td:eq("${i}")`).text()); + $("tbody tr").each( function(i, input){ + student_list.push($(input).data().student); + }); }, // Looping through each student in the list and setting up their score diff --git a/erpnext/schools/doctype/fee_structure/test_records.json b/erpnext/schools/doctype/fee_structure/test_records.json index 8b7dc1651a..cdd00be3ff 100644 --- a/erpnext/schools/doctype/fee_structure/test_records.json +++ b/erpnext/schools/doctype/fee_structure/test_records.json @@ -14,8 +14,8 @@ } ], "total_amount": 50000, - "debit_to": "_Test Receivable - _TC", - "against_income_account": "Sales - _TC", + "receivable_account": "_Test Receivable - _TC", + "income_account": "Sales - _TC", "cost_center": "_Test Cost Center - _TC", "company": "_Test Company" }, @@ -34,8 +34,8 @@ } ], "total_amount": 50000, - "debit_to": "_Test Receivable - _TC", - "against_income_account": "Sales - _TC", + "receivable_account": "_Test Receivable - _TC", + "income_account": "Sales - _TC", "cost_center": "_Test Cost Center - _TC", "company": "_Test Company" } diff --git a/erpnext/schools/doctype/fees/fees.json b/erpnext/schools/doctype/fees/fees.json index 7a2167bddd..ab9a792c68 100644 --- a/erpnext/schools/doctype/fees/fees.json +++ b/erpnext/schools/doctype/fees/fees.json @@ -93,7 +93,7 @@ "label": "Student Name", "length": 0, "no_copy": 0, - "options": "student.student_name", + "options": "student.title", "permlevel": 0, "precision": "", "print_hide": 0, @@ -1276,7 +1276,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-09-19 16:45:14.313744", + "modified": "2017-09-20 23:17:09.819606", "modified_by": "Administrator", "module": "Schools", "name": "Fees", diff --git a/erpnext/schools/doctype/fees/fees.py b/erpnext/schools/doctype/fees/fees.py index d45d6e301b..a2fcecc0aa 100644 --- a/erpnext/schools/doctype/fees/fees.py +++ b/erpnext/schools/doctype/fees/fees.py @@ -52,8 +52,13 @@ class Fees(AccountsController): where g.name = sg.guardian and sg.parent = %s and sg.parenttype = 'Student' """, self.student) - student_emails.append(frappe.db.get_value("Student", self.student, "student_email_id")) - return ", ".join(list(set(student_emails))) + student_email_id = frappe.db.get_value("Student", self.student, "student_email_id") + if student_email_id: + student_emails.append(student_email_id) + if student_emails: + return ", ".join(list(set(student_emails))) + else: + return None def calculate_total(self): diff --git a/erpnext/schools/doctype/fees/test_fees.py b/erpnext/schools/doctype/fees/test_fees.py index 283e17b211..50e1539cf1 100644 --- a/erpnext/schools/doctype/fees/test_fees.py +++ b/erpnext/schools/doctype/fees/test_fees.py @@ -19,8 +19,8 @@ class TestFees(unittest.TestCase): fee.posting_date = nowdate() fee.due_date = nowdate() fee.student = student - fee.debit_to = "_Test Receivable - _TC" - fee.against_income_account = "Sales - _TC" + fee.receivable_account = "_Test Receivable - _TC" + fee.income_account = "Sales - _TC" fee.cost_center = "_Test Cost Center - _TC" fee.company = "_Test Company" From 705d885b6472383c792c04e80295121032f76612 Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Thu, 21 Sep 2017 12:02:18 +0530 Subject: [PATCH 2/3] [progress] R/W permission for all roles (#10866) --- erpnext/setup/doctype/setup_progress/setup_progress.json | 8 ++++---- .../setup/doctype/setup_progress/test_setup_progress.py | 9 +++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 erpnext/setup/doctype/setup_progress/test_setup_progress.py diff --git a/erpnext/setup/doctype/setup_progress/setup_progress.json b/erpnext/setup/doctype/setup_progress/setup_progress.json index 2f886afe3b..09072d4665 100644 --- a/erpnext/setup/doctype/setup_progress/setup_progress.json +++ b/erpnext/setup/doctype/setup_progress/setup_progress.json @@ -84,7 +84,7 @@ "issingle": 1, "istable": 0, "max_attachments": 0, - "modified": "2017-08-28 17:44:43.100932", + "modified": "2017-09-21 11:52:56.106659", "modified_by": "Administrator", "module": "Setup", "name": "Setup Progress", @@ -95,8 +95,8 @@ "amend": 0, "apply_user_permissions": 0, "cancel": 0, - "create": 1, - "delete": 1, + "create": 0, + "delete": 0, "email": 1, "export": 0, "if_owner": 0, @@ -105,7 +105,7 @@ "print": 1, "read": 1, "report": 0, - "role": "System Manager", + "role": "All", "set_user_permissions": 0, "share": 1, "submit": 0, diff --git a/erpnext/setup/doctype/setup_progress/test_setup_progress.py b/erpnext/setup/doctype/setup_progress/test_setup_progress.py new file mode 100644 index 0000000000..8926219143 --- /dev/null +++ b/erpnext/setup/doctype/setup_progress/test_setup_progress.py @@ -0,0 +1,9 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals + +import unittest + +class TestSetupProgress(unittest.TestCase): + pass From c4c2c56af29fd04a22ab95f21d34305297ddabf2 Mon Sep 17 00:00:00 2001 From: Vishal Dhayagude Date: Thu, 21 Sep 2017 12:07:56 +0530 Subject: [PATCH 3/3] env variable added (#10847) --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index cae50cb908..8681c03f55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,8 +57,11 @@ jobs: script: - set -e - bench run-tests + env: Server Side Test - # stage script: - bench --verbose run-setup-wizard-ui-test - bench execute erpnext.setup.utils.enable_all_roles_and_domains - bench run-ui-tests --app erpnext + env: Client Side Test +