nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-18 19:07:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge upstream/develop into erpnext-refactoring

Browse Source 
Resolve 4 conflicts from Phase 7 service/mapper extraction vs upstream:
- asset.py: take extraction; repoint dangling make_asset_movement JS to mapper
- job_card: port upstream field_no_map(naming_series) into mapper.make_subcontracting_po
- sales_order: port upstream rows-index fix into mapper.make_delivery_note
- sales_invoice (Phase 7): take service delegations; port upstream SQL->QB/ORM
  changes for get_warehouse, get_all_mode_of_payments, get_discounting_status,
  clear_unallocated_mode_of_payments, and set_pos_fields(POS DN skip) into services
This commit is contained in:
Nabin Hait
2026-06-03 11:05:01 +05:30
parent 530e587bf2 b1882dc83a
commit 04443ae29e
247 changed files with 113261 additions and 46190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/projects/doctype/project/test_project.py
View File

@@ -152,7 +152,7 @@ class TestProject(ERPNextTestSuite):
self.assertEqual(tasks[1].subject, "Test Template Task with Dependency")
self.assertEqual(getdate(tasks[1].exp_end_date), calculate_end_date(project, 2, 2))
self.assertTrue(tasks[1].depends_on_tasks.find(tasks[0].name) >= 0)
self.assertGreaterEqual(tasks[1].depends_on_tasks.find(tasks[0].name), 0)
self.assertEqual(tasks[0].subject, "Test Template Task for Dependency")
self.assertEqual(getdate(tasks[0].exp_end_date), calculate_end_date(project, 3, 1))