MochaMind
66c151cc2c
fix: Indonesian translations
2026-07-15 18:16:50 +05:30
MochaMind
7a77d51a29
fix: Portuguese, Brazilian translations
2026-07-15 18:16:45 +05:30
MochaMind
194604eabc
fix: Vietnamese translations
2026-07-15 18:16:41 +05:30
MochaMind
8970c5d708
fix: Chinese Simplified translations
2026-07-15 18:16:36 +05:30
MochaMind
3f8b9a0a2c
fix: Turkish translations
2026-07-15 18:16:32 +05:30
MochaMind
9f96589c39
fix: Swedish translations
2026-07-15 18:16:26 +05:30
MochaMind
0ea48fe3b0
fix: Serbian (Cyrillic) translations
2026-07-15 18:16:22 +05:30
MochaMind
253e14c748
fix: Slovenian translations
2026-07-15 18:16:17 +05:30
MochaMind
5e950a8b0f
fix: Russian translations
2026-07-15 18:16:11 +05:30
MochaMind
ad61dbee35
fix: Portuguese translations
2026-07-15 18:16:05 +05:30
MochaMind
f4b1210551
fix: Polish translations
2026-07-15 18:16:00 +05:30
MochaMind
21459078df
fix: Dutch translations
2026-07-15 18:15:55 +05:30
MochaMind
f19bbbe3dc
fix: Korean translations
2026-07-15 18:15:50 +05:30
MochaMind
acf4a9690d
fix: Italian translations
2026-07-15 18:15:46 +05:30
MochaMind
4c13d31b8a
fix: Hungarian translations
2026-07-15 18:15:41 +05:30
MochaMind
2ce5105b71
fix: German translations
2026-07-15 18:15:36 +05:30
MochaMind
d9cbd16d4d
fix: Danish translations
2026-07-15 18:15:32 +05:30
MochaMind
5f38291a69
fix: Czech translations
2026-07-15 18:15:27 +05:30
MochaMind
db48b449c6
fix: Bulgarian translations
2026-07-15 18:15:23 +05:30
MochaMind
15c98d3f01
fix: Arabic translations
2026-07-15 18:15:19 +05:30
MochaMind
7a42b70830
fix: Spanish translations
2026-07-15 18:15:14 +05:30
MochaMind
8f623e2695
fix: French translations
2026-07-15 18:15:10 +05:30
mergify[bot]
0817d1064c
fix: permission issue (backport #57112 ) (backport #57142 ) ( #57184 )
...
* fix: permission issue (backport #57112 ) (#57142 )
* fix: permission issue (#57112 )
(cherry picked from commit 1fd2faa68d )
# Conflicts:
# erpnext/controllers/stock_controller.py
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
(cherry picked from commit 6b23b007a4 )
# Conflicts:
# erpnext/controllers/stock_controller.py
* chore: fix conflicts
* chore: fix conflicts
---------
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2026-07-15 15:05:17 +05:30
mergify[bot]
b1adec7e9e
fix(project): improved access control for project users (backport #56675 ) ( #57181 )
...
Co-authored-by: Diptanil Saha <diptanil@frappe.io >
2026-07-15 14:19:07 +05:30
mergify[bot]
caea21208e
Revert "chore: remove unused whitelisted method from project" (backport #56660 ) ( #57178 )
...
Co-authored-by: Diptanil Saha <diptanil@frappe.io >
2026-07-15 07:09:36 +00:00
Mihir Kandoi
2808b34d42
Merge pull request #57170 from mihir-kandoi/backport-57169-version-16-hotfix
...
fix: allow delivery when a batch is reserved across multiple sales orders (backport #57169 )
2026-07-15 12:31:39 +05:30
Mihir Kandoi
7ccb2584c4
test: set delivered batch on the row explicitly on v16
...
The v16 reserved-stock mapper attaches neither a bundle nor row
serial/batch fields when use_serial_batch_fields is enabled, and
update_stock_reservation_entries crashes on the missing bundle (fixed
on develop by 9c5f9218b5 , not backported). Deliver via an explicit row
batch_no like the guard test so the bundle is built from row fields
before the reservation update runs.
2026-07-15 12:19:21 +05:30
Mihir Kandoi
f3e1b3fca7
fix: round outstanding qty guard consistently with the conflict gate
2026-07-15 12:00:02 +05:30
Mihir Kandoi
555c607f2f
fix: exclude fully-delivered reservations from the conflict message
2026-07-15 12:00:02 +05:30
Mihir Kandoi
7cd7e4ab0f
test: deliver reserved batches via bundles on v16
...
use_serial_batch_fields delivery of reserved stock crashes on v16 with
'Serial and Batch Bundle None not found' (fixed on develop only), so
deliver through auto-created bundles like test_auto_reserve_serial_and_batch.
2026-07-15 12:00:02 +05:30
Mihir Kandoi
839fd5e3b6
fix: name every conflicting voucher in the reserved batch error
2026-07-15 12:00:02 +05:30
Mihir Kandoi
56bbca0203
fix: allow delivery when a batch is reserved across multiple sales orders (backport #57169 )
...
validate_reserved_batches compared the voucher's own qty against the
remaining batch qty, so delivering one order's reserved unit threw
Reserved Batch Conflict whenever the remainder exactly matched another
order's reservation. Compare the remaining batch qty against the
aggregated outstanding reserved qty (qty - delivered_qty) of other
vouchers instead, excluding reservations the voucher itself delivers.
2026-07-15 12:00:02 +05:30
Mihir Kandoi
478719b828
Merge pull request #57173 from frappe/mergify/bp/version-16-hotfix/pr-57137
...
feat: add on hold status to project (backport #57137 )
2026-07-15 11:29:14 +05:30
Poovitha Palanivelu
57a49ce168
feat: add on hold status to project
...
(cherry picked from commit 672fadaa78 )
2026-07-15 05:47:16 +00:00
Mihir Kandoi
6d47c51c5b
Merge pull request #57166 from frappe/mergify/bp/version-16-hotfix/pr-57163
...
fix: hide job card field in purchase order item (backport #57163 )
2026-07-15 11:03:06 +05:30
Mihir Kandoi
6ab1668b37
Merge pull request #57168 from frappe/mergify/bp/version-16-hotfix/pr-57164
...
fix: set correct currency in supplier quotation net rate field (backport #57164 )
2026-07-15 10:58:18 +05:30
Mihir Kandoi
b256c76c3b
chore: resolve conflicts
2026-07-15 10:48:51 +05:30
Mihir Kandoi
e24ef847dc
fix: set correct currency in supplier quotation net rate field
...
(cherry picked from commit 27672851cd )
2026-07-15 05:17:11 +00:00
Mihir Kandoi
20f6ac81b9
fix: hide job card field in purchase order item
...
(cherry picked from commit f44bcae47d )
# Conflicts:
# erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
2026-07-15 05:13:39 +00:00
Mihir Kandoi
b1ca9c26cb
Merge pull request #57136 from frappe/mergify/bp/version-16-hotfix/pr-57129
...
fix: prevent duplicate material request items in purchase order (backport #57129 )
2026-07-14 16:43:09 +05:30
Mihir Kandoi
4d931a7108
test: remove test
...
(cherry picked from commit b2ec906ff3 )
2026-07-14 11:01:57 +00:00
SandraFrappe
4d951c1cf8
fix: prevent duplicate material request items in purchase order
...
(cherry picked from commit 2d6f89a7f5 )
2026-07-14 11:01:57 +00:00
Mihir Kandoi
3a38316c26
Merge pull request #57126 from aerele/fix/job-card-work-order-transferred-qty-v16
...
fix(manufacturing): preserve job card transferred quantity
2026-07-14 13:40:29 +05:30
Sudharsanan11
fd6c9a71cd
test(manufacturing): cover transferred quantity across job cards
2026-07-14 13:23:49 +05:30
Sudharsanan11
d7e9321746
fix(manufacturing): preserve job card transferred quantity
2026-07-14 13:23:28 +05:30
mergify[bot]
e8a532587d
fix(accounts): added permission checks on get_account_balances_coa (backport #57107 ) ( #57122 )
...
Co-authored-by: Diptanil Saha <diptanil@frappe.io >
2026-07-14 13:07:12 +05:30
Mihir Kandoi
8d7fe755e3
Merge pull request #57118 from frappe/mergify/bp/version-16-hotfix/pr-57116
...
fix(stock): fix sqlparse token limit in get_bundle_wise_serial_nos (backport #57116 )
2026-07-14 12:33:43 +05:30
Khushi Rawat
2947f030e8
Merge pull request #57119 from frappe/mergify/bp/version-16-hotfix/pr-57111
...
chore: remove dead assets dashboard_fixtures with broken imports (backport #57111 )
2026-07-14 12:14:47 +05:30
Afsal Syed
cec1e87c90
test(stock): add unit test for get_bundle_wise_serial_nos query
...
(cherry picked from commit e748bf512b )
2026-07-14 12:13:42 +05:30
khushi8112
345c508be7
chore: remove dead assets dashboard_fixtures with broken imports ( #57079 )
...
erpnext.accounts.dashboard_fixtures and erpnext.buying.dashboard_fixtures
were removed in 2020 when dashboards were exported to JSON fixtures.
The assets module's dashboard_fixtures.py was left behind unreferenced;
its dashboard, charts and number cards already exist as exported JSON.
(cherry picked from commit 14a15cc6f9 )
2026-07-14 06:23:40 +00:00