schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,292 Commits 322 Branches 1,581 Tags
c52fdffdafbbf2debd1bc03953797ccdd29d25c4
Commit Graph

1103 Commits

Author SHA1 Message Date
DaizyModi
c52fdffdaf fix: Project Status should be Open again if percent_complete is not 100 2024-07-06 19:05:36 +05:30
Poorvi-R-Bhat
d9ddad0f1f fix:Tasks with duration less than a day not displayed correctly#15554 (#41633) 
* fix: Tasks with duration less than a day not displayed correctly#15554

* fix: Tasks with duration less than a day not displayed correctly#15554
 2024-06-10 17:30:35 +05:30
Deepesh Garg
006b1f553c Merge pull request #40873 from Nihantra-Patel/upd_timesheet_task 
fix: update the task status from timesheet
 2024-05-29 10:00:53 +05:30
Nihantra C. Patel
501c6aa126 fix: cost center filter according to the company in project 2024-05-10 12:40:01 +05:30
Nihantra C. Patel
cfde8088b4 fix: cost center filter according to the company in project 2024-05-10 12:35:24 +05:30
Nihantra C. Patel
249e8264dd fix: cost center filter according to the company in project 2024-05-10 12:31:15 +05:30
Rucha Mahabal
d0d496a515 fix: allow Employee role to select cost center & project (accounting dimensions) 2024-04-24 10:57:41 +05:30
Nihantra Patel
4e5bc82a17 fix: update the task status from timesheet 2024-04-05 12:27:34 +05:30
Akhil Narang
3effaf21ef refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-03-27 16:06:04 +05:30
rohitwaghchaure
8c7213ad7d Merge pull request #40708 from rohitwaghchaure/fixed-priority-has-not-copied-11942 
fix: Priority not copied from project template
 2024-03-27 15:43:30 +05:30
Rohit Waghchaure
33fd7b8a1f fix: Priority not copied from project template 2024-03-27 15:13:51 +05:30
Ankush Menat
c2470ccc70 refactor: usage of modified ordering (#40705) 
Audited some important code:
- general_ledger.py
- stock_ledger.py
 2024-03-27 08:48:01 +00:00
Ankush Menat
dfde490c02 refactor!: switch to creation sort (#40699) 2024-03-27 13:45:34 +05:30
Deepesh Garg
60ba25caf2 fix: Remove custom queries for customer 2024-03-16 19:47:39 +05:30
Ankush Menat
f4d69f16c0 Merge pull request #40206 from barredterra/bulk-format-js 
ci: add prettier to pre-commit
 2024-03-10 20:01:49 +05:30
Ankush Menat
ec74a5e566 style: format js files 2024-03-10 19:45:40 +05:30
Deepesh Garg
1f4c86136f Merge pull request #39886 from barredterra/refactor-sales-invoice-item 
refactor(Sales Invoice): move methods into child row controller
 2024-03-10 19:44:16 +05:30
barredterra
5e736f0d06 fix(Project): filter department by company 2024-02-29 16:44:46 +01:00
Ankush Menat
38e88db2c9 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.
 2024-02-21 15:27:26 +00:00
barredterra
cc83af0dd4 refactor: move code for unlinking sales invoice to Timesheet 2024-02-16 23:14:50 +01:00
0xD0M1M0
eabf706f37 fix: projects website list visible for guests and all logged in customers (#39164) 
* fix: projects website list visible for guests

fix: projects website list visible for guests and all logged in customers

see the issue for details

fixes issue #39009

* fix: remove user = frappe.session.user
 2024-01-10 10:29:38 +05:30
Shariq Ansari
be8bb235dc chore: linter fix 2024-01-08 18:00:02 +05:30
Shariq Ansari
498bf15ecd chore: linter fix 2024-01-08 17:58:59 +05:30
Shariq Ansari
3d54fd8389 fix: add expected_start_date in sort by 2024-01-08 16:04:40 +05:30
barredterra
eb9ee3f79b refactor: simplify conditional logic 
Command: `sourcery review --fix --enable de-morgan .`
 2023-12-05 11:22:55 +01:00
Ankush Menat
63313eef6f feat: enable automatic type annotations (#38452) 2023-11-30 08:23:48 +00:00
ruthra kumar
bcbe6c4a53 refactor: provide UI button to recalculate when needed 2023-11-24 11:18:48 +05:30
Rucha Mahabal
ac91030b31 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
 2023-11-21 13:18:34 +05:30
s-aga-r
80ab4eea8c Merge pull request #38207 from s-aga-r/FIX-37809 
fix(ux): `Task` creation from `Timesheet`
 2023-11-20 12:39:30 +05:30
s-aga-r
2f3fc12c08 fix: add route options for new Task 2023-11-20 12:05:25 +05:30
s-aga-r
331ad62f3c fix(ux): enable Quick Entry for Task 2023-11-20 12:04:03 +05:30
Rucha Mahabal
20c6e9fca2 fix(Timesheet): reset billing hours equal to hours if they exceed actual hours (#38134) 2023-11-17 18:08:55 +05:30
Raffael Meyer
c5f5aa8208 feat: report Timesheet Billing Summary (#37451) 2023-11-01 15:49:21 +05:30
s-aga-r
fd6aee15e6 fix(test): project test case 2023-10-17 12:48:07 +05:30
s-aga-r
78eaf5d035 fix: fetch dependent task subject and project (#37401) 2023-10-10 11:05:24 +05:30
s-aga-r
361e555118 fix: Not unique table/alias: 'tabTask' (#37285) 2023-09-29 15:05:02 +05:30
s-aga-r
73fc974950 fix: incorrect Parent Task getting set for 2nd to nth child Task (#37230) 2023-09-26 10:54:23 +05:30
s-aga-r
0d5c8f03bd test: add test case for Task having common subject 2023-09-11 22:36:58 +05:30
s-aga-r
5cae2e79bd fix: reload task before save 2023-09-11 20:36:27 +05:30
s-aga-r
d3295c43e3 fix: set Template Task ref in Project Task 2023-09-11 20:36:11 +05:30
s-aga-r
b4bcd9ba3f feat: new field in Task to hold ref of Template Task 2023-09-11 20:35:12 +05:30
Ankush Menat
0d22fe02be refactor!: Lower all perm to Desk User 2023-08-28 22:42:14 +05:30
Gursheen Kaur Anand
6a7b45f689 Merge branch 'develop' into view-projects-in-customer-portal 2023-08-18 13:32:08 +05:30
ViralKansodiya
75652799cd feat: Tick on checkbox to include draft timesheets (#36577) 
feat: Tick on Check box to include Draft Timesheets
 2023-08-14 14:14:49 +05:30
Ankush Menat
1d7dbd3456 perf: don't use ifnull where it's not required (#36336) 
ifnull isn't really required when doing `!= 'anything'` because if it's null then value will be falsy.
ifnull is only required when checking `= ''` if you treat `null = ''`

Actuall better fix would be make things explcitly non-nullable, then we won't ever have to add this on such fields.

ref: https://github.com/frappe/frappe/pull/21822
 2023-07-27 06:06:07 +00:00
Gursheen Anand
5d7dd9b0ec fix: project route permissions for user 2023-07-20 18:20:53 +05:30
Gursheen Anand
610ead22e8 fix: show only projects with access in customer portal 2023-07-20 13:08:26 +05:30
Deepesh Garg
924cdef6d9 ci: add eslint and update linting confs 2023-07-14 18:53:02 +05:30
Ankush Menat
a449a4be29 chore: Add frappe school links (#35995) 
Frappe School provides plenty of free tutorial for learning ERPNext.
 2023-07-04 14:58:45 +05:30
Gursheen Anand
84d4888f5f fix: make company field mandatory in project doctype 2023-06-30 12:54:45 +05:30