nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 00:44:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,164 Commits 472 Branches 1,757 Tags
674878059106fdebecb9ef0db758ba7b978631de
Commit Graph

1071 Commits

Author SHA1 Message Date
ruthra kumar
befc16cc97 refactor(test): update test data 2025-01-27 16:12:18 +05:30
barredterra
20bb15167d revert: avoid change to translatable string 2025-01-17 14:38:27 +01:00
barredterra
1ccf30d97b chore: resolve confilcts 2025-01-17 14:38:03 +01:00
Patrick Eißler
77e92b38eb fix(Project): re-phrase welcome email (#45175) 
(cherry picked from commit 8d66142865)

# Conflicts:
#	erpnext/projects/doctype/project/project.py
 2025-01-17 11:19:03 +00:00
mergify[bot]
49ffeccafa fix(Timesheet): ignore permissions when updating Task and Project (backport #45168) (#45171) 
* 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:26 +05:30
Raffael Meyer
07653c54f3 fix(Project): make status in confirmation dialog translatable (#45118) 
(cherry picked from commit 9eede907f8)
 2025-01-06 22:13:47 +00:00
mahsem
ce04f6d7c9 fix: add string for translation in delayed_tasks_summary.py 
(cherry picked from commit 84b54f549a)
 2024-12-06 12:17:50 +05:30
mergify[bot]
c12d5f613a fix: task path (backport #44073) (#44077) 
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:43 +05:30
lukas.brandhoff
3fa392ebdf refactor: include 'Project Name' in Project summary report 
Keep name field for backwards compatibility

(cherry picked from commit 736d1a1105)
 2024-10-29 09:54:26 +00:00
IamSaiyyamChhetri
d3e29fe828 fix: add company filter for project 
- In Project dt Sales Order field
- In Sales Order dt Project field

(cherry picked from commit 9909d760a5)
 2024-10-23 17:31:44 +05:30
Nihantra C. Patel
7035969db7 fix: cost center filter according to the company in project 
(cherry picked from commit 501c6aa126)
 2024-05-27 04:41:12 +00:00
Nihantra C. Patel
0cf97f2559 fix: cost center filter according to the company in project 
(cherry picked from commit cfde8088b4)
 2024-05-27 04:41:12 +00:00
Nihantra C. Patel
459d136368 fix: cost center filter according to the company in project 
(cherry picked from commit 249e8264dd)
 2024-05-27 04:41:11 +00:00
mergify[bot]
bb48440591 fix: allow Employee role to select cost center & project (accounting dimensions) (backport #41160) (#41161) 
* fix: allow Employee role to select cost center & project (accounting dimensions)

(cherry picked from commit d0d496a515)

# Conflicts:
#	erpnext/accounts/doctype/cost_center/cost_center.json
#	erpnext/projects/doctype/project/project.json

* chore: fix conflicts

---------

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2024-04-24 11:43:33 +05:30
Akhil Narang
4d34b1ead7 refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 17:13:31 +05:30
Rohit Waghchaure
4f4470b9d2 fix: Priority not copied from project template 
(cherry picked from commit 33fd7b8a1f)
 2024-03-27 10:18:21 +00:00
Ankush Menat
4c629d31c6 style: format js files 2024-03-11 11:03:58 +05:30
barredterra
646b55eeea fix(Project): filter department by company 
(cherry picked from commit 5e736f0d06)
 2024-02-29 17:30:05 +00:00
mergify[bot]
2a2f314821 fix: timesheet per billed state edge case (backport #40010) (#40028) 
fix: timesheet per billed state edge case (#40010)

If value is 100.0000x then it won't set status correctly but will set it the next time it's loaded from db.

(cherry picked from commit 38e88db2c9)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2024-02-22 12:29:56 +05:30
Kevin Shenk
d0e1162c96 feat: Copy project_name, from_time, to_time from timesheet details to sales invoice (#33726) 
feat: Copy project_name, from_time, to_time from timesheet details to sales invoice
(cherry picked from commit e4bceaaf66)
 2024-01-09 06:33:24 +00:00
ruthra kumar
1d1af26f7a chore: resolve conflict 2023-11-24 11:54:55 +05:30
ruthra kumar
49a787b1a8 refactor: provide UI button to recalculate when needed 
(cherry picked from commit bcbe6c4a53)

# Conflicts:
#	erpnext/projects/doctype/project/project.py
 2023-11-24 06:20:04 +00:00
mergify[bot]
e08f1145c9 fix(Timesheet): warn user if billing hours > actual hours instead of resetting (backport #38239) (#38240) 
fix(Timesheet): warn user if billing hours > actual hours instead of resetting  (#38239)

* revert: "fix(Timesheet): reset billing hours equal to hours if they exceed actual hours"

This reverts commit 0ec8034507.

* fix: warn user if billing hours > actual hours

(cherry picked from commit ac91030b31)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2023-11-21 13:41:08 +05:30
mergify[bot]
c7c751ecd0 fix(Timesheet): reset billing hours equal to hours if they exceed actual hours (backport #38134) (#38152) 
fix(Timesheet): reset billing hours equal to hours if they exceed actual hours (#38134)

(cherry picked from commit 20c6e9fca2)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2023-11-17 18:28:10 +05:30
mergify[bot]
e23710bf00 fix(test): project test case (backport #37541) (#37543) 
fix(test): project test case

(cherry picked from commit fd6aee15e6)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-10-17 15:03:16 +05:30
mergify[bot]
0aad942312 fix: fetch dependent task subject and project (backport #37401) (#37421) 
fix: fetch dependent task subject and project (#37401)

(cherry picked from commit 78eaf5d035)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-10-10 11:06:33 +05:30
mergify[bot]
95e0bf5e0e fix: Not unique table/alias: 'tabTask' (backport #37285) (#37298) 
fix: Not unique table/alias: 'tabTask' (#37285)

(cherry picked from commit 361e555118)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-09-29 15:07:10 +05:30
mergify[bot]
279f21d1e5 fix: incorrect Parent Task getting set for 2nd to nth child Task (backport #37230) (#37240) 
fix: incorrect `Parent Task` getting set for 2nd to nth child Task (#37230)

(cherry picked from commit 73fc974950)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-09-26 13:32:05 +05:30
mergify[bot]
66027877d3 fix: Parent Task link with Project Task (backport #37025) (#37033) 
* feat: new field in `Task` to hold ref of Template Task

(cherry picked from commit b4bcd9ba3f)

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

* fix: set `Template Task` ref in `Project Task`

(cherry picked from commit d3295c43e3)

* fix: reload task before save

(cherry picked from commit 5cae2e79bd)

* test: add test case for Task having common subject

(cherry picked from commit 0d5c8f03bd)

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-09-12 09:04:37 +05:30
mergify[bot]
9668615f7e feat: Tick on checkbox to include draft timesheets (backport #36577) (#36640) 
feat: Tick on checkbox to include draft timesheets (#36577)

feat: Tick on Check box to include Draft Timesheets
(cherry picked from commit 75652799cd)

Co-authored-by: ViralKansodiya <141210323+viralkansodiya@users.noreply.github.com>
 2023-08-17 17:13:51 +05:30
mergify[bot]
8de1d8663f fix: project filtering based on company in P&L Report (#35943) 
* fix: project filtering in P&L Report

(cherry picked from commit 904ca746a6)

* fix: show projects with no company value set

(cherry picked from commit ce252a0d45)

* fix: make company field mandatory in project doctype

(cherry picked from commit 84d4888f5f)

---------

Co-authored-by: Gursheen Anand <gursheen@frappe.io>
 2023-07-01 10:42:33 +05:30
Suraj Shetty
20e224224b fix: Task gantt popup style 
(cherry picked from commit f7b2d103e7)
 2023-06-02 05:39:53 +00:00
mergify[bot]
841d2e4b2c refactor: Workspace cleanup (backport #35409) (#35505) 
* refactor: Workspace cleanup

(cherry picked from commit 243c49c550)

# Conflicts:
#	erpnext/accounts/workspace/accounting/accounting.json
#	erpnext/assets/workspace/assets/assets.json

* fix: Delete Retail and Utilities worspaces amd hide default Settings and Integration workspaces

(cherry picked from commit 0b28f641ad)

* fix: Added pos links in Selling workspace

(cherry picked from commit 86f88817a9)

* fix: removed duplicate links of manufacturing workspace

(cherry picked from commit 5cf4c8c8b7)

* fix: Rearranged accounting module links

(cherry picked from commit e78a7de1e5)

# Conflicts:
#	erpnext/accounts/workspace/accounting/accounting.json

* chore: typo

(cherry picked from commit bb67cc03df)

* chore: conflicts

---------

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-05-31 16:51:54 +05:30
Rohit Waghchaure
9d17d3ff06 fix: removed depends on for the Employee Detail section 
(cherry picked from commit a90a5b4aa4)
 2023-04-20 12:34:34 +00:00
mergify[bot]
da8cc2bba9 fix: Linked invoice cancellation issue via timesheet (#34337) 
fix: Linked invoice cancellation issue via timesheet (#34337)

(cherry picked from commit 4416ddc4af)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-03-13 18:58:54 +05:30
HENRY Florian
d7831685af fix: rename duplicate field name with same type into a DocType to avoid import Error (#34053) 
* fix: Delivery Note field label set

* fix: Item field label de-duplicate name

* fix: Payment Entry field label de-duplicate name

* fix: Pruicing Rule field label de-duplicate name

* fix: Project field label de-duplicate name

* fix: Timesheet field label de-duplicate name

* Update erpnext/accounts/doctype/pricing_rule/pricing_rule.json

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>

* Update erpnext/stock/doctype/item/item.json

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>

---------

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
(cherry picked from commit 4d79ffe3c6)

# Conflicts:
#	erpnext/stock/doctype/item/item.json
 2023-02-16 08:17:47 +00:00
mergify[bot]
5270fbe01a fix: set per_billed based on hours when amounts are zero (#33984) 
fix: set per_billed based on hours when amounts are zero (#33984)

* fix: set per_billed based on hours when amounts are zero

* test: calculate_percentage_billed

(cherry picked from commit e4953df4a3)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-02-11 14:54:22 +05:30
shamilnk
cf439301f6 fix: the frappe throw message is corrected in the group task validation 2023-01-17 12:54:49 +05:30
Deepesh Garg
37bed12df4 fix: Project filter in timesheet 
(cherry picked from commit 2b65b22aa2)
 2022-11-08 09:26:02 +00:00
mergify[bot]
af4dafdc64 fix: add project settings to projects workspace (backport #32568) (#32600) 
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2022-10-14 18:01:43 +05:30
Ernesto Ruiz
2eeff8a00b fix: Add strings to translate function 
(cherry picked from commit 9decebe6e1)
 2022-09-26 11:09:48 +00:00
Deepesh Garg
cbaffb4858 fix: Parent Level project linkning on creating PO from project 
(cherry picked from commit 93e134aab0)
 2022-09-17 15:00:33 +00:00
mergify[bot]
944b8a0ed7 fix: remove EmployeeBoardingController (backport #32139) (#32191) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2022-09-13 09:50:36 +05:30
Raffael Meyer
7ca1beb15d fix: permissions for Task Type (#32016) 
(cherry picked from commit 73f4d5931d)
 2022-08-29 16:27:00 +00:00
Aditya Hase
623f56a95c fix(projects): Add missing comma 
Added with https://github.com/frappe/erpnext/pull/31360

(cherry picked from commit d38778e400)
 2022-08-18 05:49:58 +00:00
Rucha Mahabal
f0e2bdf1dc fix(Projects): Remove total_expense_claim calculation from gross margin 2022-06-29 13:07:06 +05:30
Rucha Mahabal
3c059de122 chore: Remove links for Employee Hours Utilization Based On Timesheet and Project Profitability from Projects workspace 2022-06-28 12:34:01 +05:30
Rucha Mahabal
6a65c8aff4 Merge branch 'develop' into hr-separation 2022-06-28 11:51:59 +05:30
Nabin Hait
483fc420a1 test: invoice from timesheet 2022-06-25 11:40:23 +05:30
Rucha Mahabal
c619b58ba9 fix: remove HR/Payroll references from form dashboards 
- Employee, Holiday List, Project, Task, Timesheet
 2022-06-24 15:03:16 +05:30