nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-06 23:10:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,201 Commits 458 Branches 1,746 Tags
eff9595e342facbbca804f8b4da56d28628b3b07
Commit Graph

54201 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mihir Kandoi
fdf80a6d02 Merge pull request #51319 from nishkagosalia/gh-50389-v15 2025-12-30 10:19:39 +05:30
rohitwaghchaure
b9c123bd89 Merge pull request #51350 from frappe/mergify/bp/version-15-hotfix/pr-50363 
fix: prevent reuse of serial no in manufacture and repack entry (backport #50363)
 2025-12-28 10:45:51 +05:30
Rohit Waghchaure
24f6f1e434 fix: prevent reuse of serial no in manufacture and repack entry 
(cherry picked from commit 48b537dc8c)
 2025-12-28 04:57:30 +00:00
Mihir Kandoi
f263a7f65c Merge pull request #51344 from frappe/mergify/bp/version-15-hotfix/pr-51330 
fix(stock): remove total bar in chart view (backport #51330)
 2025-12-26 22:04:12 +05:30
Sudharsanan11
d9888d5195 fix(stock): remove total bar in chart view 
(cherry picked from commit 7df349844a)
 2025-12-26 16:19:50 +00:00
rohitwaghchaure
52b3740eb1 Merge pull request #51329 from frappe/mergify/bp/version-15-hotfix/pr-51322 
perf: composite index for serial no (backport #51322)
 2025-12-25 15:43:25 +05:30
Raffael Meyer
1cb22f9d05 fix: don't duplicate default income account to Item (#50413) 
* fix: don't duplicate default income account to Item

Only store _Default Income Account_ in **Item** if it's different from the **Company**'s  _Default Income Account_.

Resolves #48231

* refactor: move db call out of loop

* docs: add docstring

(cherry picked from commit b6cb9d4799)
 2025-12-25 09:23:14 +00:00
Rohit Waghchaure
507a561922 perf: composite index for serial no 
(cherry picked from commit 734d553338)
 2025-12-25 03:40:05 +00:00
Mihir Kandoi
88e305f5a2 Merge pull request #51323 from frappe/mergify/bp/version-15-hotfix/pr-50826 2025-12-24 21:51:11 +05:30
Nishka Gosalia
9d2e0f67d5 fix: updating base amounts through python for timesheet for v15 2025-12-24 21:44:58 +05:30
Abdeali Chharchhoda
fd718833b1 refactor: optimize picked quantity updates using bulk_update 
(cherry picked from commit 5f986e4032)
 2025-12-24 16:06:19 +00:00
rohitwaghchaure
c7c938c259 Merge pull request #51313 from frappe/mergify/bp/version-15-hotfix/pr-51310 
perf: index for warehouse field (backport #51310)
 2025-12-24 15:30:23 +05:30
rohitwaghchaure
35ae839ab7 chore: fix conflicts 2025-12-24 15:06:48 +05:30
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
Frappe PR Bot
926b4c7065 chore(release): Bumped to Version 15.93.0 
# [15.93.0](https://github.com/frappe/erpnext/compare/v15.92.5...v15.93.0) (2025-12-23)

### Bug Fixes

* added limit ([73643de](73643de612))
* **buying:** add disabled filter for supplier ([0b6b73b](0b6b73b500))
* cascade projected quantity across multiple items in material requests ([dffd5d9](dffd5d9cdd))
* de-duplicate rows on disassembly with multiple manufacture entries ([68eeba4](68eeba41c1))
* do not hide primary-action for composite asset ([cbcfe6e](cbcfe6ec36))
* don't fetch qty as it's unused ([dd19b95](dd19b95113))
* incorrect current qty in stock reco (backport [#51152](https://github.com/frappe/erpnext/issues/51152)) ([#51158](https://github.com/frappe/erpnext/issues/51158)) ([89d6a8f](89d6a8f02e))
* limit condition to fetch serial nos ([425dcee](425dcee5bf))
* **manufacturing:** validate delivered qty in production plan ([c01f20d](c01f20da00))
* **payment entry:** set row id for 'On Previous Row Amount' or 'On Previous Row Total' charge type on tax table ([d7c50cf](d7c50cfa7c))
* **pegged currencies:** skip adding currencies_to_add items on  pegged_currency_item if source_currency or pegged_against currency doc does not exist (backport [#51188](https://github.com/frappe/erpnext/issues/51188)) ([#51203](https://github.com/frappe/erpnext/issues/51203)) ([8ef09c0](8ef09c0dc0))
* same serial number was picked in multiple sales invoices ([dc5faa8](dc5faa8b71))
* show company currency in asset depreciation schedule ([5b1795b](5b1795b0a5))
* **stock-report:** ignore reserved stock in batch qty calculation ([26a36d8](26a36d807e))
* **stock:** handle serial and batch nos for disassemble stock entry ([59aef4f](59aef4fc8c))
* **stock:** ignore reserved stock while calculating batch qty ([ac2402d](ac2402dd2a))
* support disassemble of RMs other than in BOM ([72d77a5](72d77a5e99))
* update batch_qty using get_batch_qty ([ca835c8](ca835c831b))
* use get_batch_qty to fetch batch data ([10b0da8](10b0da8bc8))
* use original logic for v15 - inverted wrt v16 ([0452b22](0452b22aa6))
* use serial and batch bundle to fetch incoming rate (backport [#51119](https://github.com/frappe/erpnext/issues/51119)) ([#51146](https://github.com/frappe/erpnext/issues/51146)) ([2d42904](2d42904bfb))
* use stock adjustment if the account has not set ([8a01a70](8a01a709a7))

### Features

* add redirect button on report ([fe80d1d](fe80d1d0e7))
* **report:** add batch qty update functionality in report ([57c356a](57c356a1cd))

### Performance Improvements

* optimize company monthly sales query using date range ([#48942](https://github.com/frappe/erpnext/issues/48942)) ([0488658](048865811c))
v15.93.0 		2025-12-23 16:42:06 +00:00
Mihir Kandoi
f29ad04eab Merge pull request #51280 from frappe/version-15-hotfix 2025-12-23 22:10:38 +05:30
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