Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,341 Commits 3 Branches 0 Tags 1 GiB
4c7fa9482d
Commit Graph

878 Commits

Author SHA1 Message Date
Deepesh Garg
93e134aab0 fix: Parent Level project linkning on creating PO from project 2022-09-16 22:44:23 +05:30
Raffael Meyer
e00ece7a78
fix: remove EmployeeBoardingController (#32139) 
fix: remove employee boarding controller

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-09-13 02:00:04 +05:30
Raffael Meyer
73f4d5931d
fix: permissions for Task Type (#32016) 2022-08-29 21:56:07 +05:30
Aditya Hase
d38778e400
fix(projects): Add missing comma 
Added with https://github.com/frappe/erpnext/pull/31360
 2022-08-17 18:21:43 +05:30
Rucha Mahabal
f0e2bdf1dc fix(Projects): Remove total_expense_claim calculation from gross margin 2022-06-29 13:07:06 +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
Rucha Mahabal
edb528ce41 chore: Remove code for Expense Claim from Project, Task, Delivery Trip 
- Remove `total_expense_claim` field from Project and Task, will be installed with hrms setup

- Remove Expense Claim calculation from `update_costing` in project

- Remove `update_total_expense_claim` from task

- Remove Expense Claim references from employee form tour

- Remove 'Make Expense Claim' button from Delivery Trip, will only be available if hrms is installed

- Update delivery trip tests
 2022-06-23 19:48:42 +05:30
Conor
ea28ed1bb3
refactor: if() to CASE WHEN (#31360) 
* refactor: if() to CASE WHEN

* fix: remove duplicate order by

* fix: remove extraneous table

* style: reformat to black spec

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-17 21:17:48 +05:30
Rucha Mahabal
4b3fb83850 fix: remove Salary Slip creation from Timesheet 
- moved to HRMS app
 2022-06-15 23:51:33 +05:30
Rucha Mahabal
3fe2ef6790 chore: update import paths for HR 2022-06-15 12:43:45 +05:30
Rucha Mahabal
8b2d045b06 fix(Projects): add a function get_users_email instead of importing from HR 2022-06-15 12:26:15 +05:30
Conor
b8f728a40a
refactor: use CURRENT_DATE instead of CURDATE() (#31356) 
* refactor: use CURRENT_DATE instead of CURDATE()

* style: reformat to black spec

* refactor: use QB for auto_close queries

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-15 12:07:33 +05:30
Conor
00ef499739
refactor: use db independent offset syntax (#31345) 
* chore: use db independent offset syntax

* fix: typo

* style: reformat code to black spec

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-14 10:49:07 +05:30
Rucha Mahabal
23b40ff13c fix: remove active employee validation from timesheets 
- moved to hrms hooks, will only be triggered if app is installed
 2022-06-13 20:08:48 +05:30
Rucha Mahabal
512c82f76d chore: Update imports/paths for doctypes moved to erpnext setup module 2022-06-10 15:06:54 +05:30
sersaber
e5d2c1b1f3
fix: change project's actual_start_date fieldtype from Data to Date (#31085) 
* Update project.json

* Update project.json
 2022-05-26 10:04:58 +05:30
Ankush Menat
bae8ab2fa9
Merge branch 'develop' into education_sepration 2022-05-02 11:47:37 +05:30
sersaber
b8a9f821a4
feat: Copy task color from project template (#30857) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-05-02 10:29:43 +05:30
Deepesh Garg
60b693f84f chore: clean up hooks 2022-04-28 12:02:54 +05:30
Deepesh Garg
41e2959389 chore: remove files related to LMS 2022-04-28 10:41:30 +05:30
Ahmad
1fdc085d17 fix: web form filter for project 2022-03-30 13:23:30 +05:00
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
Rucha Mahabal
b988046082
fix(Timesheet): fetch exchange rate only if currency is set (#30057) 2022-03-02 14:15:22 +05:30
Rucha Mahabal
bef46e2b64 chore: remove unused code and fields related to workstation from Timesheet Detail 2022-02-17 17:48:18 +05:30
Rucha Mahabal
47ff968253 test: timesheet not overlapping with continuous timelogs 2022-02-17 17:48:18 +05:30
Rucha Mahabal
3ec9acf8f7 fix: convert overlap raw query to frappe.qb 2022-02-17 17:48:18 +05:30
Rucha Mahabal
e2e998fbd9 fix(Timesheet): convert time logs to datetime while checking for overlap 2022-02-17 17:48:18 +05:30
Rucha Mahabal
36882f3734
fix: Employee Onboarding and Separation UX (#29504) 2022-01-29 15:27:36 +05:30
Himanshu
f5ed0c83b7
fix(Timesheets): calculate to time (#28589) 
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2022-01-21 13:05:47 +05:30
Conn Campbell
31123436fb
fix: Task Depends on not removed from Gantt chart (#28309) 
Co-authored-by: conncampbell <conncampbell@conzu.ca>
 2022-01-10 10:28:10 +05:30
Ankush Menat
e73c51bee6 test: fix test broken by todo schema change 2022-01-04 17:23:03 +05:30
Deepesh Garg
077e2c6467
Update erpnext/projects/doctype/project/project.js 2021-12-28 11:08:13 +05:30
Anupam
9c0f6d1306 fix: sider issue 2021-12-24 16:51:50 +05:30
Anupam
a6d6de6c4f fix: grouping project form custom buttons 2021-12-24 15:34:24 +05:30
Ankush Menat
f5d5281119 chore: drop deprecated qunit tests 2021-12-20 17:03:10 +05:30
Rucha Mahabal
b027050f77
Merge pull request #28845 from ruchamahabal/fix-salary-slip-timesheet 
fix: incorrect amount based on payment days in timesheet salary slip
 2021-12-14 14:57:21 +05:30
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
Raffael Meyer
2bdaf7bb23
fix: don't reset rates in Timesheet Detail when Activity Type is cleared (#28056) 
* fix: don't reset rates when activity type is cleared

* refactor: suggestions from review

Co-authored-by: Sagar Vora <sagar@resilient.tech>

* refactor: suggestions from review (fix)

* style: fix sider

* fix: sider issue

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-10-21 23:53:04 +05:30
Rucha Mahabal
261f80c5ca
fix: avoid resetting employee on amending timesheets (#28025) 2021-10-20 16:58:32 +05:30
Sagar Vora
09ccdee2db
feat: add total_billing_hours to Sales Invoice (fp #26783) (#27742) 
* feat: add `total_billing_hours` to Sales Invoice

* fix: re-save doctypes

* fix: indentation

* fix: replace reference to old function
 2021-10-04 16:41:24 +05:30
Saqib
0b040c7437
fix: cannot delete a project if linked with sales order (#27536) 2021-09-28 18:13:01 +05:30
Chillar Anand
915b34391c
chore: Clean up imports (#27302) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Clean up imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Clean up sider issues

* chore: Remove import errors from flake8 ignore list

* chore: Clean up lint issues
 2021-09-02 16:44:59 +05:30
Ankush Menat
ae55eab599
chore: remove deprecated and empty QUnit tests (#27179) 
* chore: remove deprecated and empty QUnit tests

* ci: fix UI test config

Testing library was added on Frappe, in order to reuse command testing
library has to be installed during setup process.
 2021-08-26 20:43:06 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
Rohit Waghchaure
eb1e3181a4 fix: conflicts while merging brnach version-13 to develop 2021-08-17 10:53:19 +05:30
Anupam Kumar
a6aa6cd7d6
fix: timesheet amount issue (#25993) 
* fix: timesheet amount issue

* fix: timesheet detail rate conversion

* fix: condition to check timesheet currency

* fix: removing console statement
 2021-08-10 20:32:15 +05:30
Rucha Mahabal
821db5cce7
fix: employee status server-side validation (#26442) 
* fix: employee status server-side validation

* fix: test

* test: employee inactive status

* fix: test
 2021-07-30 10:21:42 +05:30