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
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 ([0e73c120e73c12add05ad50f05ad50f98b
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 61c31f0cd0dc5faa8b71
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
Smit Vora
72d77a5e99
fix: support disassemble of RMs other than in BOM
...
(cherry picked from commit ce123f1a89
2025-12-22 06:09:07 +00:00
Smit Vora
16112630ea
test: ensure no regression after save and submit on disassemble
...
(cherry picked from commit 18ac589796
2025-12-22 06:09:07 +00:00
Smit Vora
dd19b95113
fix: don't fetch qty as it's unused
...
(cherry picked from commit df13308663
2025-12-22 06:09:07 +00:00
Smit Vora
68eeba41c1
fix: de-duplicate rows on disassembly with multiple manufacture entries
...
(cherry picked from commit a091e47bd7
2025-12-22 06:09:06 +00:00
rohitwaghchaure
c77c426652
chore: fix conflicts
...
Removed logic for handling reserved serial numbers in sales invoices.
2025-12-22 11:37:19 +05:30
Rohit Waghchaure
dc5faa8b71
fix: same serial number was picked in multiple sales invoices
...
(cherry picked from commit 61c31f0cd0
2025-12-22 04:09:59 +00:00
Pugazhendhi Velu
26a36d807e
fix(stock-report): ignore reserved stock in batch qty calculation
...
(cherry picked from commit 9a1f551e53
2025-12-21 16:57:51 +00:00
rohitwaghchaure
432b33ac5f
Merge pull request #51223 from frappe/mergify/bp/version-15-hotfix/pr-49951
...
feat(report): add batch qty update functionality in report (backport #49951 )
2025-12-21 22:26:22 +05:30
Pugazhendhi Velu
ca835c831b
fix: update batch_qty using get_batch_qty
...
(cherry picked from commit 15d9d8b719
2025-12-19 14:56:18 +00:00
Pugazhendhi Velu
10b0da8bc8
fix: use get_batch_qty to fetch batch data
...
(cherry picked from commit cf03d03033
2025-12-19 14:56:18 +00:00
Pugazhendhi Velu
e7fcacbe69
refactor: fetch batch qty difference in a single db query
...
(cherry picked from commit 9cc77934a6
2025-12-19 14:56:18 +00:00
Pugazhendhi Velu
57c356a1cd
feat(report): add batch qty update functionality in report
...
(cherry picked from commit f40c492a05
2025-12-19 14:56:18 +00:00
Frappe PR Bot
6e7de0ac47
chore(release): Bumped to Version 15.92.3
...
## [15.92.3](https://github.com/frappe/erpnext/compare/v15.92.2...v15.92.3 ) (2025-12-19)
### Bug Fixes
* **stock:** ignore reserved stock while calculating batch qty ([35478bb35478bbf91
2025-12-19 13:25:33 +00:00
rohitwaghchaure
2277b1aff5
Merge pull request #51221 from frappe/mergify/bp/version-15/pr-51220
...
fix(stock): ignore reserved stock while calculating batch qty (backport #51214 ) (backport #51220 )
2025-12-19 18:54:08 +05:30
rohitwaghchaure
58c793f14e
chore: fix conflicts
...
Removed logic for handling reserved stock when calculating batch quantity.
(cherry picked from commit 9ade0725e8
2025-12-19 12:55:11 +00:00
Sudharsanan11
08cd08adcd
test(stock): add test for ignore reserve stock
...
(cherry picked from commit 4d8ec5f54cb20405dbf2
2025-12-19 12:55:11 +00:00
Sudharsanan11
35478bbf91
fix(stock): ignore reserved stock while calculating batch qty
...
(cherry picked from commit b23c6e2687ac2402dd2a
2025-12-19 12:55:11 +00:00
rohitwaghchaure
40481508f1
Merge pull request #51220 from frappe/mergify/bp/version-15-hotfix/pr-51214
...
fix(stock): ignore reserved stock while calculating batch qty (backport #51214 )
2025-12-19 18:24:37 +05:30
rohitwaghchaure
9ade0725e8
chore: fix conflicts
...
Removed logic for handling reserved stock when calculating batch quantity.
2025-12-19 18:07:42 +05:30
Sudharsanan11
b20405dbf2
test(stock): add test for ignore reserve stock
...
(cherry picked from commit 4d8ec5f54c
2025-12-19 12:31:09 +00:00
Sudharsanan11
ac2402dd2a
fix(stock): ignore reserved stock while calculating batch qty
...
(cherry picked from commit b23c6e2687
2025-12-19 12:31:09 +00:00
Smit Vora
c827fc3259
Merge pull request #51103 from frappe/mergify/bp/version-15-hotfix/pr-50788
...
fix: cascade projected quantity across multiple items in material requests (backport #50788 )
2025-12-19 14:07:50 +05:30
Smit Vora
f13db03c9b
test: make corrections to tests based on v15 functionality
2025-12-19 10:33:44 +05:30
Frappe PR Bot
54ed428225
chore(release): Bumped to Version 15.92.2
...
## [15.92.2](https://github.com/frappe/erpnext/compare/v15.92.1...v15.92.2 ) (2025-12-18)
### Bug Fixes
* **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 )) ([195f902195f90232d
2025-12-18 12:38:51 +00:00
Diptanil Saha
c046dad2c3
Merge pull request #51206 from frappe/mergify/bp/version-15/pr-51203
...
fix(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 )
2025-12-18 18:07:29 +05:30
mergify[bot]
195f90232d
fix(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 ) ( #51203 )
...
Co-authored-by: Diptanil Saha <diptanil@frappe.io >
fix(pegged currencies): skip adding currencies_to_add items on pegged_currency_item if source_currency or pegged_against currency doc does not exist (#51188 )
(cherry picked from commit 8ef09c0dc0
2025-12-18 12:18:08 +00:00
mergify[bot]
8ef09c0dc0
fix(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 ) ( #51203 )
...
Co-authored-by: Diptanil Saha <diptanil@frappe.io >
fix(pegged currencies): skip adding currencies_to_add items on pegged_currency_item if source_currency or pegged_against currency doc does not exist (#51188 )
2025-12-18 17:05:39 +05:30
Mihir Kandoi
7f91f95f95
chore: resolve conflicts
2025-12-18 15:37:23 +05:30
Navin-S-R
696a0892fa
refactor: improve asset depreciation handling during asset sales
2025-12-18 13:27:06 +05:30
Sudharsanan11
59aef4fc8c
fix(stock): handle serial and batch nos for disassemble stock entry
2025-12-17 16:16:54 +05:30
Khushi Rawat
99cd7cf63e
Merge pull request #51164 from frappe/mergify/bp/version-15-hotfix/pr-51156
...
fix: show company currency in asset depreciation schedule (backport #51156 )
2025-12-17 15:51:27 +05:30
Diptanil Saha
44082cae72
Merge pull request #51170 from frappe/mergify/bp/version-15-hotfix/pr-51169
...
fix(payment entry): set row id for 'On Previous Row Amount' or 'On Previous Row Total' charge type on tax table (backport #51169 )
2025-12-17 15:32:05 +05:30
diptanilsaha
d7c50cfa7c
fix(payment entry): set row id for 'On Previous Row Amount' or 'On Previous Row Total' charge type on tax table
...
(cherry picked from commit 848f8d6b1f
2025-12-17 09:52:54 +00:00
Frappe PR Bot
1e52738150
chore(release): Bumped to Version 15.92.1
...
## [15.92.1](https://github.com/frappe/erpnext/compare/v15.92.0...v15.92.1 ) (2025-12-17)
### Bug Fixes
* incorrect current qty in stock reco (backport [#51152 ](https://github.com/frappe/erpnext/issues/51152 )) ([#51158 ](https://github.com/frappe/erpnext/issues/51158 )) ([552c5b5552c5b5911
2025-12-17 09:34:54 +00:00
rohitwaghchaure
cbd0a76645
Merge pull request #51161 from frappe/mergify/bp/version-15/pr-51158
...
fix: incorrect current qty in stock reco (backport #51152 ) (backport #51158 )
2025-12-17 15:03:25 +05:30
