nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-15 07:28:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,939 Commits 603 Branches 1,799 Tags
d805f4d3fc7ebd0eed762436e2192ae4e416fa29
Commit Graph

58939 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
khushi8112
956be58c9c fix: apply Sales Person user permissions in Accounts Receivable 
The report only narrowed by sales person when the filter was set, so a user
restricted to a Sales Person saw every row once the filter was cleared.

Resolve the permitted Sales Persons from user permissions and apply them on
top of the filter. Each Sales Team parent type is matched against its own
applicable_for scope, so a permission scoped to one doctype cannot authorise
rows through the other. Descendants are already expanded by
get_user_permissions, so Hide Descendants is respected. Gated to Receivable,
since the class is shared with Accounts Payable.

(cherry picked from commit 8b09ba429e)

# Conflicts:
#	erpnext/accounts/report/accounts_receivable/accounts_receivable.py
 2026-08-13 06:16:07 +00:00
mergify[bot]
0fe5436a13 Fix/item description in the item price list (backport #58084) (#58102) 
Co-authored-by: Mohsin Akhtar <167299936+akhtarmohsin@users.noreply.github.com>
 2026-08-13 04:23:10 +00:00
Mihir Kandoi
0b01a93e2e Merge pull request #58090 from frappe/mergify/bp/version-16-hotfix/pr-58073 
fix(manufacturing): show full date range in MRP chart (backport #58073)
 2026-08-12 15:25:53 +05:30
Mihir Kandoi
58a489f73f chore: resolve conflict 2026-08-12 15:14:42 +05:30
Mihir Kandoi
1b37fd2edc fix(manufacturing): keep MRP chart dates distinct 
(cherry picked from commit 5ad085887d)
 2026-08-12 09:24:57 +00:00
Mihir Kandoi
5b68db0156 test(manufacturing): cover MRP chart date range 
(cherry picked from commit 592924cc0d)

# Conflicts:
#	erpnext/manufacturing/report/material_requirements_planning_report/test_material_requirements_planning_report.py
 2026-08-12 09:24:56 +00:00
soulxone
de06cb7f45 fix(Material Requirements Planning Report): detailed-view chart timescale 
The detailed-view chart collapsed every row into a single "today" column
and was additionally capped at 10 points, so the chart never matched the
report's date filters or the table data.

Two causes in get_detailed_view_chart_data:

1. `row.deliver_date` was a typo for `row.delivery_date` (the name used
   everywhere else in this report). On a frappe._dict the missing
   attribute resolves to None, so `getdate(None)` returned today and the
   past-date filter silently compared every row against today instead of
   its own delivery date.

2. A hard `if i == 10: break` truncated the chart to 10 date buckets.

Use the correct field name and drop the cap. The null check now runs
before the date comparison, since `getdate(None)` returning today meant
the original ordering could never filter a null delivery_date out.

Fixes #52632

(cherry picked from commit 3c17a604be)
 2026-08-12 09:24:56 +00:00
ervishnucs
c014e01144 test(assets): cover grouped stock item rows splitting FIFO rate 
(cherry picked from commit 2cbc5b89d6)
 2026-08-12 09:05:15 +00:00
ervishnucs
98bef1cac8 fix(assets): split FIFO/LIFO rate across grouped stock item rows 
(cherry picked from commit a05ec49062)
 2026-08-12 09:05:15 +00:00
MochaMind
f697b024db fix: sync translations from crowdin (#58069) 2026-08-11 23:27:27 +00:00
mergify[bot]
db22fcb157 fix(coa_importer): added server-side validations for importing chart of accounts (backport #58065) (#58066) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-08-11 22:15:08 +00:00
MochaMind
a9d139ae6b fix: sync translations from crowdin (#57841) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2026-08-12 01:17:44 +05:30
mergify[bot]
d680115fcb fix: mirror rounding adjustment on distributed_discount_amount (backport #58047) (#58055) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2026-08-11 18:38:32 +00:00
mergify[bot]
a707c82c0c fix: allow non-admin roles to import chart of accounts (backport #57454) (#58060) 
Co-authored-by: Vishnu Priya Baskaran <145791817+ervishnucs@users.noreply.github.com>
 2026-08-12 00:03:02 +05:30
mergify[bot]
5f43c89c45 fix: item property updates in POS and transactions and add styling (backport #57189) (#58058) 
Co-authored-by: Vishnu Priya Baskaran <145791817+ervishnucs@users.noreply.github.com>
Co-authored-by: Afsal Syed <afsalsyed12@gmail.com>
 2026-08-11 17:32:18 +00:00
Diptanil Saha
b89229a93d fix(selling): read overdue amount from payment ledger, not gl tags (backport #57786) (#58057) 
Co-authored-by: Sudharsanan Ashok <135326972+Sudharsanan11@users.noreply.github.com>
 2026-08-11 16:52:10 +00:00
mergify[bot]
f11d0d5cec fix(consolidated cash flow): correct totals and labels in section foo… (backport #57336) (#58056) 
Co-authored-by: Vishnu Priya Baskaran <145791817+ervishnucs@users.noreply.github.com>
 2026-08-11 16:42:43 +00:00
Mihir Kandoi
0637bdad11 Merge pull request #58053 from frappe/mergify/bp/version-16-hotfix/pr-58051 
fix(selling): reset stale item details on item change (backport #58051)
 2026-08-11 21:48:39 +05:30