nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-09 15:29:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,095 Commits 631 Branches 1,810 Tags
e5b1ff667d53fc6fbffbd490f2fb35d1389a820d
Commit Graph

59095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pandiyan P
e5b1ff667d fix: check material request price list permission (#58740) 
(cherry picked from commit 0b1f1d6851)
 2026-09-04 07:33:18 +00:00
Sudharsanan Ashok
d8236548be Merge pull request #58749 from frappe/mergify/bp/version-16-hotfix/pr-58736 
fix(batch): show Expired status only after expiry date has passed (backport #58736)
 2026-09-04 13:00:00 +05:30
mergify[bot]
f75601e9b1 fix(timesheet): handle empty allowed projects (backport #58745) (#58746) 
Co-authored-by: Krishna Pramod Shirsath <91021227+krishna-254@users.noreply.github.com>
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-09-04 07:02:33 +00:00
Pandiyan P
0684599bdb fix(batch): show Expired status only after expiry date has passed (#58736) 
Co-authored-by: Ajish18 <ajishiyappan1@gmail.com>
(cherry picked from commit 00f04fc084)
 2026-09-04 06:51:16 +00:00
mergify[bot]
a1c8dc878d fix(stock): allow creating stock closing balances (backport #58590) (#58685) 
* fix(stock): allow creating stock closing balances (#58590)

(cherry picked from commit 2918e98a2b)

# Conflicts:
#	erpnext/stock/doctype/stock_closing_entry/test_stock_closing_entry.py

* chore: fix conflicts

Removed redundant test cases and cleaned up the test structure for StockClosingEntry.

---------

Co-authored-by: Krishna Pramod Shirsath <91021227+krishna-254@users.noreply.github.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2026-09-03 10:29:34 +00:00
mergify[bot]
dfb64d7635 fix(setup): strict permissions for transaction deletion record (backport #58687) (#58723) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-09-03 15:07:48 +05:30
mergify[bot]
b0ddca0455 ci: authenticate github clones in install.sh (backport #58718) (#58720) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-09-03 09:27:42 +00:00
Sagar Vora
5f13a04633 Merge pull request #58704 from frappe/mergify/bp/version-16-hotfix/pr-58697 
fix!: improve validation in financial report template (backport #58697)
 2026-09-02 17:41:50 +05:30
Sagar Vora
7aad59b129 fix!: improve validation in financial report template 2026-09-02 17:31:36 +05:30
Sagar Vora
7c61dfe3e0 Merge pull request #58487 from frappe/mergify/bp/version-16-hotfix/pr-58425 
fix: improve message formatting and translation for validation issues (backport #58425)
 2026-09-02 17:24:03 +05:30
mergify[bot]
41374019ba fix: include payment deductions in sales/purchase register ledger bal… (backport #58437) (#58680) 2026-09-02 17:00:42 +05:30
mergify[bot]
d6f9dde3cb fix: filter cancelled BOMs in BOM Stock Analysis (backport #58647) (#58693) 2026-09-02 15:28:17 +05:30
mergify[bot]
3c63fffcb6 fix(accounts): resolve subscription plans for any reference doctype in Payment Request (backport #58438) (#58450) 
Co-authored-by: jatin3128 <jatinsarna64@gmail.com>
 2026-09-02 12:18:17 +05:30
Sudharsanan Ashok
d3b8324819 Merge pull request #58665 from frappe/mergify/bp/version-16-hotfix/pr-58663 
fix(manufacturing): use item warehouses in production plan work orders (backport #58663)
 2026-09-02 12:05:04 +05:30
Sudharsanan Ashok
46db04ecf8 Merge pull request #58675 from frappe/mergify/bp/version-16-hotfix/pr-58505 
fix(stock): preserve exchange gain loss journals in lcv (backport #58505)
 2026-09-02 12:03:51 +05:30
Shllokkk
75356265be Merge pull request #58535 from Shllokkk/mr-rfq-filter-pending-qty-v16 
fix: filter fully ordered items when creating RFQ from Material Request
 2026-09-02 11:46:07 +05:30
Pandiyan P
124231681a fix(stock): preserve exchange gain loss journals in lcv (#58505) 
(cherry picked from commit 2b54a581f8)
 2026-09-02 06:15:05 +00:00
mergify[bot]
f22f84a58a fix(crm): validate contact email before saving an email campaign (backport #58667) (#58672) 
Co-authored-by: kaulith <64089478+kaulith@users.noreply.github.com>
 2026-09-02 11:42:32 +05:30
Shllokkk
5af60cf2e3 test: set schedule date on PO before insert 2026-09-02 11:33:03 +05:30
Shllokkk
4435f166ea fix: add type hints to make_request_for_quotation 2026-09-02 11:33:03 +05:30
Shllokkk
5adcb28b3c test: RFQ from Material Request skips fully ordered items 2026-09-02 11:33:02 +05:30
Shllokkk
9b1d907b6a fix: filter fully ordered items when creating RFQ from Material Request 2026-09-02 11:33:02 +05:30
pandiyan
ec392a7bcf fix(manufacturing): use item warehouses in production plan work orders (#58663) 
(cherry picked from commit e74ab38eeb)

# Conflicts:
#	erpnext/manufacturing/doctype/production_plan/services/work_order_planning.py
 2026-09-02 10:36:32 +05:30
mergify[bot]
f4ed4cae64 fix(stock): ignore cancelled batch entries in valuation (backport #58659) (#58660) 
fix(stock): ignore cancelled batch entries in valuation (#58659)

(cherry picked from commit a9b857bdfe)

# Conflicts:
#	erpnext/stock/serial_batch_bundle.py

Co-authored-by: Pandiyan P <pandiyanpalani37@gmail.com>
 2026-09-01 16:08:38 +00:00
mergify[bot]
2b8e12ef44 fix(selling): check sales order permission before work order creation (backport #58492) (#58497) 
Co-authored-by: Pandiyan P <pandiyanpalani37@gmail.com>
 2026-09-01 21:30:33 +05:30
mergify[bot]
86e9480362 fix: add missing perm checks on various whitelisted methods (backport #58652) (#58654) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-09-01 14:01:40 +00:00
mergify[bot]
4f409e5ccf fix(timesheet): scoping whitelisted methods output to projects and timesheets that are acccessible to users (backport #58267) (#58577) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-09-01 12:09:00 +00:00
Shllokkk
01fecfe093 Merge pull request #58649 from frappe/mergify/bp/version-16-hotfix/pr-58607 
fix: round party balances to currency precision in Trial Balance for Party (backport #58607)
 2026-09-01 16:42:57 +05:30
Shllokkk
956a6ed407 fix: round party balances to currency precision in Trial Balance for Party 
(cherry picked from commit b1c7657dfa)
 2026-09-01 09:49:43 +00:00
Diptanil Saha
c745558168 fix(accounts): add permission checks on payment entry whitelisted methods (#58644) 2026-09-01 09:24:40 +00:00
mergify[bot]
fb74a030de fix: handle BOM price list currency update (backport #58638) (#58639) 
fix: handle BOM price list currency update (#58638)

(cherry picked from commit db52e465d0)

Co-authored-by: Pandiyan P <pandiyanpalani37@gmail.com>
 2026-09-01 13:40:51 +05:30
Aarol D'Souza
de28957008 Merge pull request #58637 from frappe/mergify/bp/version-16-hotfix/pr-58586 
fix(sms_settings): add patch to pre-fill roles into SMS Settings Role Table (backport #58586)
 2026-09-01 13:05:22 +05:30
AarDG10
9ee421424f chore: resolve conflicts 2026-09-01 12:51:04 +05:30
AarDG10
4b89ddffde fix(sms_settings): add patch to pre-fill roles into SMS Settings Roles Table 
(cherry picked from commit 3501beb2bd)

# Conflicts:
#	erpnext/patches.txt
 2026-09-01 07:18:30 +00:00
Mihir Kandoi
1b44df480f feat: valuation type for BOM secondary items (backport #58431) (#58632) 2026-09-01 11:45:52 +05:30
Mihir Kandoi
ff656b9ad2 feat(manufacturing): add multi-currency support to Blanket Orders (backport #58472) (#58630) 2026-09-01 11:39:26 +05:30
mergify[bot]
22755c4ad6 fix(manufacturing): handle duplicate root BOM items (backport #58614) (#58616) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-09-01 02:54:09 +00:00
mergify[bot]
8a8bafd6cb fix: explain missing fields when loading party details or taxes (backport #58627) (#58628) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2026-09-01 01:53:59 +02:00
mergify[bot]
9bb8d4ff93 fix: translate label in party validation (backport #58624) (#58626) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2026-09-01 00:54:12 +02:00
mergify[bot]
30f0cd9c95 fix(crm): add missing permission validation on get_contract_template (backport #58621) (#58623) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-08-31 19:40:50 +00:00
mergify[bot]
f8c29274a5 fix: validate POS Settings invoice and search fields on the server (backport #58611) (#58620) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-09-01 00:08:37 +05:30
mergify[bot]
f3379b4694 fix: do not map the same row twice in "Get Items From" (backport #58617) (#58619) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2026-08-31 19:40:59 +02:00
Lakshit Jain
2390d48c01 Merge pull request #58602 from frappe/mergify/bp/version-16-hotfix/pr-58483 
fix(taxes): skip tax addition for invoice created from opening invoice tool (backport #58483)
 2026-08-31 18:38:56 +05:30
mergify[bot]
765a7736ed fix(accounts): added permission checks on get_available_payment_schedules (backport #58588) (#58595) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-08-31 17:14:27 +05:30
mergify[bot]
d95eeb0f6a fix(pos): add permission checks on get_invoices (backport #58591) (#58597) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-08-31 17:14:16 +05:30
ljain112
32393caa39 chore: resolve conflicts 2026-08-31 16:54:30 +05:30
mergify[bot]
c7582e986d fix/payment-request-subscription-plans-population (backport #57494) (#58430) 
* fix(payment-request): populate subscription plans (#57494)

* fix(payment-request): populate subscription plans

* test: add coverage for subscription plans in payment request

---------

Co-authored-by: Dharanidharan2813 <dharanidharans1328@gmail.com>
(cherry picked from commit 1b81db4754)

# Conflicts:
#	erpnext/accounts/doctype/payment_request/payment_request.py
#	erpnext/accounts/doctype/payment_request/test_payment_request.py

* fix(payment-request): resolve cherry-pick conflicts for version-16-hotfix backport

---------

Co-authored-by: Vishnu Priya Baskaran <145791817+ervishnucs@users.noreply.github.com>
Co-authored-by: ervishnucs <ervishnucs369@gmail.com>
Co-authored-by: Jatin3128 <140256508+Jatin3128@users.noreply.github.com>
 2026-08-31 16:28:20 +05:30
ljain112
bfbc13d147 fix(taxes): skip tax addition for invoice created from opening invoice tool 
(cherry picked from commit e08a166281)

# Conflicts:
#	erpnext/accounts/services/taxes.py
 2026-08-31 09:35:42 +00:00
Nishka Gosalia
40fe739c9e Merge pull request #58592 from frappe/mergify/bp/version-16-hotfix/pr-58325 
fix(projects): check read permission on source in create_duplicate_project (backport #58325)
 2026-08-31 14:17:07 +05:30
Shllokkk
bd35957582 fix(projects): check read permission on source in create_duplicate_project 
(cherry picked from commit 8c8b282a2e)
 2026-08-31 07:10:45 +00:00