Rucha Mahabal
|
722cfdb7e5
|
Merge pull request #25701 from anupamvs/timesheet-refactor
refactor: timesheet
|
2021-05-20 23:43:19 +05:30 |
|
Rucha Mahabal
|
a7d0dbb085
|
fix: calculate total billing amount on fetching timesheets
- show timesheet billing amounts in doc currency
|
2021-05-20 23:02:11 +05:30 |
|
Rucha Mahabal
|
8a407f1ec3
|
fix: sider issues
|
2021-05-20 22:23:44 +05:30 |
|
Rucha Mahabal
|
be247ec3de
|
fix: error message placeholders and sider issues
|
2021-05-20 22:17:20 +05:30 |
|
Mohammad Hasnain Mohsin Rajan
|
21e662f678
|
fix: apply permission while selecting projects (#25765)
|
2021-05-20 17:20:05 +05:30 |
|
Anupam
|
aa516e5d17
|
fix: review changes
|
2021-05-20 14:12:18 +05:30 |
|
Anupam
|
4e73c8a79f
|
restructuring timesheet fields
|
2021-05-19 14:58:12 +05:30 |
|
Anupam
|
9bd779401d
|
added multi-currency fields
|
2021-05-18 22:41:28 +05:30 |
|
Syed Mujeer Hashmi
|
426b04003c
|
fix: Project filter for Kanban Board
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
|
2021-05-18 17:02:21 +05:30 |
|
Anupam
|
42d2f663fa
|
fix: sider fixes
|
2021-05-17 11:08:26 +05:30 |
|
Anupam
|
35137ba9e0
|
removing currency filter and added rate conversion while fetching timesheets in SI
|
2021-05-16 14:17:56 +05:30 |
|
Anupam
|
fd4743cc31
|
refactor: timesheet
|
2021-05-15 20:01:17 +05:30 |
|
Anupam Kumar
|
da7fefe29d
|
fix: timesheet filter date exclusive issue (#25626)
|
2021-05-07 20:26:50 +05:30 |
|
Rucha Mahabal
|
062d30146f
|
fix: Include search fields in Project Link field query (#25505)
* fix: Include search fields in Project Link field query
* fix: add project_name to Project search fields
|
2021-05-07 13:31:14 +05:30 |
|
rohitwaghchaure
|
dc6233b703
|
Merge pull request #25541 from rohitwaghchaure/fixed-incorrect-serial-no-set
fix: serial no changed after saving stock reconciliation
|
2021-05-06 17:44:36 +05:30 |
|
Rohit Waghchaure
|
35d4829383
|
fix: serial no changed after saving stock reconciliation
|
2021-05-02 17:57:28 +05:30 |
|
Deepesh Garg
|
cd9fa61659
|
Merge pull request #25521 from ernestoruiz89/patch-4
fix: Make strings translatable
|
2021-04-30 12:58:26 +05:30 |
|
Rucha Mahabal
|
d5ca9474ce
|
fix: add employee name in report data
|
2021-04-26 16:10:06 +05:30 |
|
Rucha Mahabal
|
926a9aed58
|
Merge branch 'develop' into employee-util-report
|
2021-04-26 16:03:39 +05:30 |
|
Rucha Mahabal
|
7a84d76489
|
fix: tests
|
2021-04-26 16:03:10 +05:30 |
|
Jannat Patel
|
616f1d3624
|
fix: issue in project custom status (#25452)
|
2021-04-26 15:35:49 +05:30 |
|
Rucha Mahabal
|
4716ebea5a
|
feat: Add % Utilization (Billed Only)
- Added billed utilization metric in report summary
|
2021-04-26 11:40:26 +05:30 |
|
Rucha Mahabal
|
2a1a472371
|
chore: clean-up
- set default date filters for last month instead of year
- added abbreviations for columns to use them in the metrics labels
|
2021-04-26 11:18:32 +05:30 |
|
Shadrak Gurupnor
|
b9d4719285
|
fix: circular loop in project task (#25454)
* fix: circular loop in project task
|
2021-04-26 11:14:07 +05:30 |
|
Rucha Mahabal
|
0decc2b66a
|
fix: validate Standard Working Hours
- use standard working hours in metrics calculation
|
2021-04-26 11:00:54 +05:30 |
|
Rucha Mahabal
|
b7a7e1b11a
|
Merge branch 'develop' into employee-util-report
|
2021-04-26 10:25:42 +05:30 |
|
Rucha Mahabal
|
2a25c7505e
|
fix: report column widths
|
2021-04-25 20:29:14 +05:30 |
|
Rucha Mahabal
|
e63f3b2f36
|
fix: standard working hours message and link for HR Settings
|
2021-04-23 20:33:42 +05:30 |
|
pateljannat
|
84ef7419da
|
fix: sider
|
2021-04-22 16:31:16 +05:30 |
|
pateljannat
|
2004fec8eb
|
fix: removed multicurrency
|
2021-04-22 14:52:36 +05:30 |
|
pateljannat
|
ba6ad7f5be
|
fix: escape for format and msg for working hours if not set
|
2021-04-22 11:19:44 +05:30 |
|
Ernesto Ruiz
|
090177494d
|
fix: Make strings translatable
Make strings translatable
|
2021-04-21 09:04:06 -06:00 |
|
pateljannat
|
039a5a829d
|
fix: dynamic values for tests
|
2021-04-21 12:32:25 +05:30 |
|
pateljannat
|
cbdcfb4873
|
fix: multicurrency
|
2021-04-20 17:53:41 +05:30 |
|
pateljannat
|
73896ce94c
|
fix: conflicts
|
2021-04-19 16:50:39 +05:30 |
|
pateljannat
|
3b54b1e975
|
fix: report name and columns
|
2021-04-19 16:49:28 +05:30 |
|
Rucha Mahabal
|
5d7f7094d6
|
Merge branch 'develop' into employee-util-report
|
2021-04-19 16:24:55 +05:30 |
|
Hussain Nagaria
|
1f8326bb1f
|
chore: Add Report to Dashboard
|
2021-04-19 16:19:13 +05:30 |
|
Jannat Patel
|
119b27b97f
|
feat: Delayed Tasks Summary (#25024)
* feat: delayed deliverables summary
* fix: sider
* fix: renamed to delayed tasks
* fix: renamed test
* fix: test
* fix: sider
* fix: dates, validations and chart
* fix: space and column width
* feat: Sort tasks by descending order of delay
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
|
2021-04-19 12:46:14 +05:30 |
|
Hussain Nagaria
|
2399e84052
|
Merge branch 'employee-util-report' of https://github.com/NagariaHussain/erpnext into employee-util-report
|
2021-04-16 15:41:25 +05:30 |
|
Hussain Nagaria
|
f1b4ce7430
|
feat: Add filtering by department
Also:
- Add department filter to js
- Add department column to report
- Fetch only those timesheets which have an Employee Linked
- Update unit tests
|
2021-04-16 15:36:43 +05:30 |
|
Nabin Hait
|
b7b35734a7
|
Merge branch 'develop' into employee-util-report
|
2021-04-14 11:22:51 +05:30 |
|
Rohit Waghchaure
|
ca5e10892c
|
fix: travis
|
2021-04-09 16:23:45 +05:30 |
|
Hussain Nagaria
|
d2da7b673b
|
fix: Sider Issues
|
2021-04-06 11:44:54 +05:30 |
|
Hussain Nagaria
|
33e0c8ed19
|
test: Unique Employee IDs for tests
|
2021-04-06 11:40:35 +05:30 |
|
Hussain Nagaria
|
bb32f5a92a
|
fix: Rename utilisation to utilization
|
2021-04-05 19:32:10 +05:30 |
|
Hussain Nagaria
|
ccb15de1c9
|
fix: Handle overtime edge case
|
2021-04-05 11:23:06 +05:30 |
|
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 |
|