CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-13 01:34:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,036 Commits 397 Branches 1,698 Tags
4753594a26901a9d852d01d65690a4af514bfa70
Commit Graph

54036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohit Waghchaure
4753594a26 perf: index for warehouse field 
(cherry picked from commit 23c70332df)

# Conflicts:
#	erpnext/stock/doctype/serial_no/serial_no.json
 2025-12-24 09:29:33 +00:00
Khushi Rawat
4e4d2cefda Merge pull request #51282 from khushi8112/validate-finance-books-row-values 
fix: validate finance books row values
 2025-12-24 14:52:15 +05:30
mergify[bot]
a04f560048 fix(accounts-payable-summary): add Show GL Balance check similar to A… (backport #50802) (#50805) 2025-12-24 13:11:28 +05:30
Diptanil Saha
c9d8c5b419 Merge pull request #51307 from frappe/mergify/bp/version-15-hotfix/pr-51304 
fix(repost accounting ledger): prevent preview generation when no vouchers are selected (backport #51304)
 2025-12-24 13:09:32 +05:30
diptanilsaha
93c1a3f8f3 fix(repost accounting ledger): prevent preview generation when no vouchers are selected 
(cherry picked from commit bd9f5fca08)
 2025-12-24 07:24:35 +00:00
Mihir Kandoi
8fa73b370a Merge pull request #51299 from frappe/mergify/bp/version-15-hotfix/pr-51256 
fix(manufacturing): validate delivered qty in production plan (backport #51256)
 2025-12-23 21:47:36 +05:30
Sudharsanan11
2645bf648d test(manufacturing): add test to validate planned qty 
(cherry picked from commit 2073cb0106)
 2025-12-23 16:02:09 +00:00
Sudharsanan11
c01f20da00 fix(manufacturing): validate delivered qty in production plan 
(cherry picked from commit eda8a621c6)
 2025-12-23 16:02:09 +00:00
Mihir Kandoi
d3f434b803 Merge pull request #51177 from aerele/fix/disassemble-serial-and-batch-bundle 2025-12-23 21:07:32 +05:30
Mihir Kandoi
0687b035b5 Merge pull request #51296 from frappe/mergify/bp/version-15-hotfix/pr-51225 2025-12-23 21:02:54 +05:30
Mihir Kandoi
04a98b2b64 Merge pull request #51142 from frappe/mergify/bp/version-15-hotfix/pr-51141 
fix(buying): add disabled filter for supplier (backport #51141)
 2025-12-23 20:50:26 +05:30
Mihir Kandoi
eae1886043 Merge branch 'mergify/bp/version-15-hotfix/pr-51141' of https://github.com/frappe/erpnext into mergify/bp/version-15-hotfix/pr-51141 2025-12-23 20:47:48 +05:30
Mihir Kandoi
5f295c5310 chore: resolve conflicts 2025-12-23 20:47:16 +05:30
SowmyaArunachalam
fe80d1d0e7 feat: add redirect button on report 
(cherry picked from commit c0ac5f94b5)
 2025-12-23 15:16:40 +00:00
Mihir Kandoi
5e7b674ee4 Merge pull request #51250 from frappe/mergify/bp/version-15-hotfix/pr-51215 
fix: de-duplicate rows on disassembly with multiple manufacture entries (backport #51215)
 2025-12-23 20:28:37 +05:30
rohitwaghchaure
4166c7ff47 Merge branch 'version-15' into version-15-hotfix 2025-12-23 18:15:55 +05:30
mergify[bot]
0f2fb54756 Merge pull request #51292 from frappe/mergify/bp/version-15-hotfix/pr-51285 
fix(patch): handle currency exchange settings frankfurter api update for older versions (backport #51285)
 2025-12-23 18:00:19 +05:30
rohitwaghchaure
9409155594 Merge pull request #51289 from frappe/mergify/bp/version-15-hotfix/pr-51276 
fix: use stock adjustment if the account has not set (backport #51276)
 2025-12-23 17:38:02 +05:30
Rohit Waghchaure
8a01a709a7 fix: use stock adjustment if the account has not set 
(cherry picked from commit 9bbcbe0ac3)
 2025-12-23 11:38:10 +00:00
Khushi Rawat
cc1f38010d Merge pull request #51284 from khushi8112/do-not-disable-primary-action-button-bp-51205 
fix: do not hide primary-action for composite asset
 2025-12-23 16:43:51 +05:30
Smit Vora
f0aefa4274 chore: v15 compatible get-all query 2025-12-23 16:22:06 +05:30
khushi8112
cbcfe6ec36 fix: do not hide primary-action for composite asset 2025-12-23 16:02:50 +05:30
khushi8112
6ff002dbe3 refactor: split long function into smaller 2025-12-23 15:44:43 +05:30
khushi8112
2f10b9c510 fix: validate depreciation row values 2025-12-23 15:32:02 +05:30
Khushi Rawat
83b1e037cb Merge pull request #51198 from aerele/repost-asset-sales-voucher 
fix: avoid creating multiple asset depreciations while reposting asset sales invoice
 2025-12-23 14:16:20 +05:30
Frappe PR Bot
5007abf7ae chore(release): Bumped to Version 15.92.5 
## [15.92.5](https://github.com/frappe/erpnext/compare/v15.92.4...v15.92.5) (2025-12-23)

### Bug Fixes

* bumped version ([6df222a](6df222a1ca))
v15.92.5 		2025-12-23 08:16:22 +00:00
rohitwaghchaure
d31dd1a023 Merge pull request #51277 from rohitwaghchaure/fixed-bumped-version-v15 
fix: bumped version
 2025-12-23 13:44:58 +05:30
Rohit Waghchaure
6df222a1ca fix: bumped version 2025-12-23 13:27:08 +05:30
rohitwaghchaure
265da1056d Merge pull request #51272 from rohitwaghchaure/fixed-bumped-version 
chore(release): Bumped to Version 15.92.5
 2025-12-23 12:59:54 +05:30
Rohit Waghchaure
670beae048 chore(release): Bumped to Version 15.92.5 2025-12-23 12:49:12 +05:30
rohitwaghchaure
6b2a077bec Merge pull request #51270 from frappe/mergify/bp/version-15/pr-51260 
Revert "fix: performance of the reposting" (backport #51258) (backport #51260)
 2025-12-23 12:37:30 +05:30
rohitwaghchaure
43831e9785 chore: fix linters issue 
(cherry picked from commit e9c37642c8)
(cherry picked from commit c095938e69)
 2025-12-23 06:49:20 +00:00
rohitwaghchaure
7187992170 chore: fix test case 
(cherry picked from commit d191b80587)
(cherry picked from commit aefde87a0c)
 2025-12-23 06:49:19 +00:00
rohitwaghchaure
f3d0a91fb3 Revert "fix: performance of the reposting" 
(cherry picked from commit 280558efa2)
(cherry picked from commit c89fe9f1ca)
 2025-12-23 06:49:19 +00:00
rohitwaghchaure
f318a3658d Merge pull request #51265 from frappe/mergify/bp/version-15-hotfix/pr-51251 
fix: order by to fetch serial nos
 2025-12-22 18:23:49 +05:30
rohitwaghchaure
8f52f14505 chore: fix conflicts 
Refactor based_on retrieval method and remove unused fields.
 2025-12-22 18:04:47 +05:30
Rohit Waghchaure
425dcee5bf fix: limit condition to fetch serial nos 
(cherry picked from commit da4b78491d)

# Conflicts:
#	erpnext/stock/get_item_details.py
 2025-12-22 12:16:04 +00:00
rohitwaghchaure
06aded08ae Merge pull request #51260 from frappe/mergify/bp/version-15-hotfix/pr-51258 
Revert "fix: performance of the reposting" (backport #51258)
 2025-12-22 17:15:12 +05:30
rohitwaghchaure
c095938e69 chore: fix linters issue 
(cherry picked from commit e9c37642c8)
 2025-12-22 11:12:50 +00:00
rohitwaghchaure
aefde87a0c chore: fix test case 
(cherry picked from commit d191b80587)
 2025-12-22 11:12:50 +00:00
rohitwaghchaure
c89fe9f1ca Revert "fix: performance of the reposting" 
(cherry picked from commit 280558efa2)
 2025-12-22 11:12:50 +00:00
Frappe PR Bot
658a7c536d chore(release): Bumped to Version 15.92.4 
## [15.92.4](https://github.com/frappe/erpnext/compare/v15.92.3...v15.92.4) (2025-12-22)

### Bug Fixes

* added limit ([0e73c12](0e73c12add))
* same serial number was picked in multiple sales invoices ([05ad50f](05ad50f98b))
v15.92.4 		2025-12-22 08:35:29 +00:00
rohitwaghchaure
94c430cc6e Merge pull request #51254 from frappe/mergify/bp/version-15/pr-51247 
fix: same serial number was picked in multiple sales invoices (backport #51244) (backport #51247)
 2025-12-22 14:04:07 +05:30
rohitwaghchaure
0e73c12add fix: added limit 
(cherry picked from commit 73643de612)
 2025-12-22 07:38:26 +00:00
rohitwaghchaure
aba3d7821c chore: fix conflicts 
Removed logic for handling reserved serial numbers in sales invoices.

(cherry picked from commit c77c426652)
 2025-12-22 07:38:25 +00:00
Rohit Waghchaure
05ad50f98b fix: same serial number was picked in multiple sales invoices 
(cherry picked from commit 61c31f0cd0)

# Conflicts:
#	erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
(cherry picked from commit dc5faa8b71)
 2025-12-22 07:38:25 +00:00
rohitwaghchaure
5200739d7b Merge pull request #51247 from frappe/mergify/bp/version-15-hotfix/pr-51244 
fix: same serial number was picked in multiple sales invoices (backport #51244)
 2025-12-22 13:07:47 +05:30
rohitwaghchaure
73643de612 fix: added limit 2025-12-22 12:02:38 +05:30
rohitwaghchaure
fab49e41a6 Merge pull request #51245 from frappe/mergify/bp/version-15-hotfix/pr-51242 
fix(stock-report): ignore reserved stock in batch qty calculation (backport #51242)
 2025-12-22 11:46:51 +05:30
Smit Vora
bb00bb83f8 test: ensure full qty reversal for items outside of BOM on disassemble 
(cherry picked from commit 5b3d2c0d02)
 2025-12-22 06:09:08 +00:00