Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,643 Commits 3 Branches 0 Tags 1 GiB
89215e44a4
Commit Graph

960 Commits

Author SHA1 Message Date
Hussain Nagaria
40abd2a2e1 test: Add test case for summary data 2021-04-02 19:55:54 +05:30
Hussain Nagaria
d27fc93edd feat: Add additional stats to report summary 2021-04-02 19:54:58 +05:30
Jannat Patel
0353b0f5f6
Merge branch 'develop' into profitability-report 2021-04-02 10:15:28 +05:30
Suraj Shetty
67169ba2d3 fix: get_route_options_for_new_doc for project 2021-04-01 19:52:07 +05:30
Hussain Nagaria
1e772bb9a4 test: Basic report data testing 2021-04-01 00:44:35 +05:30
Hussain Nagaria
39b75c63ad feat: Add chart generation 2021-03-31 13:13:25 +05:30
Hussain Nagaria
92c768972f fix: Missing quotation marks in SQL query 2021-03-31 12:26:37 +05:30
Hussain Nagaria
f5576d67dd feat: Add Report Summary generation 2021-03-31 12:25:36 +05:30
Walstan Baptista
353aa59c42
test: sets company while making a project (#25061) 2021-03-31 12:16:54 +05:30
Hussain Nagaria
1a0229eb36 feat: Add report table data generation 2021-03-30 18:20:22 +05:30
Hussain Nagaria
2b85a81a1c feat: Add filters to front end 2021-03-30 13:57:44 +05:30
Hussain Nagaria
b7f2ba1556 feat: Add Report boilerplate 2021-03-30 12:19:16 +05:30
pateljannat
c0b4eea415 fix: sider 2021-03-25 14:39:05 +05:30
pateljannat
6597bf7dd7 feat: profitability report default working hours and tests 2021-03-25 13:31:43 +05:30
pateljannat
453e07e32a fix: exclude cancelled salary slips 2021-03-23 11:18:57 +05:30
pateljannat
a2068d9b98 feat: profitability report 2021-03-18 15:25:22 +05:30
Sagar Vora
cf3fc99b12
test: fix salary component not found; other optimisation (#24920) 2021-03-17 19:54:08 +05:30
Sagar Vora
68aaf12902
test: use _Test Company to avoid Holiday List error (#24902) 2021-03-17 10:06:05 +05:30
Sagar Vora
65d7f2c798
fix(Project): get correct holiday list when calculating dates; test fixes (#24901) 2021-03-17 10:00:35 +05:30
Deepesh Garg
7a5b6021b9
Merge pull request #24772 from anupamvs/si-timesheet 
feat: provision to pull timesheet in sales invoice
 2021-03-02 18:05:42 +05:30
Anupam
47ce85484b feat: provistion to pull timesheet in sales invoice 2021-03-02 11:31:26 +05:30
Deepesh Garg
b5819c74c8 Merge branch 'develop' of https://github.com/frappe/erpnext into project_filter_search_fields 2021-02-27 17:29:11 +05:30
Syed Mujeer Hashmi
286e00bdf2
fix: Fetch Task subject from Task (#24729) 2021-02-25 19:02:54 +05:30
Deepesh Garg
b990e71b4c fix: Add search field in project query 2021-02-25 14:01:22 +05:30
Afshan
6bd2bbc953
fix: show custom button for saved projects (#24730) 
* fix: show custom button for saved projects

* fix: slider
 2021-02-24 18:13:10 +05:30
Shariq Ansari
1dba7d2161
fix: Added parent task expected end date validation (#24611) 
* fix: Added parent task expected end date validation

* fix: implemented suggested code

* fix: updated test case
 2021-02-24 12:39:23 +05:30
Afshan
b814b002ce
fix: creating salary slip from timesheet (#24541) 2021-02-05 11:34:55 +05:30
Suraj Shetty
bbc6bfd3c3 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-19 09:34:06 +05:30
Deepesh Garg
660d4a1097
Merge pull request #24346 from GangaManoj/timesheet-linking 
fix: Link timesheets with corresponding projects
 2021-01-14 18:49:40 +05:30
Deepesh Garg
3f015f7142 fix: Update fieldnames 2021-01-14 18:44:14 +05:30
marination
bc9eaac342 fix: Clear merge conflicts 
- 'get_project_template' was removed a month back
- in 'make_project' insert the project directly as a check for it is there in the beginning.
 2021-01-14 13:47:40 +05:30
Marica
cb079cd8c4
Merge branch 'develop' into naming-series-proj 2021-01-12 19:57:55 +05:30
pateljannat
2460e101a7 fix: indicator ofor template task 2021-01-11 10:05:54 +05:30
Ganga Manoj
2ffa4b9ce4 fix: Link timesheets with corresponding projects 2021-01-08 20:58:00 +05:30
pateljannat
fd5ebe9d4a fix: patch and columns 2021-01-07 15:16:15 +05:30
pateljannat
88471854d5 fix: sider 2020-12-28 15:40:23 +05:30
pateljannat
71f203dbc5 fix: template task status, subject in project template task 2020-12-28 12:35:19 +05:30
pateljannat
8dec1c142f fix: removed unused imports 2020-12-22 19:55:31 +05:30
pateljannat
6cf018c762 fix: holiday update in tests 2020-12-22 19:40:41 +05:30
pateljannat
4ebee5014e feat: aholiday check before setting start and end date in task 2020-12-22 18:14:46 +05:30
pateljannat
3a26f26671 fix: get_doc to avoid modified error 2020-12-22 11:56:59 +05:30
pateljannat
9466e42e70 fix: change request modifications 2020-12-21 20:52:20 +05:30
Rushabh Mehta
2cd41bca06 fix(routes): desk to app 2020-12-18 13:17:58 +05:30
pateljannat
b8e656512e fix: test cleanup 2020-12-17 20:22:06 +05:30
pateljannat
2528d5ee15 fix: tests 2020-12-16 18:29:49 +05:30
pateljannat
d44f45c57b fix: sider issues 2020-12-16 16:28:09 +05:30
Shivam Mishra
fd044b032f Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into desk-enhancements 2020-12-16 13:21:10 +05:30
pateljannat
a6fef7ae6b feat: parent-child relation tasks 2020-12-15 11:50:18 +05:30
pateljannat
caf67e608f fix: tests 2020-12-15 10:00:31 +05:30
pateljannat
23f0debf88 fix: tests 2020-12-15 10:00:21 +05:30
pateljannat
f9751f1f95 feat: project template having dependent tasks 2020-12-14 16:20:02 +05:30
pateljannat
6574404536 Merge branch 'project-template-and-tasks' of https://github.com/pateljannat/erpnext into project-template-and-tasks 2020-12-10 20:55:40 +05:30
pateljannat
e15ef1e19f fix: corrected tests 2020-12-10 20:55:25 +05:30
Jannat Patel
ad705d04a7
Merge branch 'develop' into project-template-and-tasks 2020-12-09 18:12:25 +05:30
pateljannat
f936e8a334 fix: sider issues fixed 2020-12-09 17:09:22 +05:30
pateljannat
811629a961 feat: tasks in project template and tests 2020-12-09 15:52:05 +05:30
Rushabh Mehta
fec8dba16c fix(merge): merge develop 2020-12-08 16:23:09 +05:30
pateljannat
c82b52855c fix: template filter for tasks 2020-12-08 11:07:59 +05:30
pateljannat
c32ac223ed feat: adding task field in project template 2020-12-07 14:53:15 +05:30
Shivam Mishra
2fa3cac814 feat: update workspace folders 2020-12-03 15:48:57 +05:30
Shivam Mishra
2895645f86 feat: rename desk page to workspace 2020-12-03 15:39:53 +05:30
Shivam Mishra
9aaca25edb feat: update desk page json 2020-12-01 13:39:54 +05:30
Shivam Mishra
de68f74b4c chore: update all desk pages 2020-12-01 12:51:38 +05:30
Shivam Mishra
27e7c264f2 fix: link type 2020-11-30 14:58:16 +05:30
Shivam Mishra
61388d412b feat: update desk pages 2020-11-30 14:58:00 +05:30
Raffael Meyer
fbcc3c1b70
fix: Translatable strings (#23783) 
* fix: start_pattern

* fix: translatable strings

* fix: add missing semicolon (task)

* fix: add missing semicolon (setup_wizard)

* fix: text should start on the same line

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: move out HTML element as variable

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: pull out message, translate "Undo".

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: typo

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: text should start on the same line

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* Revert "fix: start_pattern"

This reverts commit decc62e2ab75f45db1df022fe13780c2d0d2560d.

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-11-25 09:11:51 +05:30
Rushabh Mehta
542bc01718 fix(minor): update routes 2020-11-18 15:00:34 +05:30
marination
d51c953c22 chore: Fix Tests, use project name instead of project_name field 2020-11-16 12:48:40 +05:30
Marica
510b389838
Merge branch 'develop' into naming-series-proj 2020-11-13 13:37:19 +05:30
Shivam Mishra
bed717b442 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-11-12 11:32:59 +05:30
Anupam
9002904131 feat: added project link in timesheet form 2020-10-29 21:36:31 +05:30
prssanna
71e5b60df1 refactor: refactor contextual print setting implementation 2020-10-29 14:19:34 +05:30
Nabin Hait
f30c389e4d
Merge branch 'develop' into naming-series-proj 2020-10-22 21:46:13 +05:30
Shivam Mishra
9d468a8daf Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-21 11:38:31 +05:30
Afshan
9e08b21e0b
fix: removing unused imports (#23633) 2020-10-14 15:44:52 +05:30
Afshan
c359d3528f fix: setting user precision instead of default 2020-10-13 18:54:54 +05:30
Shivam Mishra
9a4d603403 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-09-25 11:44:37 +05:30
Abhishek Balam
4e6733293f
fix(DocTypes): Reset "owner" values in DocTypes to Administrator (#23350) 
* fix: reset owner values in doctype to Administrator

* fix: updated modified value

* fix: also fixed modified by

* fix: change modified_by to Administrator
 2020-09-18 18:27:24 +05:30
Michelle Alva
d8c38249e0
fix: Change naming series 
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
 2020-09-03 09:04:21 +05:30
marination
099d6718c9 fix: Dont Copy or Print Naming Series 2020-09-02 11:54:55 +05:30
michellealva
f46c1c5164 fix: Change property of field 2020-08-30 21:37:45 +05:30
michellealva
288ced24db feat: Add Naming Series for Project DocType 2020-08-30 19:33:27 +05:30
Suraj Shetty
6f9f40992c Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-08-23 16:33:50 +05:30
Afshan
d7d92c520e
fix: removed code relating to standard working hours (#23009) 2020-08-13 19:40:09 +05:30
Suraj Shetty
1923ef052c
refactor: Format and sanitise user inputs to search queries. (#22913) 
* refactor: Sanitize whitelisted method inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Format and sanitize tax_account_query inputs

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Validate and sanitize search inputs via decorator

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* style: Minor formatting fix

* refactor: Validate and sanitize search inputs using decorator

* fix: Typo

* fix: Remove unwanted import statement

* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-08-05 19:42:25 +05:30
Shivam Mishra
11111cd9a9 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-07-30 21:29:02 +05:30
Afshan
ecb1460440
fix: update the project after task deletion so that the % completed s… (#22591) 
* fix: update the project after task deletion so that the % completed shows correct value

* fix: patch to correct % complete of previous projects

* fix: for version-13

* fix: removed patch from v13

Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-07-24 10:48:16 +05:30
Shivam Mishra
1358efe896 feat: update icons 2020-07-23 17:02:32 +05:30
Anupam Kumar
a18f2ec23e
fix: setting filter for project in kanban board (#22717) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-07-23 11:09:17 +05:30
Anupam Kumar
4a5fc23d5c
Export Project dashboard (#22782) 2020-07-23 11:07:56 +05:30
Abhishek Balam
a5b83e85c3
feat: dashboard for timesheet (#22750) 2020-07-21 12:54:59 +05:30
rohitwaghchaure
165d57aa0b
Merge pull request #22663 from rohitwaghchaure/fixed-error-report-related-to-task-develop 
fix: '>' not supported between instances of 'str' and 'int'
 2020-07-13 18:11:50 +05:30
Rohit Waghchaure
2e8d8b9aeb fix: '>' not supported between instances of 'str' and 'int' 2020-07-13 12:09:10 +05:30
rohitwaghchaure
ac984eb37c
Merge branch 'develop' into project-link-for-all-accounts 2020-07-13 11:50:11 +05:30
Afshan
83cd1dcc44
fix: Add project filter in parent task field (#22655) 
* fix: Add project filter in parent task field
 2020-07-11 21:54:54 +05:30
Rohan
cdf55cef80
fix: fetch project-related info in Timesheet (#22423) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-09 11:36:01 +05:30
rohitwaghchaure
41c9708f99
Merge branch 'develop' into project-link-for-all-accounts 2020-07-08 13:11:37 +05:30
Marica
7860d9e699
Merge branch 'develop' into whitelist-query 2020-07-07 11:53:19 +05:30
Marica
e3e5fd7e74
fix: Skip Progress and Completed by fields on Task Duplication (#22565) 2020-07-06 18:26:19 +05:30
Deepesh Garg
92a03aa5db Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-07-06 12:37:28 +05:30