erpnext2

Author	SHA1	Message	Date
Ankush Menat	4159361d52	ci(Mergify): configuration update (#27777 ) Signed-off-by: Ankush Menat <me@ankush.dev>	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
Rucha Mahabal	5905cf9002	refactor!: Removed healthcare module from ERPNext (#27362 ) * chore: Removed healthcare module * chore: Removed healthcare demo, patch files * chore: Rename imports from erpnext to healthcare * chore: Added healthcare deprecation warning patch * chore: Removed healthcare module code in other modules * chore: Code clean up * refactor: Remove sales invoice custom js related to healthcare * fix: sider Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	3 years ago
Komal-Saraf0609	b483f173a6	fix: Merge "Accounting Ledger" and "Accounts Receivable" in "View" button (#27769 ) * fix: Added a new button "View" and merged "Accounting Ledger" and "Accounts Receivable" into it * fix: sider issues * chore: dead code	3 years ago
Saqib	9051735529	perf: fetching of account balance in chart of accounts (#27661 )	3 years ago
Deepesh Garg	4abb43a425	Merge pull request #27749 from GangaManoj/fix-pe-payment-term fix: Display appropriate message for Payment Term discrepancies in Payment Entry	3 years ago
Deepesh Garg	a1c4c62fac	Merge pull request #27739 from nextchamp-saqib/sla-migrate-fix fix: sync_jobs fails	3 years ago
Deepesh Garg	d9599a6a1c	Merge pull request #27755 from frappe/mergify/bp/develop/pr-27712 fix(India): Internal transfer check fix (backport #27712)	3 years ago
Rucha Mahabal	01bea14622	fix: sider	3 years ago
ChillarAnand	a1d3a09d3c	Merge branch 'develop' into care	3 years ago
Deepesh Garg	da47fe2cfb	fix(India): Internal transfer check fix (cherry picked from commit f0af24fc6d26040fa34fd7248bf38301897d9ca1)	3 years ago
Deepesh Garg	ab2adf01c5	Merge pull request #27751 from frappe/mergify/bp/develop/pr-27748 fix: Chart Of Accounts import button not visible (backport #27748)	3 years ago
Deepesh Garg	f109f6fd16	fix: Linting issues (cherry picked from commit ff570f48a0ba56925528eb8696b8b7d862252d8f)	3 years ago
Deepesh Garg	237b1a91de	fix: Remove unwanted comments (cherry picked from commit e4b89d2fcd6c1eb788f94ad5f9563ccec07a0f2a)	3 years ago
Deepesh Garg	9244fe563a	fix: Chart Of Accounts import button not visible (cherry picked from commit 3529622a0d28e9cdd6e602b5450ca79d13cfa0ed)	3 years ago
Deepesh Garg	197e97d9d6	Merge pull request #27665 from nextchamp-saqib/trim-custom-field-length fix: trim sales invoice custom field lengths	3 years ago
GangaManoj	9f14695743	fix: Display appropriate message if different Payment Terms are used in PE and its Payment References	3 years ago
Marica	4e7ec8a068	fix: Hero Slider Control & Alignment fixes (#27611 ) * fix: Creating unique hash for slider id instead of slider name * fix: Fixed alignment of Title, Subtitle, Action Button * chore: linter fix	3 years ago
mergify[bot]	418b9f8545	feat(HR): Some Enhancements and Onboarding (backport #25741 ) (#27741 ) * feat(HR): Some Enhancements and Onboarding (#25741) * feat: Hr settings restructure * feat: remove validation and make As warning * feat: made leave policy Assignment feild read only * feat: send leave Notification via 'Notification' * patch: for field name change * feat: removed defaults value for removed field * feat: removed leave Notification fields * feat: better label and description * feat: Hr Module onboarding and Onboarding slides * fix: sider, test, translations * chore: remove unnecessary code formatting changes * refactor: HR Onboarding * refactor: HR Settings * revert: Notification changes * chore: remove unnecessary descriptions from leave type * fix: linter issues Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> (cherry picked from commit 4837238f3dbbad336bcd21fcbfa19b438cbad16a) # Conflicts: # erpnext/hr/doctype/employee/employee.js * fix: conflicts * fix: conflicts Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	3 years ago
Saqib Ansari	7ac02de613	fix: sync_jobs fails	3 years ago
Alan	ece446ffe5	fix: update variant qty in BOM, Create Work Order dialog (#27686 )	3 years ago
mergify[bot]	b9942ad639	feat: Tracking Multi-round interview (#25482 ) (#27724 ) * feat: Tracking Multi-round interview * fix: releted to scheduler event and formating * fix: job applicant UI/UX and conflicts * test: Interview Round * fix(test): Employee referral, Employee Onboarding, Job Offer * fix: sider * feat: set default value in Hr settings * feat: added validation for designation * test: Interview * test: Added validatiolns for skill * test: Interview feedback * fix: sider * fix: remove unnecessary validations and form label cleanups * chore: clean-up Interview Round and Interview Type doctype * fix: remove redundant Rating Value, only keep Rating * fix: update interview details on feedback submission - make interview feedback submission dialog minimizable * fix: show submit feedback button only if feedback doesn't exist * refactor: Interview and Feedback statuses and workflow * fix(HR Settings): clean up interview settings * refactor: Interview * refactor: Interview Feedback, remove unnecessary validations * chore: update notification messages * chore: remove unnecessary formatting changes in attendance list and leave application * refactor: Job Applicant to Interview mapping * chore: sorted imports * chore: sorted imports * fix: sider issues * fix: linter issues * fix: sider issues * fix: tests * fix: sorted imports * fix: tests, sider * fix: therapy plan test * fix: sider issues * feat: Include From Time and To Time fields in Interview for cleaner data * feat: Interview Calendar * fix: allow renaming masters * fix: add more fields to list view and standard filter * fix: validate overlapping interviews * fix: update tests * fix: linter issues * refactor: replace reminder messages with Email Templates * fix: sider issues Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> (cherry picked from commit 57e66f958cd57d66a6fd3b19f6cd3593eab63666) Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	3 years ago
Ankush Menat	a04f9c904e	fix: option to limit reposting in certain timeslot (#27725 )	3 years ago
Rucha Mahabal	9e08229b7b	fix(Org Chart): use attribute selectors instead of ID selector for node IDs with special characters (#27717 ) * fix(Org Chart): use attribute selectors instead of ID selector for node IDs with special chars * fix: UI tests	3 years ago
Marica	273f3fbe0f	fix: Batch scans get overwritten on the same row (#27668 ) * fix: Batch scans get overwritten on the same row * fix: Increment batch qty if pre-existing batch is scanned * fix: Delete accidental __init__.py file * fix: Add patch to patches.txt for https://github.com/frappe/erpnext/pull/27554 * fix: reload doc in patch	3 years ago
marination	cbffbc3894	fix: reload doc in patch	3 years ago
Marica	b1a4e040be	Merge branch 'develop' into scan-batch	3 years ago
marination	73ac3e0c40	fix: Add patch to patches.txt for https://github.com/frappe/erpnext/pull/27554	3 years ago
Marica	754626a102	fix: Delete accidental __init__.py file	3 years ago
Marica	cc143bca0d	fix: Maintenance Schedule child table status for legacy data (#27554 ) * fix: Maintenance Schedule child table status for legacy data * fix: Include legacy draft schedules in patch * fix: Pre-commit formatting	3 years ago
Marica	c75c709114	Merge branch 'develop' into scan-batch	3 years ago
marination	abf450dc70	fix: Increment batch qty if pre-existing batch is scanned	3 years ago
Saqib Ansari	83cc597594	fix: do not set length for date field	3 years ago
mergify[bot]	9df5df4d94	fix: wrong company selected when marking attendance for all employees (#27685 ) (#27707 ) * fix: wrong company selected when marking attendance for all employees * fix: enable caching for repeated queries of the same employee (cherry picked from commit b478e72cefbdffd3e906fdd1ef822becdead78d7) Co-authored-by: Mohammed Yusuf Shaikh <49878143+mohammedyusufshaikh@users.noreply.github.com>	3 years ago
Ankush Menat	4685ed5a8c	fix: distribution of additional costs in mfg stock entry (#27629 ) * refactor: remove unnecessary list comprehensions * fix: correct cost distribution logic While apportioning costs same condition should be present on both sides so total value is representative of all items to be apportioned. Here while calculating incoming_items_cost only FG items are considered, but while apportioning all items with to_warehouse are considered. Solution: only apportion additional cost on FG items * test: test cost distribution * fix: patch for additional cost fix(patch): consider PCV while patching - consider Period closing voucher while patching - recomute rates for SLE of affected stock entries consider only FG/scrap item SLEs for recomputation of rates * fix: remove client side logic for addn cost All of this is done in python code hence removed client side code.	3 years ago
Deepesh Garg	2a1e202e07	Merge pull request #27704 from frappe/mergify/bp/develop/pr-27551 fix: Deferred revenue entries post account freezing (backport #27551)	3 years ago
Deepesh Garg	f1a669c2f7	fix: Test case (cherry picked from commit 23863c7663a94e32e32812301a7efca79575c470)	3 years ago
Deepesh Garg	774cd68f4c	fix: Test Case (cherry picked from commit 846d128c5d536b5003dc3055f3239e6f92a3146c)	3 years ago
Deepesh Garg	13d2e7b198	fix: Deferred revenue entries post account freezing (cherry picked from commit e2eb72eb5ba1aaadddf8278dd77bfe75a178ef01)	3 years ago
rohitwaghchaure	104d107659	Merge pull request #27701 from rohitwaghchaure/minor-added-project-name-in-purchase-order-analysis fix: added project name in the purchase order analysis	3 years ago
Rohit Waghchaure	c1f9997a67	fix: added project name in the purchase order analysis	3 years ago
Saqib	a84cd2674c	Merge branch 'develop' into trim-custom-field-length	3 years ago
Saqib Ansari	f1fcb385f5	patch: trim sales invoice custom field lengths	3 years ago
Deepesh Garg	b39f8a6215	fix: Ignore user permission for Represents Company field in Sales and Purchase docs (#27684 ) * fix: Ignore user permission for Represents Company field in Sales and Purchase docs * fix: Ignore user permission for fiscal year company	3 years ago
Saqib	0b040c7437	fix: cannot delete a project if linked with sales order (#27536 )	3 years ago
Saqib	424efd41e5	feat(regional): toggle for reduced depreciation rate as per IT Act (#27600 )	3 years ago
Alan	72c081fd8f	fix: apply price list after batch or serial no insertion (#27566 )	3 years ago
Alan	b91333afdd	fix: set item.qty as mandatory in picklist (#27680 )	3 years ago
Noah Jacob	5c249decbb	fix(ux): added exception of template item in filters (#27560 )	3 years ago
Deepesh Garg	cc5dd5c67d	feat: TDS deduction using journal entry and other fixes (#27451 ) * fix: TDS deduction using journal entry * fix: Multi category application against single supplier * refactor: TDS payable monthly report * fix: Server side handling for default tax withholding category * fix: Supplier filter for Journal Entry * refactor: TDS computation summary report	3 years ago

1 2 3 4 5 ...

38790 Commits (4159361d52e84e9e70ce0e045822cdf3993e8200) All Branches Search

38790 Commits (4159361d52e84e9e70ce0e045822cdf3993e8200)

All Branches