nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-12 03:15:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,377 Commits 432 Branches 1,737 Tags
9cfd704eef992bcdea2ad902aae1e541b78cdc86
Commit Graph

1147 Commits

Author SHA1 Message Date
ravibharathi656
d9d48da505 fix: include credit notes in project gross margin calculation 
(cherry picked from commit a378fee8e0)
 2026-02-03 06:07:34 +00:00
ravibharathi656
f61305aa45 fix(project): add missing counter to project update naming series 
(cherry picked from commit 49e64f4e1c)
 2026-01-22 04:52:56 +00:00
Nishka Gosalia
9d2e0f67d5 fix: updating base amounts through python for timesheet for v15 2025-12-24 21:44:58 +05:30
Mihir Kandoi
325fc619dc fix: delayed tasks summary chart color 
(cherry picked from commit 38affb0562)
 2025-12-16 12:44:30 +00:00
Pugazhendhi Velu
0f00581f83 fix: add is_group filter in task for timesheet 
(cherry picked from commit 5bac896329)
 2025-11-11 04:58:38 +00:00
ruthra kumar
9dc1f5f649 Merge pull request #50405 from frappe/mergify/bp/version-15-hotfix/pr-50326 
fix: validate is_group for parent task (backport #50326)
 2025-11-10 12:58:34 +05:30
ruthra kumar
df6ca3af57 chore: resolve conflicts 2025-11-10 12:43:05 +05:30
Patrick Eißler
29c976e9ae fix(Timesheet): don't use billing_hours for costing amount (#50394) 2025-11-07 13:26:44 +05:30
Pugazhendhi Velu
635fe427fe refactor(task): use get_link_to_form for validation error messages 
(cherry picked from commit 4cf02b4d78)
 2025-11-07 07:28:59 +00:00
Pugazhendhi Velu
dc5b8367c5 test: add test for parent task is_group validation 
(cherry picked from commit 291f0c7161)

# Conflicts:
#	erpnext/projects/doctype/task/test_task.py
 2025-11-07 07:28:59 +00:00
Pugazhendhi Velu
3380deab02 fix: validate is_group for parent task 
(cherry picked from commit ed1a1099cb)

# Conflicts:
#	erpnext/projects/doctype/task/task.py
 2025-11-07 07:28:59 +00:00
Rehan Ansari
82ca729e2b feat: add project filter to Delayed Tasks Summary report 
(cherry picked from commit 88097e78d2)
 2025-10-24 16:42:15 +00:00
mergify[bot]
4988ff84df fix(Task): make Timesheet-dependent fields no_copy (backport #50130) (#50196) 
* fix(Task): make Timesheet-dependent fields no_copy

(cherry picked from commit 2a2e4b5423)

# Conflicts:
#	erpnext/projects/doctype/task/task.json

* chore: resolve conflicts

---------

Co-authored-by: Patrick Eissler <77415730+PatrickDEissler@users.noreply.github.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2025-10-22 08:34:11 +00:00
Akhil Narang
432201f634 fix: sanitize projects field in tasks webform (#50089) 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
(cherry picked from commit f8b50d3ffa)
 2025-10-14 13:08:51 +00:00
Hussain Nagaria
c52f2c75f6 feat: show title in link field for Project DocType (#49265) 
(cherry picked from commit a5f200636a)

# Conflicts:
#	erpnext/projects/doctype/project/project.json
 2025-08-26 11:18:39 +05:30
diptanilsaha
0a2a7fa6aa fix: use query builder instead of raw SQL in get_timesheet_detail_rate 
(cherry picked from commit e563ed0c75)
 2025-08-19 05:25:19 +00:00
KerollesFathy
83e9842dd3 feat: add 'Manufacture' section to project dashboard and show linked Work Orders 
(cherry picked from commit 2729d7521d)
 2025-08-05 10:59:44 +00:00
Mihir Kandoi
36a9f3b3e9 chore: rename recalculating to updating 
(cherry picked from commit f6e16c1180)
 2025-07-18 10:56:08 +00:00
Mihir Kandoi
6adc8a09c0 feat: option to recalculate costing and billing fields in project 
(cherry picked from commit dd23d4c81b)
 2025-07-18 10:56:07 +00:00
Mihir Kandoi
9a538c6843 feat: add subject field to project (#48368) 
* feat: add subject field to project

(cherry picked from commit 407fdab487)
 2025-07-04 16:10:19 +00:00
Marc Ramser
470534af78 fix(Timesheet): Only update to_time if it's more than 1 second off (#47702) 
* Fix: Only update to_time if it's more than 1 second off

Before, to_time was updated even when it was almost the same as the expected time (like 17:20 vs 17:19:59.998). This causes problems because of small rounding errors and caused valid times like 17:20 to be reset. Now, to_time is only updated if the difference is greater than 1 second.

To reproduce the current error:
* From Time 09:00:00
* To Time 17:20:00
Save 
To Time is 17:19:59

* Update erpnext/projects/doctype/timesheet/timesheet.py

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>

* Update timesheet.py

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2025-06-03 11:59:13 +05:30
Mihir Kandoi
64ae4e1fec fix: timesheet portal showing total billing hours 
(cherry picked from commit b04a07fda0)
 2025-05-10 06:09:25 +00:00
Mihir Kandoi
ada7821a49 refactor: portal query in timesheet.py (#47336) 
* refactor: portal query in timesheet.py

* fix: use criterion.any to fix query

(cherry picked from commit 4fc7a8b71d)
 2025-04-30 10:45:02 +00:00
Mihir Kandoi
8a30a31302 fix: missing else statement 2025-04-28 16:08:40 +05:30
Mihir Kandoi
a9df1f5f6b fix: update billing hours when hours is changed 2025-04-28 16:07:54 +05:30
Mihir Kandoi
0763a8d42d fix: set billing hours to hours 2025-04-28 15:43:13 +05:30
ruthra kumar
3d57916832 chore: resolve conflict 2025-04-07 11:28:39 +05:30
Md Hussain Nagaria
2dfe13e183 chore: update links to Frappe School (#46823) 
(cherry picked from commit ef4f662c31)

# Conflicts:
#	erpnext/accounts/workspace/accounting/accounting.json
#	erpnext/buying/workspace/buying/buying.json
#	erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#	erpnext/projects/workspace/projects/projects.json
#	erpnext/selling/workspace/selling/selling.json
#	erpnext/stock/workspace/stock/stock.json
 2025-04-02 06:46:29 +00:00
Marc Ramser
3834d6fbce feat(projects): add option to hide timesheets for project users (#46173) 
* feat: add option to hide timesheets for project users

* Added a new "Hide timesheets" checkbox field to Project User doctype that allows to control timesheet visibility for specific users. When enabled, the timesheets section will not be displayed on the project page for that user.

* Update projects.html

(cherry picked from commit f4aba561ce)
 2025-03-19 08:05:42 +00:00
Mihir Kandoi
7437cea458 fix: revamp logic (split parent and child) 
(cherry picked from commit f7594e2ff9)
 2025-03-05 06:41:08 +00:00
Mihir Kandoi
1790bcc6d1 fix: syntax error 
(cherry picked from commit 2f1e253e19)
 2025-03-05 06:41:08 +00:00
Mihir Kandoi
d0b8e0da8d perf: replace if function in query 
(cherry picked from commit 5e66231ca4)
 2025-03-05 06:41:08 +00:00
ruthra kumar
feec16b682 chore: resolve conflicts 2025-02-25 22:53:14 +05:30
venkat102
feb64cb9b5 fix: enable fetch_timesheet_in_sales_invoice in test 
(cherry picked from commit 5880f1d5c6)

# Conflicts:
#	erpnext/projects/doctype/timesheet/test_timesheet.py
 2025-02-25 16:56:57 +00:00
venkat102
b3c1df8561 fix(project settings): add checkbox to auto fetch timesheet in sales invoice 
(cherry picked from commit 876082ea2f)

# Conflicts:
#	erpnext/projects/doctype/projects_settings/projects_settings.json
 2025-02-25 16:56:56 +00:00
Rohit Waghchaure
28cbce4356 fix: the project document timed out while opening 
(cherry picked from commit 33d03b1542)

# Conflicts:
#	erpnext/selling/doctype/sales_order/sales_order.json
 2025-02-06 16:38:46 +00:00
ruthra kumar
bcd3351999 refactor(test): update test data 2025-01-27 15:46:39 +05:30
Nabin Hait
b004855e7c Revert "feat(Sales Invoice): allow linking to project without adding timesheets (backport #44295)" (#45531) 
Revert "feat(Sales Invoice): allow linking to project without adding timeshee…"

This reverts commit 2c2a25ab16.
 2025-01-27 14:31:44 +05:30
mergify[bot]
2c2a25ab16 feat(Sales Invoice): allow linking to project without adding timesheets (backport #44295) (#45528) 
feat(Sales Invoice): allow linking to project without adding timesheets (#44295)

* feat(Sales Invoice): allow linking to project without adding timesheets

* test: add timesheet data

(cherry picked from commit 11f65f20a0)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2025-01-27 14:26:19 +05:30
barredterra
93e3847e36 revert: avoid change to translatable string 2025-01-17 14:34:44 +01:00
Patrick Eißler
c94430a472 fix(Project): re-phrase welcome email (#45175) 
(cherry picked from commit 8d66142865)
 2025-01-17 11:19:08 +00:00
mergify[bot]
f7448c6f79 fix(Timesheet): ignore permissions when updating Task and Project (backport #45168) (#45170) 
* fix(Timesheet): ignore permissions when updating Task and Project (#45168)

(cherry picked from commit 9e760e54a5)

# Conflicts:
#	erpnext/projects/doctype/timesheet/timesheet.py

* chore: resolve conflicts

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2025-01-13 12:08:17 +05:30
Raffael Meyer
0001d868c7 fix(Project): make status in confirmation dialog translatable (#45118) 
(cherry picked from commit 9eede907f8)
 2025-01-06 22:13:47 +00:00
mergify[bot]
0abace7911 refactor(Project): extract custom button function (backport #45116) (#45117) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2025-01-06 23:04:30 +01:00
mahsem
43fc8bf74e fix: add string for translation in delayed_tasks_summary.py 
(cherry picked from commit 84b54f549a)
 2024-12-06 06:44:55 +00:00
mahsem
106671a414 fix: add strings for translation in timesheet.js (#44496) 
(cherry picked from commit 6585fabdb1)
 2024-12-04 07:36:49 +00:00
mergify[bot]
ad0c65500a fix: update project cost from timesheet (backport #44211) (#44212) 
fix: update project cost from timesheet (#44211)

(cherry picked from commit b21fb8f8b6)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-11-19 22:59:16 +05:30
mergify[bot]
34b5639d1c fix: task path (backport #44073) (#44078) 
fix: task path (#44073)

(cherry picked from commit 8c99acb1b9)

Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com>
 2024-11-11 13:00:27 +05:30
mergify[bot]
93d0db2910 fix: Calculate gross margin on update of project costing from invoices (backport #43876) (#43900) 
* fix: Calculate gross margin on update of project costing from invoices (#43876)

* fix: Calculate gross margin on update of project costing from invoices

* chore: linter issues

(cherry picked from commit 0bba6442c0)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json

* fix: merge conflict

---------

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-10-29 22:36:39 +05:30
lukas.brandhoff
13557a2c10 refactor: include 'Project Name' in Project summary report 
Keep name field for backwards compatibility

(cherry picked from commit 736d1a1105)
 2024-10-29 09:54:25 +00:00