nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-02 08:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,545 Commits 622 Branches 1,806 Tags
f75d36dcb4f96ad9b9b6759fa93ef199b0f95bac
Commit Graph

837 Commits

Author SHA1 Message Date
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 31123436fb)

Co-authored-by: Conn Campbell <conn.campbell@conzu.ca>
 2022-01-10 10:49:29 +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 b027050f77)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-12-14 15:32:22 +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 2bdaf7bb23)

Co-authored-by: Raffael Meyer <14891507+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 261f80c5ca)

Co-authored-by: Rucha Mahabal <ruchamahabal2@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 ae55eab599)

Co-authored-by: Ankush Menat <ankush@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
Ankush Menat
a9c84f749a perf(minor): remove unnecessary comprehensions (#25645) 2021-06-11 16:00: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
Jannat Patel
616f1d3624 fix: issue in project custom status (#25452) 2021-04-26 15:35:49 +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
pateljannat
73896ce94c fix: conflicts 2021-04-19 16:50:39 +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
Rohit Waghchaure
ca5e10892c fix: travis 2021-04-09 16:23:45 +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
Walstan Baptista
353aa59c42 test: sets company while making a project (#25061) 2021-03-31 12:16:54 +05:30
pateljannat
6597bf7dd7 feat: profitability report default working hours and tests 2021-03-25 13:31:43 +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