nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-22 18:59:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,957 Commits 605 Branches 1,802 Tags
d3573105c47c6a0b61304373dbe5086f8ad4e843
Commit Graph

58957 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
d3573105c4 fix: escape interpolated values in text positions across portal and desk templates (backport #58286) (#58288) 2026-08-19 02:43:18 +05:30
mergify[bot]
9e2173e4c2 fix: escape on status image for workstations in production status (backport #58279) (#58281) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-08-19 00:17:17 +05:30
mergify[bot]
6b7b4796b4 fix: escape interpolated values in portal, print and desk templates (backport #58273) (#58278) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
 2026-08-19 00:16:52 +05:30
rohitwaghchaure
27a04d8e08 fix: work order finish dialog with process loss qty from job card (backport #58256) (#58262) 
* fix(manufacturing): cap job card completed qty by previous operation and show process loss on finish dialog

* fix: avoid double booking process loss on partial manufacture entries
 2026-08-18 09:47:32 +00:00
mergify[bot]
9b0db26c25 fix(accounts): match returns to source invoice items (backport #58250) (#58264) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-08-18 09:08:31 +00:00
mergify[bot]
a62a949b2a fix(accounts): allocate drop-ship cost by invoice quantity (backport #58226) (#58263) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-08-18 08:41:58 +00:00
rohitwaghchaure
dd4d10862d fix: don't set work order status to In Process only due to skip material transfer (#58245) 2026-08-17 18:28:46 +05:30
Pandiyan P
861fb26b2c fix(manufacturing): fall back to item group defaults for work order w… (#58237) 2026-08-17 15:26:15 +05:30
mergify[bot]
56ac87292f fix: correct Item Group doctype name in item tax template dashboard (backport #58192) (#58213) 
Co-authored-by: Pandiyan P <pandiyanpalani37@gmail.com>
 2026-08-17 10:52:42 +05:30
mergify[bot]
81461ea56c fix(bank_statement_import): add missing permission check on multiple whitelisted methods (backport #58221) (#58224) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-08-16 18:03:24 +00:00
mergify[bot]
2b685ed982 fix(bank_statement_import): add missing permission check on get_import_status (backport #58217) (#58219) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-08-16 15:04:21 +00:00
mergify[bot]
6a0b9e1c70 fix(crm)!: remove unused get_last_interaction endpoint (backport #58214) (#58216) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-08-16 14:16:29 +00:00
MochaMind
28fe021d79 chore: update POT file (#58207) 2026-08-16 18:03:26 +05:30
mergify[bot]
c3cf7f2e91 fix: drop removed Restaurant doctype from sales tax template dashboard (backport #58191) (#58211) 2026-08-16 17:28:32 +05:30
Shllokkk
832a0bd1ed Merge pull request #58208 from Shllokkk/supplier-quotation-comparison-status-filter-v16 
feat: add status filter to Supplier Quotation Comparison report
 2026-08-16 15:52:17 +05:30
Shllokkk
2b84ed78e8 feat: add status filter to Supplier Quotation Comparison report 2026-08-16 15:34:10 +05:30
mergify[bot]
32ebd69abc fix(email_digest): added permission check for get_msg_html (backport #58197) (#58200) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
 2026-08-15 16:40:09 +00:00
mergify[bot]
900064e395 feat: validate purchase receipt exchange rate parity on purchase invoice (backport #58177) (#58190) 
feat: validate purchase receipt exchange rate parity on purchase invoice (#58177)

(cherry picked from commit 70a8a2d0c5)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2026-08-15 15:20:17 +05:30
mergify[bot]
d805f4d3fc feat: Belgian Charts of Accounts (commercial + non-profit, FR + NL) (backport #54679) (#58186) 
Co-authored-by: Antoine Maas <antoine.maas@okte.io>
Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-08-14 16:57:25 +00:00
mergify[bot]
d3a4d476eb fix(stock): honour pick serial / batch based on in the batch selector (backport #58176) (#58182) 
Co-authored-by: Sudharsanan Ashok <135326972+Sudharsanan11@users.noreply.github.com>
 2026-08-14 13:58:07 +00:00
mergify[bot]
4bb7799919 fix: rewriting the description of the overdue billing checkbox (backport #58172) (#58174) 
fix: rewriting the description of the overdue billing checkbox (#58172)

fix: rewritting the description of the overdue billing checkbox
(cherry picked from commit cbf8f61101)

Co-authored-by: Jatin3128 <140256508+Jatin3128@users.noreply.github.com>
 2026-08-14 17:43:14 +05:30
Nishka Gosalia
c15d5d1a0b Merge pull request #58171 from frappe/mergify/bp/version-16-hotfix/pr-58167 
fix: validation for task end date check (backport #58167)
 2026-08-14 16:36:33 +05:30
nishkagosalia
7b0df4b28b fix: validation for task end date check 
(cherry picked from commit 7c6da80f98)
 2026-08-14 10:53:06 +00:00
mergify[bot]
1ea1d5d6a5 fix: renaming the overdue billing checkbox (backport #58165) (#58166) 
fix: renaming the overdue billing checkbox (#58165)

(cherry picked from commit 917badb82b)

Co-authored-by: Jatin3128 <140256508+Jatin3128@users.noreply.github.com>
 2026-08-14 16:05:22 +05:30
Smit Vora
aa03ddc8e6 Merge pull request #58161 from frappe/mergify/bp/version-16-hotfix/pr-56175 
feat: taxable-base resolver hook for custom charge types (backport #56175)
 2026-08-14 15:16:39 +05:30
Mihir Kandoi
0255314ea7 fix: get items from sales order in sales invoice (#58163) 2026-08-14 09:20:10 +00:00
mergify[bot]
f8c3270049 feat(accounts): opt-in 'Consider Accounting Dimension' filter on General Ledger Report (backport #58156) (#58158) 2026-08-14 08:25:09 +00:00
Smit Vora
ea238a90ac feat: taxable-base resolver hook for custom charge types (#56175) 
(cherry picked from commit 986cea2331)
 2026-08-14 08:19:48 +00:00
Khushi Rawat
f03b7ba40b Merge pull request #58155 from frappe/mergify/bp/version-16-hotfix/pr-58092 
fix(accounts): disallow reversing a reverse journal entry (backport #58092)
 2026-08-14 13:20:43 +05:30
pandiyan
8a26834704 fix(accounts): disallow reversing a reverse journal entry 
check read permission on the source entry before the guards run, so the
reversal relationship is not disclosed to a user who cannot read it.

(cherry picked from commit 9dd37d5f32)
 2026-08-14 11:37:06 +05:30
pandiyan
271d22fff1 test(accounts): cover reversal of a reverse journal entry 
also assert that a user without read access on the entry gets a permission error instead of the reversal relationship.

(cherry picked from commit 80422d2108)
 2026-08-14 06:01:39 +00:00
mergify[bot]
c18881b37d fix: ignore historical negative batch stock in outward validation (backport #58148) (#58151) 
fix: ignore historical negative batch stock in outward validation (#58148)

(cherry picked from commit 9239d1c2a3)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2026-08-14 11:18:50 +05:30
Pandiyan P
61b549960e fix(buying): allow purchase returns against a closed purchase order (#58139) 2026-08-14 09:00:55 +05:30
Diptanil Saha
ea52ab36d1 Merge pull request #58143 from frappe/mergify/bp/version-16-hotfix/pr-58141 
fix(crm_settings): create `crm_deal` fields on enabling frappe crm data synchronization (backport #58141)
 2026-08-13 23:20:41 +05:30
diptanilsaha
d66dc143e3 fix: patch to delete the crm_deal custom fields 
(cherry picked from commit 9613d72d81)
 2026-08-13 17:40:12 +00:00
diptanilsaha
795cf8544c fix(crm_settings): create custom fields for Frappe CRM on enabling synchronization 
(cherry picked from commit be2dea0ba2)
 2026-08-13 17:40:12 +00:00
mergify[bot]
4f3ffd3820 fix(stock): confirm before changing item qty from the batch selector (backport #58123) (#58125) 2026-08-13 19:37:31 +05:30
mergify[bot]
f9fd3bc526 chore(deps): update eslint in banking app (backport #58129) (#58137) 
chore(deps): update eslint in banking app (#58129)

(cherry picked from commit 0bbaf4da3e)

Co-authored-by: Nikhil Kothari <nik.kothari22@live.com>
 2026-08-13 13:30:40 +00:00
mergify[bot]
5afaffe7b4 chore: update deps in banking app (backport #57971) (#58130) 
chore: update deps in banking app (#57971)

(cherry picked from commit 5b2952aa23)

Co-authored-by: Nikhil Kothari <nik.kothari22@live.com>
 2026-08-13 12:32:12 +00:00
Khushi Rawat
569ad8e89b Merge pull request #58122 from frappe/mergify/bp/version-16-hotfix/pr-58120 
fix: describe stale exchange rate settings (backport #58120)
 2026-08-13 15:33:29 +05:30
Khushi Rawat
cbe7931b3b fix: conflicts 2026-08-13 15:22:38 +05:30
Lakshit Jain
03124b9560 Merge pull request #58027 from frappe/mergify/bp/version-16-hotfix/pr-57965 
fix: run set_missing_values before creating Purchase Order from MRP report (backport #57965)
 2026-08-13 15:21:11 +05:30
khushi8112
1ec2a2cd5d fix: describe stale exchange rate settings 
(cherry picked from commit 84cdd0daf0)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 2026-08-13 09:41:37 +00:00
Mihir Kandoi
2a9e4304a2 fix(manufacturing): derive material transfers from actual coverage (#58115) 2026-08-13 15:06:14 +05:30
Henil Maru
aecc551b5e fix: Qty and UOM not fetched when adding Item in Material Request (#58118) 2026-08-13 14:46:05 +05:30
ljain112
72114fa738 fix: run set_missing_values before creating Purchase Order from MRP report 
(cherry picked from commit 94d363851f)
 2026-08-13 14:12:53 +05:30
Lakshit Jain
e51df54439 Merge pull request #57120 from frappe/mergify/bp/version-16-hotfix/pr-56912 
refactor: move functionality in postprocess for mapped doc (backport #56912)
 2026-08-13 14:06:27 +05:30
Khushi Rawat
cf6c058f53 Merge pull request #58104 from frappe/mergify/bp/version-16-hotfix/pr-58078 
fix: apply Sales Person user permissions in Accounts Receivable (backport #58078)
 2026-08-13 12:28:49 +05:30
khushi8112
3fd3f9485b fix: resolve backport conflicts 2026-08-13 11:52:26 +05:30
Khushi Rawat
007748346c Merge pull request #58089 from frappe/mergify/bp/version-16-hotfix/pr-57820 
fix(assets): split fifo/lifo rate across grouped stock item rows (backport #57820)
 2026-08-13 11:49:15 +05:30