nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-28 06:08:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,031 Commits 623 Branches 1,804 Tags
ee3b22403dd2e1d7ad6f3a78d2e111920ad73f95
Commit Graph

59031 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
ee3b22403d fix(manufacturing): classify MRP items without a BOM as Purchase (backport #58509) (#58513) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2026-08-27 17:37:09 +00:00
mergify[bot]
f0d2d40d35 fix: translate doctype in map msg (backport #58515) (#58517) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2026-08-27 19:25:51 +02:00
Sudharsanan Ashok
60252cacdd Merge pull request #58521 from frappe/revert-58489-mergify/bp/version-16-hotfix/pr-58486 
Revert "refactor(stock): use db.count for the empty ledger check (backport #58486)"
 2026-08-27 22:46:17 +05:30
Sudharsanan Ashok
8287906a71 Revert "refactor(stock): use db.count for the empty ledger check (backport #58486)" 2026-08-27 22:34:55 +05:30
mergify[bot]
d732d06e25 fix(projects): ignore cancelled invoices in timesheet portal (backport #58501) (#58504) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-08-27 13:04:09 +00:00
Shllokkk
4538689e5f Merge pull request #58502 from Shllokkk/work-order-transferred-qty-sum-alternate-items-v16 
fix: sum item and its alternate transferred qty on work order
 2026-08-27 18:27:56 +05:30
Shllokkk
7464f6c76e test: transferred qty sums item and its alternate 2026-08-27 18:07:57 +05:30
Shllokkk
1411835507 fix: sum item and its alternate transferred qty on work order required items 2026-08-27 18:07:57 +05:30
Mihir Kandoi
76d0cb382d fix(manufacturing): preserve job card qty in mr transfer (backport #58482) (#58499) 2026-08-27 12:19:33 +00:00
Sudharsanan Ashok
eedf991b43 Merge pull request #58489 from frappe/mergify/bp/version-16-hotfix/pr-58486 
refactor(stock): use db.count for the empty ledger check (backport #58486)
 2026-08-27 16:50:09 +05:30
Sudharsanan Ashok
38aaceafc6 refactor(stock): use db.count for the empty ledger check (#58486) 
Align the existence check in `reset_bin_without_stock_ledger_entries()` with
the version-15-hotfix backport in #58434, per review feedback there.

(cherry picked from commit 2866be2816)
 2026-08-27 11:07:21 +00:00
Sudharsanan Ashok
f7f34ffd3b Merge pull request #58467 from frappe/mergify/bp/version-16-hotfix/pr-58466 
fix(manufacturing): account for pending job card qty (backport #58466)
 2026-08-27 16:13:54 +05:30
Sudharsanan Ashok
f19450858c Merge pull request #58475 from frappe/mergify/bp/version-16-hotfix/pr-58469 
fix: clarify duplicate internal party messages (backport #58469)
 2026-08-27 16:13:28 +05:30
Sudharsanan Ashok
8dc3bc3485 Merge pull request #58429 from frappe/mergify/bp/version-16-hotfix/pr-58402 
feat(analytics): filter sales and purchase analytics by entity  (backport #58402)
 2026-08-27 16:12:20 +05:30
pandiyan
7b9cdb4926 fix(manufacturing): account for pending job card qty (#58466) 
(cherry picked from commit 0d90608bc1)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.py
#	erpnext/manufacturing/doctype/job_card/test_job_card.py
 2026-08-27 14:03:00 +05:30
pandiyan
f0e603aec5 fix: clarify duplicate internal party messages (#58469) 
(cherry picked from commit 4d4cf034b5)

# Conflicts:
#	erpnext/selling/doctype/customer/customer.py
 2026-08-27 13:57:12 +05:30
Shllokkk
bfb27039ed Merge pull request #58470 from Shllokkk/material-request-validate-with-so-v16 
fix: validate items against source Sales Order in Material Request
 2026-08-27 13:06:38 +05:30
Shllokkk
07f8250e40 test: block item change on Sales Order-sourced Material Request row 2026-08-27 12:48:45 +05:30
Shllokkk
65466464df fix: validate items against source Sales Order in Material Request 2026-08-27 12:48:45 +05:30
Diptanil Saha
60599ec692 ci: crowdin actions to upload main.pot file (#58461) 2026-08-26 18:31:04 +00:00
Aarol D'Souza
6093316ba3 Merge pull request #58427 from frappe/mergify/bp/version-16-hotfix/pr-58351 
fix(company): throw if linked to demo_company field (backport #58351)
 2026-08-26 23:14:32 +05:30
mergify[bot]
cabecd2527 ci: ignore python tests on update of **.po (backport #58457) (#58459) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-08-26 20:43:42 +05:30
MochaMind
c924de3c55 fix: sync translations from crowdin (version-16-hotfix) (#58455) 
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
 2026-08-26 18:31:46 +05:30
Sudharsanan Ashok
655ed81575 feat(analytics): filter sales and purchase analytics by entity (#58402) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
(cherry picked from commit 3f29cdf8d2)

# Conflicts:
#	erpnext/buying/report/purchase_analytics/test_purchase_analytics.py
#	erpnext/selling/report/sales_analytics/test_sales_analytics.py
 2026-08-26 07:33:42 +00:00
AarDG10
9f3dd7eabd fix(company): throw if linked to demo_company field 
Throws an error msg if user is deleting demo company directly.

(cherry picked from commit aaa3100efc)
 2026-08-26 07:24:12 +00:00
Sudharsanan Ashok
2cd865fffc Merge pull request #58405 from aerele/fix/pick-list-transfer-qty-lost-v16 
fix(stock): keep pick list links when refetching stock entry items (backport #58374)
 2026-08-26 12:45:46 +05:30
Sudharsanan Ashok
e32a8f008e Merge pull request #58422 from frappe/mergify/bp/version-16-hotfix/pr-58168 
fix: correct is_frozen description on customer and supplier (backport #58168)
 2026-08-26 12:39:35 +05:30
Pandiyan P
9e00888d67 fix: correct is_frozen description on customer and supplier (#58168) 
(cherry picked from commit cc60c80e68)

# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/selling/doctype/customer/customer.json
 2026-08-26 12:08:14 +05:30
Sudharsanan Ashok
5b92dff1df Merge pull request #58419 from frappe/mergify/bp/version-16-hotfix/pr-58394 
fix(stock): validate serial inventory dimensions (backport #58394)
 2026-08-26 11:51:09 +05:30
Pandiyan P
a1aabaff18 fix(stock): validate serial inventory dimensions (#58394) 
* fix(stock): validate serial inventory dimensions

* test(stock): cover serial inventory dimensions

(cherry picked from commit c940bd1e66)

# Conflicts:
#	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
 2026-08-26 11:37:57 +05:30
Khushi Rawat
1a3e02ee5b Merge pull request #58414 from frappe/mergify/bp/version-16-hotfix/pr-58412 
fix(accounts): prevent child table doctypes as accounting dimensions (backport #58412)
 2026-08-26 11:35:41 +05:30
khushi8112
abf311e8ca fix(accounts): guard get_gl_dict for v16 and drop unused base_gl_composer 2026-08-26 11:05:19 +05:30
khushi8112
fe98974cb6 test(accounts): cover single doctype and non-scalar dimension safeguards 
(cherry picked from commit 55dd11f977)
 2026-08-25 19:18:25 +00:00
khushi8112
6dbaa5048e fix(accounts): prevent child table doctypes as accounting dimensions 
(cherry picked from commit 7b32d07d1c)

# Conflicts:
#	erpnext/accounts/services/base_gl_composer.py
 2026-08-25 19:18:24 +00:00
Shllokkk
7238ecb306 Merge pull request #58407 from frappe/mergify/bp/version-16-hotfix/pr-58400 
fix: send auto reorder email to all managers in single company setup (backport #58400)
 2026-08-25 18:30:12 +05:30
Shllokkk
97b2e07d5e test: auto reorder email reaches managers without company user permission 
(cherry picked from commit a01cc92184)
 2026-08-25 12:08:44 +00:00
Shllokkk
ac1c6921da fix: send auto reorder email to all managers in single company setup 
(cherry picked from commit ae119b1c29)
 2026-08-25 12:08:43 +00:00
Sudharsanan11
01e0844d40 fix(stock): keep pick list links when refetching stock entry items 2026-08-25 17:05:23 +05:30
Sudharsanan Ashok
c9550023f8 Merge pull request #58399 from frappe/mergify/bp/version-16-hotfix/pr-58395 
fix: respect zero currency precision (backport #58395)
 2026-08-25 16:45:34 +05:30
Pandiyan P
6b61146d2f fix: respect zero currency precision (#58395) 
(cherry picked from commit ce23fcc055)
 2026-08-25 10:06:39 +00:00
Sudharsanan Ashok
9209912374 Merge pull request #58353 from frappe/mergify/bp/version-16-hotfix/pr-58179 
fix(accounts): supplier group filter not applied on accounts payable … (backport #58179)
 2026-08-25 13:04:52 +05:30
Sudharsanan Ashok
f1181fa1e3 Merge pull request #58391 from frappe/mergify/bp/version-16-hotfix/pr-58362 
fix(stock): reset bin when no stock ledger entries remain (backport #58362)
 2026-08-25 12:46:31 +05:30
Sudharsanan Ashok
37a1fd11e9 fix(stock): reset bin when no stock ledger entries remain (#58362) 
* fix(stock): reset bin when no stock ledger entries remain

update_bin() only writes bins reachable through prev_sle_dict, and that
dict is empty once the last live sle for an item and warehouse is
cancelled or deleted. actual_qty is still recomputed, but stock_value
and valuation_rate stay stale and a repost cannot heal them, so bin
totals drift permanently from the stock balance.

zero those bins after the normal update, guarded by a re-check that no
live sle exists. also drop the prev_sle_dict seeding added earlier in
initialize_previous_data, which never took effect because
initialize_reposting() discards the dict before update_bin() reads it.

* test(stock): cover bin reset when ledger is empty

three cases that all leave an item and warehouse with no live sle:
cancelling the only voucher, deleting it with delete_linked_ledger_entries
on, and reposting over an already emptied ledger. each asserts actual_qty,
valuation_rate and stock_value are all zero.

(cherry picked from commit 6fbcfade6c)
 2026-08-25 06:10:18 +00:00
Sudharsanan Ashok
f71bc4d3ef Merge pull request #58384 from aerele/backport-58377-version-16-hotfix 
fix: prevent duplicate supplier quotations from portal (backport #58377)
 2026-08-25 11:12:10 +05:30
pandiyan
efe5571ca7 test: verify duplicate supplier quotations are rejected 2026-08-24 23:57:59 +05:30
pandiyan
39e15c7b2d fix: prevent duplicate supplier quotations from portal 2026-08-24 23:57:59 +05:30
mergify[bot]
2329ef6424 fix: hide supplier name in rfq portal (backport #58373) (#58376) 
Co-authored-by: Pandiyan P <pandiyanpalani37@gmail.com>
 2026-08-24 12:11:31 +00:00
mergify[bot]
83cc51a5d2 Fix/return qty validation different uom (backport #58298) (#58364) 
Co-authored-by: Vishnu Priya Baskaran <145791817+ervishnucs@users.noreply.github.com>
Co-authored-by: Afsal Syed <afsalsyed12@gmail.com>
 2026-08-24 17:39:41 +05:30
mergify[bot]
feb51a475a fix(italy): handle none price_list_rate in e-invoice xml generation (backport #58242) (#58370) 
Co-authored-by: Vishnu Priya Baskaran <145791817+ervishnucs@users.noreply.github.com>
 2026-08-24 17:39:16 +05:30
mergify[bot]
5933476778 fix: filter available batch report by company (backport #57995) (#58077) 
Co-authored-by: Krishna Shirsath <shirsathkrishna19@gmail.com>
 2026-08-24 11:19:45 +00:00