CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-13 09:43:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,136 Commits 396 Branches 1,698 Tags
fe031eb89797b520cd9863d6acd251e161f63ebf
Commit Graph

54136 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Navin-S-R
fe031eb897 test: validate asset split for auto created asset from purchase voucher 
(cherry picked from commit 4adeaedfde)
 2026-01-13 07:10:58 +00:00
Navin-S-R
ddd367c6de fix(asset): handle same asset being sold in multiple line items in sales invoice 
(cherry picked from commit 23b094f151)
 2026-01-13 07:10:58 +00:00
Navin-S-R
8ba42b2efb fix(asset): skip purchase document validation while splitting existing asset 
(cherry picked from commit e7e6567792)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.py
 2026-01-13 07:10:57 +00:00
Navin-S-R
e6495d0bf1 test: validate asset partial sales 
(cherry picked from commit 9eeccb765d)
 2026-01-13 07:10:57 +00:00
Navin-S-R
1257c6fe03 fix: refactor older testcases 
(cherry picked from commit a88fe2ecab)
 2026-01-13 07:10:57 +00:00
Navin-S-R
b024259836 fix(asset): handle partial asset sales by splitting remaining quantity 
(cherry picked from commit 9a2710b9d7)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.py
 2026-01-13 07:10:57 +00:00
Mihir Kandoi
f5cae2d60b Merge pull request #51657 from mihir-kandoi/v16 2026-01-13 10:55:15 +05:30
Mihir Kandoi
4e94e3726c chore: grammar fix 2026-01-13 10:50:15 +05:30
Mihir Kandoi
d7bf1a179a chore: update links 2026-01-13 10:43:34 +05:30
ruthra kumar
6632f3d446 Merge pull request #51332 from frappe/mergify/bp/version-15-hotfix/pr-50413 
fix: don't duplicate default income account to Item (backport #50413)
 2026-01-12 20:33:41 +05:30
Khushi Rawat
b909ec9388 Merge pull request #51686 from frappe/mergify/bp/version-15-hotfix/pr-51678 
fix(asset): properly reset purchase reference and item fields (backport #51678)
 2026-01-12 15:54:38 +05:30
khushi8112
ea0b76831f fix(asset): properly reset purchase reference and item fields 
(cherry picked from commit 671610db1e)
 2026-01-12 10:17:24 +00:00
Khushi Rawat
57c759dfcd Merge pull request #51677 from frappe/mergify/bp/version-15-hotfix/pr-51630 
fix(asset): remove references  for composite and existing assets (backport #51630)
 2026-01-12 13:03:47 +05:30
nivithamerlin
c7f79d16e9 fix(asset): remove references for composite and existing asset 
(cherry picked from commit c1d50c492b)
 2026-01-12 07:30:51 +00:00
ruthra kumar
940cfb58a7 Merge pull request #51665 from frappe/mergify/bp/version-15-hotfix/pr-51311 
fix(payment reconciliation): handle adhoc payment returns (backport #51311)
 2026-01-11 19:37:47 +05:30
NaviN
159d1d61b5 fix(payment reconciliation): handle adhoc payment returns (#51311) 
* fix(payment reconciliation): handle reverse payments

* test: validate payment return gain or loss

* chore: typo

(cherry picked from commit cecd07bbf4)
 2026-01-11 13:28:36 +00:00
Mihir Kandoi
d8232c4503 chore: v16 release announcement for v15 users 2026-01-10 22:22:10 +05:30
Mihir Kandoi
ae72b99846 Merge pull request #51654 from frappe/mergify/bp/version-15-hotfix/pr-51652 2026-01-10 18:27:48 +05:30
Mihir Kandoi
f9be364bd1 fix: pick list qty does not reset when pick list is cancelled 
(cherry picked from commit 1d6d9c2040)
 2026-01-10 12:44:16 +00:00
rohitwaghchaure
7ac55379ec Merge pull request #51632 from frappe/mergify/bp/version-15-hotfix/pr-51351 
perf: SABB taking time to save the record (backport #51351)
 2026-01-09 18:50:35 +05:30
Rohit Waghchaure
aa43715de6 chore: fix conflicts 2026-01-09 18:16:38 +05:30
Rohit Waghchaure
01af6c8762 fix: incoming rate calculation 
(cherry picked from commit 8e143d68b4)
 2026-01-09 12:17:32 +00:00
Rohit Waghchaure
ee9debe581 perf: SABB taking time to save the record 
(cherry picked from commit 20320c4a6c)

# Conflicts:
#	erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
#	erpnext/stock/serial_batch_bundle.py
 2026-01-09 12:17:32 +00:00
mergify[bot]
d83365734e Merge pull request #51624 from frappe/mergify/bp/version-15-hotfix/pr-50869 
fix: do cancellation procedures on WO close (backport #50869)
 2026-01-09 09:48:28 +00:00
ruthra kumar
1fb554c312 Merge pull request #51598 from frappe/mergify/bp/version-15-hotfix/pr-51534 
fix(accounts): correct sales order item deletion message for MR and PO linkage (backport #51534)
 2026-01-08 17:57:30 +05:30
Pandiyan5273
4c53af0494 fix(accounts): correct sales order item deletion message for MR and PO linkage 
(cherry picked from commit 5a47503611)
 2026-01-08 12:10:25 +00:00
rohitwaghchaure
e9c14e88df Merge pull request #51597 from frappe/mergify/bp/version-15-hotfix/pr-51574 
fix(stock): enable allow on submit for tracking status field (backport #51574)
 2026-01-08 16:50:29 +05:30
rohitwaghchaure
e6dbd06435 Merge pull request #51533 from nishkagosalia/gh-51381 
fix: correct uom reflecting in sales order when fetching from..
 2026-01-08 16:31:37 +05:30
Pandiyan5273
9d5a493609 fix(stock): enable allow on submit for tracking status field 
(cherry picked from commit 1bfb62465f)
 2026-01-08 11:01:03 +00:00
rohitwaghchaure
530c0b0bd6 Merge pull request #51588 from frappe/mergify/bp/version-15-hotfix/pr-51586 
fix: negative stock issue for higher precision (backport #51586)
 2026-01-08 15:03:48 +05:30
rohitwaghchaure
5193dbba9b chore: fix conflicts 
Refactor test cases for delivery notes to handle negative stock and higher precision.
 2026-01-08 14:45:39 +05:30
Mihir Kandoi
42658f7b1c Merge pull request #51587 from frappe/mergify/bp/version-15-hotfix/pr-51585 
fix: closed WO becomes open when RM is returned (backport #51585)
 2026-01-08 14:38:34 +05:30
Rohit Waghchaure
1bbeecff12 fix: negative stock issue for higher precision 
(cherry picked from commit 87be020c78)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py
 2026-01-08 09:07:10 +00:00
Mihir Kandoi
7db6ae8bda fix: closed WO becomes open when RM is returned 
(cherry picked from commit d0ba365aaa)
 2026-01-08 08:53:28 +00:00
Mihir Kandoi
2bdd14c831 Merge pull request #51584 from frappe/mergify/bp/version-15-hotfix/pr-51583 
fix: allow all users of supplier to create purchase invoices (backport #51583)
 2026-01-08 13:47:24 +05:30
Mihir Kandoi
8f1509dca1 fix: allow all users of supplier to create purchase invoices 
(cherry picked from commit 190204a939)
 2026-01-08 08:02:13 +00:00
ruthra kumar
a7f59fece3 Merge pull request #51580 from frappe/mergify/bp/version-15-hotfix/pr-51167 
fix(accounting-dimension): System-generated round-off GL entries fail to set the accounting dimension (backport #51167)
 2026-01-08 12:21:21 +05:30
Logesh Periyasamy
1179514118 fix(accounting-dimension): System-generated round-off GL entries fail to set the accounting dimension (#51167) 
* chore: remove disabled condition statement

* fix: add default dimension for round off gle

* fix: validate report type to handle opening entries roundoff

(cherry picked from commit bc63c85daf)
 2026-01-08 06:36:27 +00:00
rohitwaghchaure
7aee6bdaf8 Merge pull request #51553 from aerele/support-52652 
fix: remove posting date & time on SRE batch validation
 2026-01-07 11:41:32 +05:30
ruthra kumar
f11fb0e45f Merge pull request #51549 from frappe/mergify/bp/version-15-hotfix/pr-51528 
fix: change float types in payment entry reference table to currency (backport #51528)
 2026-01-07 11:39:37 +05:30
trustedcomputer
d17debabf7 fix: change float types in payment entry reference table to currency 
(cherry picked from commit 8ba71300db)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
 2026-01-07 11:24:25 +05:30
rohitwaghchaure
fac865a1b4 Merge branch 'version-15' into version-15-hotfix 2026-01-07 09:58:13 +05:30
kavin-114
d3f2da0d59 fix: remove posting date & time on SRE batch validation 2026-01-07 01:00:29 +05:30
ruthra kumar
f8fb58feaf Merge pull request #51493 from frappe/mergify/bp/version-15-hotfix/pr-51326 
fix(journal entry): use submission_queue to perform submit and cancel actions for rows over 100 (backport #51326)
 2026-01-06 20:57:12 +05:30
ruthra kumar
9bba78f7a2 Merge pull request #51545 from frappe/mergify/bp/version-15-hotfix/pr-51424 
fix(trial balance party): add check for parties with zero credit and debit (backport #51424)
 2026-01-06 18:03:13 +05:30
Jatin3128
a0566c9e98 fix(trial balance party): add check for parties with zero credit and debit 
(cherry picked from commit 83ddaf1696)
 2026-01-06 12:18:06 +00:00
Khushi Rawat
64a7e3f683 Merge pull request #51541 from frappe/mergify/bp/version-15-hotfix/pr-51540 
feat: allow data import for asset repair doctype (backport #51540)
 2026-01-06 17:01:12 +05:30
Khushi Rawat
dbd2964139 fix: resolve conflict 2026-01-06 16:46:20 +05:30
khushi8112
dc10ef4287 feat: allow data import for asset repair doctype 
(cherry picked from commit 49f1688a51)

# Conflicts:
#	erpnext/assets/doctype/asset_repair/asset_repair.json
 2026-01-06 10:39:53 +00:00
Nishka Gosalia
3cc41cf643 fix: correct uom reflecting in sales order when fetching from barcode 2026-01-06 12:51:47 +05:30