nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-18 17:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,918 Commits 606 Branches 1,802 Tags
348bb95268e8f0948ef7298bdeee538f69f1ef1f
Commit Graph

1217 Commits

Author SHA1 Message Date
ruthra kumar
f1dfac417d refactor: replace IntegrationTestCase with ERPNextTestCase repo-wide 
- import ERPNextTestSuite
 - use it on test class
 2026-03-19 12:57:07 +05:30
ruthra kumar
c2504760dd chore: remove IGNORE_TEST_RECORD_DEPENDENCIES 2026-03-19 11:33:34 +05:30
ruthra kumar
f7e4d07a7e chore: delete all test_records.json 2026-03-19 11:33:34 +05:30
mergify[bot]
afe8e3a023 fix: enable logs to track changes in doctype. (backport #53491) (#53524) 
* fix: enable logs to track changes in doctype. (#53491)

Co-authored-by: jeraldin2003 <jeraldin2003>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
(cherry picked from commit e2667ab098)

# Conflicts:
#	erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json

* chore: resolve conflicts

---------

Co-authored-by: Jeraldin P J <113301032+jeraldin2003@users.noreply.github.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-03-17 05:32:00 +00:00
Nabin Hait
f9a38696b6 fix: set default list view columns and filters for sales, purchase and accounts module 
(cherry picked from commit 9cf529215f)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/stock/doctype/delivery_note/delivery_note.json
 2026-03-10 12:22:40 +00:00
Nishka Gosalia
4386af1df7 refactor: project module form cleanup 
(cherry picked from commit 3c9f520e68)
 2026-03-05 06:28:05 +00:00
ravibharathi656
2ccf8d050f fix(task): allow is_template field in quick entry 
(cherry picked from commit 7801dd5353)
 2026-03-05 06:01:44 +00:00
ravibharathi656
c8560fa0d3 fix(project template): clear subject when task is empty 
(cherry picked from commit c1431105f4)
 2026-03-05 06:01:43 +00:00
Nishka Gosalia
d251c94ea3 fix: updating costing based on employee change in timesheet 
(cherry picked from commit e37d4a6f7c)
 2026-03-04 10:43:09 +00:00
Rohit Waghchaure
941a78e1a8 fix: patch to complete onboarding stpes for existing records 
(cherry picked from commit d90ec49241)

# Conflicts:
#	erpnext/patches.txt
 2026-02-25 12:30:24 +00:00
Rohit Waghchaure
858119f907 feat: module onboarding 
(cherry picked from commit 792a1a7ab7)
 2026-02-24 07:20:09 +00:00
mergify[bot]
893683a512 fix: user permission on reports (backport #52709) (#52757) 
* fix: user permission on reports (#52709)

(cherry picked from commit c6a292f6a9)

# Conflicts:
#	erpnext/accounts/report/purchase_register/purchase_register.py
#	erpnext/accounts/report/sales_register/sales_register.py

* chore: resolve conflict

---------

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-02-17 23:07:41 +05:30
ravibharathi656
e755a4ad98 fix: include credit notes in project gross margin calculation 
(cherry picked from commit a378fee8e0)
 2026-02-03 06:07:49 +00:00
ravibharathi656
37a237dbb7 fix(project): add missing counter to project update naming series 
(cherry picked from commit 49e64f4e1c)
 2026-01-22 04:53:10 +00:00
l0gesh29
a04da71182 test: add test for partial billing and return 
(cherry picked from commit ae594e81f9)
 2026-01-14 05:33:37 +00:00
l0gesh29
9b88275312 feat: add list_view status for partial billing 
(cherry picked from commit ff0b37055b)
 2026-01-14 05:33:36 +00:00
l0gesh29
332673f260 feat(timesheet): handle partial billing in sales invoice 
(cherry picked from commit c87b5d3132)
 2026-01-14 05:33:36 +00:00
l0gesh29
e49add20b7 feat: modify field properties 
(cherry picked from commit 38a4642479)
 2026-01-14 05:33:36 +00:00
Nabin Hait
10a3f61689 fix: erpnext workspaces cleanup (#51461) 2026-01-08 15:03:11 +05:30
Nishka Gosalia
f622996c48 fix: disallowing overlapping time logs in allow on submit mode 2026-01-02 16:50:20 +05:30
Mihir Kandoi
ca568a01f5 fix: autofixes by semgrep 2026-01-01 21:56:12 +05:30
Nishka Gosalia
aefd36e050 fix: task actual hours calculation correction post timesheet update after submit 2025-12-31 15:11:50 +05:30
Nishka Gosalia
41a7e64772 feat: Adding support for discarding document (#51316) 
Co-authored-by: Nishka Gosalia <nishkagosalia@Nishkas-MacBook-Air.local>
 2025-12-29 08:49:46 +00:00
SowmyaArunachalam
b8434ecfb0 test(task): validate expected end date 2025-12-19 23:27:51 +05:30
SowmyaArunachalam
820ccba9a4 fix(task): calculate end date if not available 2025-12-19 22:20:03 +05:30
Rohit Waghchaure
7c6f0e4463 fix: chart and number cards for projects and qc 2025-12-19 17:48:50 +05:30
Mihir Kandoi
76da5efaa9 Merge pull request #51137 from mihir-kandoi/gh42599 2025-12-16 18:13:33 +05:30
Mihir Kandoi
38affb0562 fix: delayed tasks summary chart color 2025-12-16 17:47:23 +05:30
sokumon
9486d0d462 fix: add list template to all portal doctypes 2025-12-15 10:38:30 +05:30
Nishka Gosalia
254eb5e7d6 Merge pull request #51021 from nishkagosalia/gh-50390 2025-12-11 03:26:39 +00:00
Nishka Gosalia
e8a8d3947c fix: updating base amount in timesheet 2025-12-10 13:12:47 +05:30
Nishka Gosalia
4568114ba8 test: test cases added for checking the base amounts in timesheet 2025-12-10 13:03:14 +05:30
Nishka Gosalia
88d8310a47 fix: updating base amounts through python for timesheet 2025-12-10 13:03:14 +05:30
Smit Vora
8235a551f0 refactor: further changes to adapt to query builder changes 2025-11-25 12:08:31 +05:30
Akhil Narang
13f8bcd289 fix: adjust a few more queries 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2025-11-20 18:14:34 +05:30
Akhil Narang
1cf9f903e5 fix: adapt to query builder 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2025-11-19 21:36:37 +05:30
Mihir Kandoi
f7585f40ac Merge pull request #50320 from aerele/task-is-group-filter 2025-11-11 10:27:37 +05:30
Patrick Eißler
4846dfd3ca fix(Timesheet): don't use billing_hours for costing amount calculation (#50392) 2025-11-07 13:26:16 +05:30
Pugazhendhi Velu
4cf02b4d78 refactor(task): use get_link_to_form for validation error messages 2025-11-06 11:22:58 +00:00
Pugazhendhi Velu
291f0c7161 test: add test for parent task is_group validation 2025-11-04 08:31:41 +00:00
Pugazhendhi Velu
ed1a1099cb fix: validate is_group for parent task 2025-11-04 08:30:54 +00:00
Pugazhendhi Velu
5bac896329 fix: add is_group filter in task for timesheet 2025-11-03 15:54:00 +00:00
Mihir Kandoi
abf81e5217 Merge pull request #50130 from PatrickDEissler/task-no-copy-fix 
fix(Task): make Timesheet-dependent fields no_copy
 2025-10-22 13:46:10 +05:30
Patrick Eissler
2a2e4b5423 fix(Task): make Timesheet-dependent fields no_copy 2025-10-16 08:40:54 +02:00
Akhil Narang
f8b50d3ffa fix: sanitize projects field in tasks webform (#50089) 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2025-10-14 13:07:59 +00:00
Rehan Ansari
88097e78d2 feat: add project filter to Delayed Tasks Summary report 2025-10-06 00:21:00 +05:30
Hussain Nagaria
a5f200636a feat: show title in link field for Project DocType (#49265) 2025-08-21 12:47:06 +00:00
diptanilsaha
e563ed0c75 fix: use query builder instead of raw SQL in get_timesheet_detail_rate 2025-08-16 23:08:29 +05:30
KerollesFathy
2729d7521d feat: add 'Manufacture' section to project dashboard and show linked Work Orders 2025-08-04 13:43:42 +00:00
Mihir Kandoi
f6e16c1180 chore: rename recalculating to updating 2025-07-18 16:08:04 +05:30