From f0dfea1d4748e5203ebc32d8629ffe6b261b630b Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Sun, 20 Jun 2021 10:20:35 +0530 Subject: [PATCH] fix: test case for Project Profitability report --- .../project_profitability/test_project_profitability.py | 9 +++++++-- erpnext/public/js/controllers/buying.js | 8 ++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/erpnext/projects/report/project_profitability/test_project_profitability.py b/erpnext/projects/report/project_profitability/test_project_profitability.py index ea6bdb54ca..180926fe25 100644 --- a/erpnext/projects/report/project_profitability/test_project_profitability.py +++ b/erpnext/projects/report/project_profitability/test_project_profitability.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals import unittest import frappe -from frappe.utils import getdate, nowdate +from frappe.utils import getdate, nowdate, add_days from erpnext.hr.doctype.employee.test_employee import make_employee from erpnext.projects.doctype.timesheet.test_timesheet import make_salary_structure_for_timesheet, make_timesheet from erpnext.projects.doctype.timesheet.timesheet import make_salary_slip, make_sales_invoice @@ -16,17 +16,22 @@ class TestProjectProfitability(unittest.TestCase): make_salary_structure_for_timesheet(emp, company='_Test Company') self.timesheet = make_timesheet(emp, simulate = True, is_billable=1) self.salary_slip = make_salary_slip(self.timesheet.name) + holidays = self.salary_slip.get_holidays_for_employee(nowdate(), nowdate()) + if holidays: + frappe.db.set_value('Payroll Settings', None, 'include_holidays_in_total_working_days', 1) + self.salary_slip.submit() self.sales_invoice = make_sales_invoice(self.timesheet.name, '_Test Item', '_Test Customer') self.sales_invoice.due_date = nowdate() self.sales_invoice.submit() frappe.db.set_value('HR Settings', None, 'standard_working_hours', 8) + frappe.db.set_value('Payroll Settings', None, 'include_holidays_in_total_working_days', 0) def test_project_profitability(self): filters = { 'company': '_Test Company', - 'start_date': getdate(), + 'start_date': add_days(getdate(), -3), 'end_date': getdate() } diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js index a657f59c91..86dadd36d6 100644 --- a/erpnext/public/js/controllers/buying.js +++ b/erpnext/public/js/controllers/buying.js @@ -124,9 +124,9 @@ erpnext.buying.BuyingController = class BuyingController extends erpnext.Transac this.toggle_subcontracting_fields(); super.refresh(); - }, + } - toggle_subcontracting_fields: function() { + toggle_subcontracting_fields() { if (in_list(['Purchase Receipt', 'Purchase Invoice'], this.frm.doc.doctype)) { this.frm.fields_dict.supplied_items.grid.update_docfield_property('consumed_qty', 'read_only', this.frm.doc.__onload && this.frm.doc.__onload.backflush_based_on === 'BOM'); @@ -134,9 +134,9 @@ erpnext.buying.BuyingController = class BuyingController extends erpnext.Transac this.frm.set_df_property('supplied_items', 'cannot_add_rows', 1); this.frm.set_df_property('supplied_items', 'cannot_delete_rows', 1); } - }, + } - supplier: function() { + supplier() { var me = this; erpnext.utils.get_party_details(this.frm, null, null, function(){ me.apply_price_list();