Rucha Mahabal
ddfdb445fa
chore: remove unused code and fields related to workstation from Timesheet Detail
...
(cherry picked from commit bef46e2b64
2022-02-17 18:22:43 +05:30
Rucha Mahabal
98bafc5898
test: timesheet not overlapping with continuous timelogs
...
(cherry picked from commit 47ff968253
2022-02-17 18:22:43 +05:30
Rucha Mahabal
91e6fea2cd
fix: convert overlap raw query to frappe.qb
...
(cherry picked from commit 3ec9acf8f7
2022-02-17 18:22:43 +05:30
Rucha Mahabal
6db0ea8be8
fix(Timesheet): convert time logs to datetime while checking for overlap
...
(cherry picked from commit e2e998fbd9
2022-02-17 18:22:43 +05:30
mergify[bot]
3b4e4955f7
fix: task status loop (backport #26006 ) ( #29821 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com >
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com >
2022-02-16 11:32:40 +05:30
mergify[bot]
9869b31b31
fix(Timesheets): calculate to time (backport #28589 ) ( #29390 )
...
Co-authored-by: Ankush Menat <ankushmenat@gmail.com >
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com >
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com >
2022-01-21 13:51:49 +05:30
mergify[bot]
ac4e996928
fix: Task Depends on not removed from Gantt chart (backport #28309 ) ( #29207 )
...
Co-authored-by: conncampbell <conncampbell@conzu.ca >
(cherry picked from commit 31123436fbconn.campbell@conzu.ca >
2022-01-10 10:49:29 +05:30
mergify[bot]
165114ba4c
fix: tests ( #29051 ) ( #29060 )
...
* fix(test): create salary slip as per timesheet dates for Project Profitability
* fix(test): reload salary slip before checking for payment days
(cherry picked from commit 88df5ce530ruchamahabal2@gmail.com >
2021-12-28 17:28:31 +05:30
mergify[bot]
d0d5236a1a
Merge pull request #28845 from ruchamahabal/fix-salary-slip-timesheet ( #28874 )
...
fix: incorrect amount based on payment days in timesheet salary slip
(cherry picked from commit b027050f77ruchamahabal2@gmail.com >
2021-12-14 15:32:22 +05:30
mergify[bot]
16ce9dfa12
fix: Employee Transfer and Project Profitability test cases ( #28633 ) ( #28639 )
...
* fix: Employee Transfer testcases
* fix: Project Profitability test case
(cherry picked from commit d0f4f03b66ruchamahabal2@gmail.com >
2021-11-30 14:26:43 +05:30
Ankush Menat
fbfaf75b66
chore: remove __future__ py2 compatibility imports
2021-11-25 17:42:24 +05:30
mergify[bot]
60620fe335
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 >
(cherry picked from commit 2bdaf7bb2314891507+barredterra@users.noreply.github.com >
2021-10-22 14:06:11 +05:30
mergify[bot]
9ce7ea692d
fix: avoid resetting employee on amending timesheets ( #28025 ) ( #28026 )
...
(cherry picked from commit 261f80c5caruchamahabal2@gmail.com >
2021-10-20 17:45:43 +05:30
Sagar Vora
e17713c9d6
fix: multiple fixes to timesheets ( #27775 )
2021-10-04 17:08:50 +05:30
Frappe PR Bot
212492220d
fix: cannot delete a project if linked with sales order ( #27536 ) ( #27689 )
2021-09-28 19:46:35 +05:30
Chillar Anand
4b2be2999f
chore: Cleanup imports ( #27320 )
...
* chore: Added isort to pre-commit config
* chore: Sort imports with isort
* chore: Remove imports with pycln
* chore: Sort imports with isort
* chore: Fix import issues
* chore: Fix sider issues
* chore: linting
* chore: linting / sorting import
from ecommerce refactor merge
* ci: dont allow unused imports
* chore: sort / clean ecommerce imports
Co-authored-by: Ankush Menat <ankush@iwebnotes.com >
2021-09-03 18:57:43 +05:30
Nabin Hait
8547cb5448
fix: merge conflict
2021-08-27 15:53:32 +05:30
Frappe PR Bot
8dae084f23
chore: remove deprecated and empty QUnit tests ( #27179 ) ( #27181 )
...
* 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.
(cherry picked from commit ae55eab599ankush@iwebnotes.com >
2021-08-26 21:08:08 +05:30
Ankush Menat
9bb69e711a
chore: whitespace cleanup from codebase
2021-08-19 14:33:03 +05:30
Raffael Meyer
fc717665ea
Merge branch 'version-13-hotfix' into si_total_billing_hours_v13
2021-08-15 18:45:33 +02:00
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
barredterra
c82611aa62
feat: sort timesheets by start time
2021-08-02 23:19:57 +02:00
barredterra
1110f88e5a
feat: refactor and enhance sales invoice timesheet
2021-08-02 23:06:37 +02:00
Rucha Mahabal
017ed3f5c1
fix: employee status server-side validation ( #26615 )
2021-07-24 00:08:02 +05:30
Rohit Waghchaure
3d7f660bec
fix: test case for Project Profitability report
2021-06-20 10:20:35 +05:30
Ankush Menat
a9c84f749a
perf(minor): remove unnecessary comprehensions ( #25645 )
2021-06-11 16:00:48 +05:30
Jannat Patel
dc7afa743c
fix: profitability test ( #25812 )
...
* fix: profitability test
* fix: replaced class method
* fix: removed print statement
2021-05-24 17:33:48 +05:30
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
