nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 08:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix_discount_mismatch

Browse Source
This commit is contained in:
Sagar Vora
2025-06-09 17:15:41 +00:00
committed by GitHub
parent f781a39dbe 54ca0dd004
commit e91b4f759c
2 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
erpnext/controllers/tests/test_queries.py
View File

@@ -106,9 +106,9 @@ class TestQueries(ERPNextTestSuite):
value=1, value=1,
property_type="Check", property_type="Check",
) )
ps.save() frappe.clear_cache(doctype="Payment Entry")
user = create_user("test_employee_query@example.com", ("Accounts User", "HR User")) user = create_user("test_employee_query@example.com", "Accounts User", "HR User")
add_user_permissions( add_user_permissions(
{ {
"user": user.name, "user": user.name,
@@ -121,29 +121,24 @@ class TestQueries(ERPNextTestSuite):
} }
) )
frappe.reload_doc("accounts", "doctype", "payment entry") with IntegrationTestCase.set_user(user.name):
params = {
"doctype": "Employee",
"txt": "",
"searchfield": "name",
"start": 0,
"page_len": 20,
"filters": None,
"reference_doctype": "Payment Entry",
"ignore_user_permissions": 1,
}
frappe.set_user(user.name) result = queries.employee_query(**params)
params = { self.assertGreater(len(result), 1)
"doctype": "Employee",
"txt": "",
"searchfield": "name",
"start": 0,
"page_len": 20,
"filters": None,
"reference_doctype": "Payment Entry",
"ignore_user_permissions": 1,
}
result = queries.employee_query(**params) ps.delete(ignore_permissions=1, force=1, delete_permanently=1)
self.assertGreater(len(result), 1) frappe.clear_cache(doctype="Payment Entry")
ps.delete(ignore_permissions=1, force=1, delete_permanently=1) # only one employee should be returned even though ignore_user_permissions is passed as 1
frappe.reload_doc("accounts", "doctype", "payment entry") result = queries.employee_query(**params)
frappe.clear_cache() self.assertEqual(len(result), 1)
# only one employee should be returned even though ignore_user_permissions is passed as 1
result = queries.employee_query(**params)
self.assertEqual(len(result), 1)
frappe.set_user("Administrator")

9
erpnext/manufacturing/doctype/job_card/test_job_card.py
View File

@@ -23,6 +23,7 @@ from erpnext.manufacturing.doctype.work_order.test_work_order import make_wo_ord
from erpnext.manufacturing.doctype.work_order.work_order import WorkOrder from erpnext.manufacturing.doctype.work_order.work_order import WorkOrder
from erpnext.manufacturing.doctype.workstation.test_workstation import make_workstation from erpnext.manufacturing.doctype.workstation.test_workstation import make_workstation
from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
from erpnext.tests.utils import ERPNextTestSuite
EXTRA_TEST_RECORD_DEPENDENCIES = ["UOM"] EXTRA_TEST_RECORD_DEPENDENCIES = ["UOM"]
@@ -36,7 +37,13 @@ class UnitTestJobCard(UnitTestCase):
pass pass
class TestJobCard(IntegrationTestCase): class TestJobCard(ERPNextTestSuite):
@classmethod
def setUpClass(cls):
super().setUpClass()
# used in job card time log
cls.make_employees()
def setUp(self): def setUp(self):
self.make_bom_for_jc_tests() self.make_bom_for_jc_tests()
self.transfer_material_against: Literal["Work Order", "Job Card"] = "Work Order" self.transfer_material_against: Literal["Work Order", "Job Card"] = "Work Order"