Branch: develop

develop

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'develop'

${ noResults }

Commit Graph

989 Commits (develop)

Author	SHA1	Message	Date
Rucha Mahabal	88df5ce530	fix: tests (#29051) * fix(test): create salary slip as per timesheet dates for Project Profitability * fix(test): reload salary slip before checking for payment days	3 years ago
Deepesh Garg	077e2c6467	Update erpnext/projects/doctype/project/project.js	3 years ago
Anupam	9c0f6d1306	fix: sider issue	3 years ago
Anupam	a6d6de6c4f	fix: grouping project form custom buttons	3 years ago
Ankush Menat	f5d5281119	chore: drop deprecated qunit tests	3 years ago
Rucha Mahabal	b027050f77	Merge pull request #28845 from ruchamahabal/fix-salary-slip-timesheet fix: incorrect amount based on payment days in timesheet salary slip	3 years ago
Rucha Mahabal	d0f4f03b66	fix: Employee Transfer and Project Profitability test cases (#28633) * fix: Employee Transfer testcases * fix: Project Profitability test case	3 years ago
Ankush Menat	8fe5feb6a4	chore: remove all six compat code	3 years ago
Ankush Menat	6098e92ba9	chore: remove utf-8 compat code	3 years ago
Raffael Meyer	2bdaf7bb23	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>	3 years ago
Rucha Mahabal	261f80c5ca	fix: avoid resetting employee on amending timesheets (#28025)	3 years ago
Shariq Ansari	790c1cda6f	fix: Removing unused fields from workspace JSON files #27612 fix: Removing unused fields from workspace JSON files	3 years ago
Sagar Vora	09ccdee2db	feat: add `total_billing_hours` to Sales Invoice (fp #26783) (#27742) * feat: add `total_billing_hours` to Sales Invoice * fix: re-save doctypes * fix: indentation * fix: replace reference to old function	3 years ago
Saqib	0b040c7437	fix: cannot delete a project if linked with sales order (#27536)	3 years ago
Chillar Anand	915b34391c	chore: Clean up imports (#27302) * chore: Added isort to pre-commit config * chore: Sort imports with isort * chore: Clean up imports with pycln * chore: Sort imports with isort * chore: Fix import issues * chore: Clean up sider issues * chore: Remove import errors from flake8 ignore list * chore: Clean up lint issues	3 years ago
Ankush Menat	ae55eab599	chore: remove deprecated and empty QUnit tests (#27179) * 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.	3 years ago
Ankush Menat	4551d7d602	chore: mass trailing whitespace and EOF fixes	3 years ago
Shariq Ansari	b32c2fa561	fix: updated erpnext wspace json files (#26380) * fix: updated erpnext wspace json files * fix: updated wspace json files * fix: updated wspace json files * fix: removed padding code from wspace json files * fix: Updated restrict_to_domain in wspace json Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	3 years ago
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	3 years ago
Rucha Mahabal	821db5cce7	fix: employee status server-side validation (#26442) * fix: employee status server-side validation * fix: test * test: employee inactive status * fix: test	3 years ago
Rucha Mahabal	017ed3f5c1	fix: employee status server-side validation (#26615)	3 years ago
Jannat Patel	ccb52f19bc	fix: task status loop (#26006) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	3 years ago
Rucha Mahabal	357657fa73	chore: create a separate controller file for EmployeeBoardingController	3 years ago
Rohit Waghchaure	f0dfea1d47	fix: test case for Project Profitability report	3 years ago
Rohit Waghchaure	3d7f660bec	fix: test case for Project Profitability report	3 years ago
Ankush Menat	9891780f5a	perf(minor): remove unnecessary comprehensions (port #25645)	3 years ago
Ankush Menat	a9c84f749a	perf(minor): remove unnecessary comprehensions (#25645)	3 years ago
Rucha Mahabal	67519d6b79	fix: boarding status in Employee Onboarding and Separation - make boarding status read-only as its dependent on project - update boarding status in onboarding/separation on project update - update tests to check status changes	3 years ago
Jannat Patel	dc7afa743c	fix: profitability test (#25812) * fix: profitability test * fix: replaced class method * fix: removed print statement	4 years ago
Rucha Mahabal	59961f70ee	refactor: timesheet	4 years ago
Rucha Mahabal	a7d0dbb085	fix: calculate total billing amount on fetching timesheets - show timesheet billing amounts in doc currency	4 years ago
Rucha Mahabal	8a407f1ec3	fix: sider issues	4 years ago
Rucha Mahabal	be247ec3de	fix: error message placeholders and sider issues	4 years ago
Mohammad Hasnain Mohsin Rajan	21e662f678	fix: apply permission while selecting projects (#25765)	4 years ago
Anupam	aa516e5d17	fix: review changes	4 years ago
Anupam	4e73c8a79f	restructuring timesheet fields	4 years ago
Anupam	9bd779401d	added multi-currency fields	4 years ago
Syed Mujeer Hashmi	426b04003c	fix: Project filter for Kanban Board Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>	4 years ago
Anupam	42d2f663fa	fix: sider fixes	4 years ago
Anupam	fd4743cc31	refactor: timesheet	4 years ago
Anupam Kumar	da7fefe29d	fix: timesheet filter date exclusive issue (#25626)	4 years ago
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	4 years ago
Shariq Ansari	ad3edc83ec	fix: Render timesheet template on timer field (#25565) * fix: Render timesheet template on timer field * fix: sider fix	4 years ago
Rohit Waghchaure	35d4829383	fix: serial no changed after saving stock reconciliation	4 years ago
Rucha Mahabal	d5ca9474ce	fix: add employee name in report data	4 years ago
Rucha Mahabal	7a84d76489	fix: tests	4 years ago
Jannat Patel	616f1d3624	fix: issue in project custom status (#25452)	4 years ago
Rucha Mahabal	4716ebea5a	feat: Add % Utilization (Billed Only) - Added billed utilization metric in report summary	4 years ago
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	4 years ago
Shadrak Gurupnor	b9d4719285	fix: circular loop in project task (#25454) * fix: circular loop in project task	4 years ago