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
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
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
