erpnext2

Author	SHA1	Message	Date
Deepesh Garg	8e4ea7e997	fix: Merge Conflicts	3 years ago
Shariq Ansari	9c4455f77c	fix: Removed ERPNext Integration Settings Workspace (#29023 )	3 years ago
Nabin Hait	f152a40b28	feat: Provision to assign multiple payroll cost centers against a single employee	3 years ago
Deepesh Garg	cbef04fded	chore: Remove patch comment (cherry picked from commit 7c1bfe6b46ac3deedacfa666d0695b53b86ec3f6) # Conflicts: # erpnext/patches.txt	3 years ago
Deepesh Garg	12a65eef8a	fix: Is Reverse Charge check in Tax Category (cherry picked from commit b33fd6acc769dbfaa43c665c19f378e8e041d010) # Conflicts: # erpnext/patches.txt	3 years ago
Saqib Ansari	564d23fa8d	fix(ksa): enable ksa pos invoice print format	3 years ago
Ankush Menat	7fd06108bf	fix: reorder patch to fix custom field options (#28866 )	3 years ago
Dany Robert	2df641eb54	feat(Regional): rename qr field and disable print formats	3 years ago
Anupam Kumar	3928a402d4	feat: CRM Settings (#27788 ) * feat: crm settings * feat: CRM Settings * feat: lead and opprtunity section * feat: added CRM Settings in ERPNext Settings workspace * fix: review chnages * added patch * fix: linter issues * fix: linter issues * fix: linter issues * fix: removed crm settings from selling module * fix: raw query to frappe.qb * fix: removed hardcoded value * fix: linter issue * fix: simplify CRM Settings migration patch Co-authored-by: Anupam Kumar <anupam@Anupams-MacBook-Air.local> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	3 years ago
Saqib Ansari	f9408d170a	patch: split 'ongoing' sla status	3 years ago
Ankush Menat	bdf7b8d379	fix: patch to remove default item group and territory	3 years ago
Rucha Mahabal	235b707417	feat: add default Exit Questionnaire email template	3 years ago
hrwx	43038aab79	fix: do not add gst fields if no indian company	3 years ago
Ankush Menat	54184e54ed	fix: patch for naming series property setter	3 years ago
Ankush Menat	ccf84ae88a	fix: patch to update job card status	3 years ago
Deepesh Garg	94d70bca9e	fix: Resolve conflicts	3 years ago
Subin Tom	d2915c6bc7	fix: fixed company field, updated patch (cherry picked from commit 7f2d304f32fdf580a354c1dbba58189cdd4f35f2) # Conflicts: # erpnext/patches.txt	3 years ago
Deepesh Garg	508832e90a	fix: Add patch to make custom fields	3 years ago
Ankush Menat	b01635e1da	refactor!: remove hub #28117 refactor!: remove hub	3 years ago
Alan	05831b18ad	fix: update production plan status #27567 fix: update production plan status	3 years ago
Deepesh Garg	89d5e494dd	fix: Reload customer and supplier doctype	3 years ago
Deepesh Garg	e3ae8d5a1e	fix: Move PAN field from standard doctype to fixtures for India	3 years ago
Deepesh Garg	bf13d183d8	fix: Replace section code with tax withholding category in LDC	3 years ago
Sagar Vora	8d9d0987fe	fix: incorrect status being set in Invoices (#28019 ) Co-authored-by: Pruthvi Patel <pruthvipatel145@gmail.com>	3 years ago
Chillar Anand	73ae504721	fix(healthcare): Add patch for removing healthcare doctypes (#27995 ) * fix(healthcare): Add patch for healthcare doctypes * fix: Update healthcare patch * fix: Reload stale doctypes * fix: Reload doc fix	3 years ago
Rohit Waghchaure	efc60ec2b5	fix: patch to enable scheduled job for reposting	3 years ago
Noah Jacob	2bb383b178	fix: not authorized to update entries after freezing accounts (#27937 ) * fix: not authorized to update entries after freezing accounts * fix: Add test case * fix(patch): patched to requeue failed reposts(check_freezing_date) * chore: misc fixes Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Ankush Menat <ankushmenat@gmail.com>	3 years ago
Deepesh Garg	2d19e2d54b	fix: Patch	3 years ago
Dany Robert	7acdcc70ad	fix: v12 migrate error - unknown column ‘mandatory_depends_on’ (#27897 ) * fix: v12 doesn't have mandatory_depends_on field * fix: move update_vehicle_no_reqd_condition to v13 * fix: move update_vehicle_no_reqd_condition to v13 * fix: file name missing .py * refactor!: add back empty line * fix: linters issue	3 years ago
Saqib Ansari	b0aa4a6e1c	fix: patch fails if accounts are frozen	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
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
marination	73ac3e0c40	fix: Add patch to patches.txt for https://github.com/frappe/erpnext/pull/27554	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
Saqib Ansari	f1fcb385f5	patch: trim sales invoice custom field lengths	3 years ago
Saqib	424efd41e5	feat(regional): toggle for reduced depreciation rate as per IT Act (#27600 )	3 years ago
Saqib Ansari	beebfb323a	patch: invalid gain loss gl entry	3 years ago
Subin Tom	d49346ac45	fix: Tax breakup based on items, missing GST fields (#27524 ) * fix: Tax breakup based on items * fix: added gst fields,warehouse validation to pos inv,patch * fix: tax breakup test fix, eway bill hsn fix Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	3 years ago
Deepesh Garg	c9c8957250	feat: Merge POS invoices based on customer group (#27471 ) * feat: Merge POS invoices based on customer group * fix: Linting Issues * fix: fieldname Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	3 years ago
DeeMysterio	aa82624f31	Merge pull request #27281 from DeeMysterio/party-specific-items feat: link items to supplier / customer	3 years ago
ChillarAnand	c8565c7090	chore: Removed healthcare module code in other modules	3 years ago
Anupam Kumar	b0d970001a	feat: multi-currency in Opportunity (#26590 ) * feat: multi-currency * refactor: lead form * fix: test case for opportunity item * fix: removing local changes * fix: test cases * fix: test cases * fix: review changes * fix: reverting lead.json chnages * fix: toggle display for currency fields * review changes * fix: test case * fix: linter issues * fix: unused import * feat: grand total in opportunity * fix: patch * fix: sort imports * fix: reload opportunity item doctype Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	3 years ago
Ankush Menat	b25d28e023	fix(patch): delete stale shopify doctypes (#27313 )	3 years ago
Deepesh Garg	8b644d8889	fix: Report and JSON generation for Advances received	3 years ago
Subin Tom	7004944cc0	feat: Taxjar Integration update (#27143 ) * feat: Taxjar Integration update * added taxable_amount,taxable_amount fields in setup.py * Update taxjar_integration.py Sider issues fix * Sider issues fix * Sider issues fix * sider issue fix: unused import * sider issue fix * Update erpnext/erpnext_integrations/taxjar_integration.py Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> * Removed permission for 'All' Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	3 years ago
Deepesh Garg	5e10e10329	feat: Validity dates in Tax Withholding Rates	3 years ago
Shadrak Gurupnor	7433757489	fix: patches were breaking during migration (#27200 ) * fix: patches were breaking during migrating * fix: patches were breaking during migration	3 years ago
Shadrak Gurupnor	17e0fa7a8b	fix: patches were breaking while migrating (#27195 ) * fix: patches were breaking while migrating * fix: Removed duplicate function Co-authored-by: Nabin Hait <nabinhait@gmail.com>	3 years ago
rohitwaghchaure	e6799d78ef	fix: operation time auto set to zero (#27188 )	3 years ago
Rohan	16eed07a0f	fix: use Stripe's Price API for plan-price information (#26107 ) * fix: use Stripe's new Plan API for price information * patch: use inbuilt function to rename field * fix: patch call Co-authored-by: Ankush Menat <ankush@iwebnotes.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	3 years ago

1 2 3 4 5 ...

1429 Commits (develop)