Merge pull request #25946 from gavindsouza/patch-tests
ci: Update Patch tests
diff --git a/erpnext/education/doctype/course_enrollment/course_enrollment.py b/erpnext/education/doctype/course_enrollment/course_enrollment.py
index 2b3acf1..ce88990 100644
--- a/erpnext/education/doctype/course_enrollment/course_enrollment.py
+++ b/erpnext/education/doctype/course_enrollment/course_enrollment.py
@@ -91,4 +91,4 @@
if activity:
return activity[0].name
else:
- return None
\ No newline at end of file
+ return None
diff --git a/erpnext/education/utils.py b/erpnext/education/utils.py
index 8f51fef..819106b 100644
--- a/erpnext/education/utils.py
+++ b/erpnext/education/utils.py
@@ -219,7 +219,6 @@
try:
quiz = frappe.get_doc("Quiz", quiz_name)
questions = quiz.get_questions()
- duration = quiz.duration
except:
frappe.throw(_("Quiz {0} does not exist").format(quiz_name), frappe.DoesNotExistError)
return None
@@ -236,15 +235,17 @@
return {
'questions': questions,
'activity': None,
- 'duration':duration
+ 'is_time_bound': quiz.is_time_bound,
+ 'duration':quiz.duration
}
student = get_current_student()
course_enrollment = get_enrollment("course", course, student.name)
status, score, result, time_taken = check_quiz_completion(quiz, course_enrollment)
return {
- 'questions': questions,
+ 'questions': questions,
'activity': {'is_complete': status, 'score': score, 'result': result, 'time_taken': time_taken},
+ 'is_time_bound': quiz.is_time_bound,
'duration': quiz.duration
}
@@ -372,9 +373,9 @@
def check_quiz_completion(quiz, enrollment_name):
attempts = frappe.get_all("Quiz Activity",
filters={
- 'enrollment': enrollment_name,
+ 'enrollment': enrollment_name,
'quiz': quiz.name
- },
+ },
fields=["name", "activity_date", "score", "status", "time_taken"]
)
status = False if quiz.max_attempts == 0 else bool(len(attempts) >= quiz.max_attempts)
@@ -389,4 +390,4 @@
time_taken = attempts[0]['time_taken']
if result == 'Pass':
status = True
- return status, score, result, time_taken
\ No newline at end of file
+ return status, score, result, time_taken
diff --git a/erpnext/payroll/doctype/salary_slip/salary_slip.py b/erpnext/payroll/doctype/salary_slip/salary_slip.py
index 3c25331..c55bec8 100644
--- a/erpnext/payroll/doctype/salary_slip/salary_slip.py
+++ b/erpnext/payroll/doctype/salary_slip/salary_slip.py
@@ -115,10 +115,23 @@
status = "Cancelled"
return status
- def validate_dates(self):
+ def validate_dates(self, joining_date=None, relieving_date=None):
if date_diff(self.end_date, self.start_date) < 0:
frappe.throw(_("To date cannot be before From date"))
+ if not joining_date:
+ joining_date, relieving_date = frappe.get_cached_value(
+ "Employee",
+ self.employee,
+ ("date_of_joining", "relieving_date")
+ )
+
+ if date_diff(self.end_date, joining_date) < 0:
+ frappe.throw(_("Cannot create Salary Slip for Employee joining after Payroll Period"))
+
+ if relieving_date and date_diff(relieving_date, self.start_date) < 0:
+ frappe.throw(_("Cannot create Salary Slip for Employee who has left before Payroll Period"))
+
def is_rounding_total_disabled(self):
return cint(frappe.db.get_single_value("Payroll Settings", "disable_rounded_total"))
@@ -154,9 +167,14 @@
if not self.salary_slip_based_on_timesheet:
self.get_date_details()
- self.validate_dates()
- joining_date, relieving_date = frappe.get_cached_value("Employee", self.employee,
- ["date_of_joining", "relieving_date"])
+
+ joining_date, relieving_date = frappe.get_cached_value(
+ "Employee",
+ self.employee,
+ ("date_of_joining", "relieving_date")
+ )
+
+ self.validate_dates(joining_date, relieving_date)
#getin leave details
self.get_working_days_details(joining_date, relieving_date)
@@ -492,11 +510,39 @@
def get_data_for_eval(self):
'''Returns data for evaluating formula'''
data = frappe._dict()
+ employee = frappe.get_doc("Employee", self.employee).as_dict()
- data.update(frappe.get_doc("Salary Structure Assignment",
- {"employee": self.employee, "salary_structure": self.salary_structure}).as_dict())
+ start_date = getdate(self.start_date)
+ date_to_validate = (
+ employee.date_of_joining
+ if employee.date_of_joining > start_date
+ else start_date
+ )
- data.update(frappe.get_doc("Employee", self.employee).as_dict())
+ salary_structure_assignment = frappe.get_value(
+ "Salary Structure Assignment",
+ {
+ "employee": self.employee,
+ "salary_structure": self.salary_structure,
+ "from_date": ("<=", date_to_validate),
+ "docstatus": 1,
+ },
+ "*",
+ order_by="from_date desc",
+ as_dict=True,
+ )
+
+ if not salary_structure_assignment:
+ frappe.throw(
+ _("Please assign a Salary Structure for Employee {0} "
+ "applicable from or before {1} first").format(
+ frappe.bold(self.employee_name),
+ frappe.bold(formatdate(date_to_validate)),
+ )
+ )
+
+ data.update(salary_structure_assignment)
+ data.update(employee)
data.update(self.as_dict())
# set values for components
diff --git a/erpnext/payroll/doctype/salary_slip/test_salary_slip.py b/erpnext/payroll/doctype/salary_slip/test_salary_slip.py
index 01e4170..9e7db97 100644
--- a/erpnext/payroll/doctype/salary_slip/test_salary_slip.py
+++ b/erpnext/payroll/doctype/salary_slip/test_salary_slip.py
@@ -8,7 +8,6 @@
import calendar
import random
from erpnext.accounts.utils import get_fiscal_year
-from frappe.utils.make_random import get_random
from frappe.utils import getdate, nowdate, add_days, add_months, flt, get_first_day, get_last_day, cstr
from erpnext.payroll.doctype.salary_structure.salary_structure import make_salary_slip
from erpnext.payroll.doctype.payroll_entry.payroll_entry import get_month_details
@@ -155,12 +154,14 @@
self.assertEqual(ss.gross_pay, 78000)
def test_payment_days(self):
+ from erpnext.payroll.doctype.salary_structure.test_salary_structure import create_salary_structure_assignment
+
no_of_days = self.get_no_of_days()
# Holidays not included in working days
frappe.db.set_value("Payroll Settings", None, "include_holidays_in_total_working_days", 1)
# set joinng date in the same month
- make_employee("test_payment_days@salary.com")
+ employee = make_employee("test_payment_days@salary.com")
if getdate(nowdate()).day >= 15:
relieving_date = getdate(add_days(nowdate(),-10))
date_of_joining = getdate(add_days(nowdate(),-10))
@@ -174,25 +175,30 @@
date_of_joining = getdate(nowdate())
relieving_date = getdate(nowdate())
- frappe.db.set_value("Employee", frappe.get_value("Employee",
- {"employee_name":"test_payment_days@salary.com"}, "name"), "date_of_joining", date_of_joining)
- frappe.db.set_value("Employee", frappe.get_value("Employee",
- {"employee_name":"test_payment_days@salary.com"}, "name"), "relieving_date", None)
- frappe.db.set_value("Employee", frappe.get_value("Employee",
- {"employee_name":"test_payment_days@salary.com"}, "name"), "status", "Active")
+ frappe.db.set_value("Employee", employee, {
+ "date_of_joining": date_of_joining,
+ "relieving_date": None,
+ "status": "Active"
+ })
- ss = make_employee_salary_slip("test_payment_days@salary.com", "Monthly", "Test Payment Days")
+ salary_structure = "Test Payment Days"
+ ss = make_employee_salary_slip("test_payment_days@salary.com", "Monthly", salary_structure)
self.assertEqual(ss.total_working_days, no_of_days[0])
self.assertEqual(ss.payment_days, (no_of_days[0] - getdate(date_of_joining).day + 1))
# set relieving date in the same month
- frappe.db.set_value("Employee",frappe.get_value("Employee",
- {"employee_name":"test_payment_days@salary.com"}, "name"), "date_of_joining", (add_days(nowdate(),-60)))
- frappe.db.set_value("Employee", frappe.get_value("Employee",
- {"employee_name":"test_payment_days@salary.com"}, "name"), "relieving_date", relieving_date)
- frappe.db.set_value("Employee", frappe.get_value("Employee",
- {"employee_name":"test_payment_days@salary.com"}, "name"), "status", "Left")
+ frappe.db.set_value("Employee", employee, {
+ "date_of_joining": add_days(nowdate(),-60),
+ "relieving_date": relieving_date,
+ "status": "Left"
+ })
+
+ if date_of_joining.day > 1:
+ self.assertRaises(frappe.ValidationError, ss.save)
+
+ create_salary_structure_assignment(employee, salary_structure)
+ ss.reload()
ss.save()
self.assertEqual(ss.total_working_days, no_of_days[0])
@@ -285,6 +291,7 @@
def test_multi_currency_salary_slip(self):
from erpnext.payroll.doctype.salary_structure.test_salary_structure import make_salary_structure
+
applicant = make_employee("test_multi_currency_salary_slip@salary.com", company="_Test Company")
frappe.db.sql("""delete from `tabSalary Structure` where name='Test Multi Currency Salary Slip'""")
salary_structure = make_salary_structure("Test Multi Currency Salary Slip", "Monthly", employee=applicant, company="_Test Company", currency='USD')
@@ -325,7 +332,8 @@
def test_component_wise_year_to_date_computation(self):
from erpnext.payroll.doctype.salary_structure.test_salary_structure import make_salary_structure
- applicant = make_employee("test_ytd@salary.com", company="_Test Company")
+ employee_name = "test_component_wise_ytd@salary.com"
+ applicant = make_employee(employee_name, company="_Test Company")
payroll_period = create_payroll_period(name="_Test Payroll Period 1", company="_Test Company")
@@ -336,13 +344,13 @@
"Monthly", employee=applicant, company="_Test Company", currency="INR", payroll_period=payroll_period)
# clear salary slip for this employee
- frappe.db.sql("DELETE FROM `tabSalary Slip` where employee_name = 'test_ytd@salary.com'")
+ frappe.db.sql("DELETE FROM `tabSalary Slip` where employee_name = '%s'" % employee_name)
create_salary_slips_for_payroll_period(applicant, salary_structure.name,
payroll_period, deduct_random=False, num=3)
salary_slips = frappe.get_all("Salary Slip", fields=["name"], filters={"employee_name":
- "test_ytd@salary.com"}, order_by = "posting_date")
+ employee_name}, order_by="posting_date")
year_to_date = dict()
for slip in salary_slips:
@@ -380,10 +388,10 @@
from erpnext.payroll.doctype.salary_structure.test_salary_structure import \
make_salary_structure, create_salary_structure_assignment
+
salary_structure = make_salary_structure("Stucture to test tax", "Monthly",
- other_details={"max_benefits": 100000}, test_tax=True)
- create_salary_structure_assignment(employee, salary_structure.name,
- payroll_period.start_date)
+ other_details={"max_benefits": 100000}, test_tax=True,
+ employee=employee, payroll_period=payroll_period)
# create salary slip for whole period deducting tax only on last period
# to find the total tax amount paid
@@ -469,6 +477,7 @@
def make_employee_salary_slip(user, payroll_frequency, salary_structure=None):
from erpnext.payroll.doctype.salary_structure.test_salary_structure import make_salary_structure
+
if not salary_structure:
salary_structure = payroll_frequency + " Salary Structure Test for Salary Slip"
diff --git a/erpnext/payroll/doctype/salary_structure/test_salary_structure.py b/erpnext/payroll/doctype/salary_structure/test_salary_structure.py
index 36387f2..dce6b7a 100644
--- a/erpnext/payroll/doctype/salary_structure/test_salary_structure.py
+++ b/erpnext/payroll/doctype/salary_structure/test_salary_structure.py
@@ -6,7 +6,7 @@
import unittest
import erpnext
from frappe.utils.make_random import get_random
-from frappe.utils import nowdate, add_days, add_years, getdate, add_months
+from frappe.utils import nowdate, add_years, get_first_day, date_diff
from erpnext.payroll.doctype.salary_structure.salary_structure import make_salary_slip
from erpnext.payroll.doctype.salary_slip.test_salary_slip import make_earning_salary_component,\
make_deduction_salary_component, make_employee_salary_slip, create_tax_slab
@@ -113,8 +113,9 @@
sal_struct = make_salary_structure("Salary Structure Multi Currency", "Monthly", currency='USD')
self.assertEqual(sal_struct.currency, 'USD')
-def make_salary_structure(salary_structure, payroll_frequency, employee=None, dont_submit=False, other_details=None,
- test_tax=False, company=None, currency=erpnext.get_default_currency(), payroll_period=None):
+def make_salary_structure(salary_structure, payroll_frequency, employee=None,
+ from_date=None, dont_submit=False, other_details=None,test_tax=False,
+ company=None, currency=erpnext.get_default_currency(), payroll_period=None):
if test_tax:
frappe.db.sql("""delete from `tabSalary Structure` where name=%s""",(salary_structure))
@@ -139,10 +140,23 @@
else:
salary_structure_doc = frappe.get_doc("Salary Structure", salary_structure)
+ filters = {'employee':employee, 'docstatus': 1}
+ if not from_date and payroll_period:
+ from_date = payroll_period.start_date
+
+ if from_date:
+ filters['from_date'] = from_date
+
if employee and not frappe.db.get_value("Salary Structure Assignment",
- {'employee':employee, 'docstatus': 1}) and salary_structure_doc.docstatus==1:
- create_salary_structure_assignment(employee, salary_structure, company=company, currency=currency,
- payroll_period=payroll_period)
+ filters) and salary_structure_doc.docstatus==1:
+ create_salary_structure_assignment(
+ employee,
+ salary_structure,
+ from_date=from_date,
+ company=company,
+ currency=currency,
+ payroll_period=payroll_period
+ )
return salary_structure_doc
@@ -165,12 +179,13 @@
salary_structure_assignment.base = 50000
salary_structure_assignment.variable = 5000
- if getdate(nowdate()).day == 1:
- date = from_date or nowdate()
- else:
- date = from_date or add_days(nowdate(), -1)
+ if not from_date:
+ from_date = get_first_day(nowdate())
+ joining_date = frappe.get_cached_value("Employee", employee, "date_of_joining")
+ if date_diff(joining_date, from_date) > 0:
+ from_date = joining_date
- salary_structure_assignment.from_date = date
+ salary_structure_assignment.from_date = from_date
salary_structure_assignment.salary_structure = salary_structure
salary_structure_assignment.currency = currency
salary_structure_assignment.payroll_payable_account = get_payable_account(company)
@@ -183,4 +198,4 @@
def get_payable_account(company=None):
if not company:
company = erpnext.get_default_company()
- return frappe.db.get_value("Company", company, "default_payroll_payable_account")
\ No newline at end of file
+ return frappe.db.get_value("Company", company, "default_payroll_payable_account")
diff --git a/erpnext/public/js/education/lms/quiz.js b/erpnext/public/js/education/lms/quiz.js
index 5683f73..66160a7 100644
--- a/erpnext/public/js/education/lms/quiz.js
+++ b/erpnext/public/js/education/lms/quiz.js
@@ -20,10 +20,8 @@
}
make(data) {
- if (data.duration) {
- const timer_display = document.createElement("div");
- timer_display.classList.add("lms-timer", "float-right", "font-weight-bold");
- document.getElementsByClassName("lms-title")[0].appendChild(timer_display);
+ if (data.is_time_bound) {
+ $(".lms-timer").removeClass("hide");
if (!data.activity || (data.activity && !data.activity.is_complete)) {
this.initialiseTimer(data.duration);
this.is_time_bound = true;
@@ -237,4 +235,4 @@
this.options = option_list
this.wrapper.appendChild(options_wrapper)
}
-}
\ No newline at end of file
+}
diff --git a/erpnext/selling/doctype/quotation/quotation.js b/erpnext/selling/doctype/quotation/quotation.js
index 7fecd4b..1223449 100644
--- a/erpnext/selling/doctype/quotation/quotation.js
+++ b/erpnext/selling/doctype/quotation/quotation.js
@@ -53,8 +53,11 @@
}
refresh(doc, dt, dn) {
super.refresh(doc, dt, dn);
- doctype = doc.quotation_to == 'Customer' ? 'Customer':'Lead';
- frappe.dynamic_link = {doc: this.frm.doc, fieldname: 'party_name', doctype: doctype}
+ frappe.dynamic_link = {
+ doc: this.frm.doc,
+ fieldname: 'party_name',
+ doctype: doc.quotation_to == 'Customer' ? 'Customer' : 'Lead',
+ };
var me = this;
diff --git a/erpnext/www/lms/content.html b/erpnext/www/lms/content.html
index 15afb09..d22ef66 100644
--- a/erpnext/www/lms/content.html
+++ b/erpnext/www/lms/content.html
@@ -64,6 +64,7 @@
</div>
<div class="lms-title">
<h2>{{ content.name }} <span class="small text-muted">({{ position + 1 }}/{{length}})</span></h2>
+ <div class="lms-timer float-right fond-weight-bold hide"></div>
</div>
{% endmacro %}
diff --git a/requirements.txt b/requirements.txt
index e30746a..f28906a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@
pandas~=1.1.5
plaid-python~=7.2.1
pycountry~=20.7.3
-PyGithub~=1.54.1
+PyGithub~=1.55
python-stdnum~=1.16
python-youtube~=0.8.0
taxjar~=1.9.2