nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 08:35:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,831 Commits 401 Branches 1,698 Tags
c9902eed72dfecc3965dff106df23fde29344904
Commit Graph

52831 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lewis
c9902eed72 chore: apply pre-commit formatting 
(cherry picked from commit 0fc187adc3)
 2025-08-14 13:19:26 +00:00
Lewis Mojica
0d793c11a1 chore: remove unused variable 
(cherry picked from commit 5a5804ca87)
 2025-08-14 13:19:26 +00:00
Lewis
5ce0dc2a7a fix(pos): include Product Bundle components in reserved qty to prevent overselling 
- Add `get_bundle_pos_reserved_qty` to account for component items in submitted POS Invoices
- Update `get_pos_reserved_qty` to sum direct and bundle reservations
- Remove double subtraction in `get_bundle_availability` to avoid underestimating bundle availability
- Prevents overselling when multiple POS sessions sell bundles with shared components
- Fixes #49021

(cherry picked from commit 984d744ac2)
 2025-08-14 13:19:26 +00:00
mergify[bot]
ad052d72d7 feat: enhance barcode scanner to support warehouse scanning (backport #48865) (#49162) 
Co-authored-by: Sagar Vora <16315650+sagarvora@users.noreply.github.com>
Co-authored-by: Soni Karm <93865733+karm1000@users.noreply.github.com>
 2025-08-14 13:20:01 +05:30
Khushi Rawat
8d9095def0 Merge pull request #49146 from frappe/mergify/bp/version-15-hotfix/pr-49075 
fix: add validation for draft PR/PI in Asset (backport #49075)
 2025-08-14 12:10:00 +05:30
rohitwaghchaure
ae22a90160 Merge pull request #49158 from frappe/mergify/bp/version-15-hotfix/pr-49155 
chore: convert message to toast notification (backport #49155)
 2025-08-14 10:55:28 +05:30
Rohit Waghchaure
7a04bf85bc chore: convert message to toast notification 
(cherry picked from commit fc71001110)
 2025-08-14 05:06:00 +00:00
rohitwaghchaure
ef0f91f862 Merge pull request #49156 from frappe/mergify/bp/version-15-hotfix/pr-49154 
fix: current qty for batch in stock reco (backport #49154)
 2025-08-14 08:31:20 +05:30
Rohit Waghchaure
3ecb09ae52 fix: current qty for batch in stock reco 
(cherry picked from commit 817e719cc2)
 2025-08-13 18:28:29 +00:00
Khushi Rawat
9c5dacd977 refactor: validate linked purchase docs before field usage 
(cherry picked from commit 4a48b13715)
 2025-08-13 11:49:35 +00:00
Rehan Ansari
4187e60b07 fix: add validation for draft PR/PI in Asset 
(cherry picked from commit 4cf481cca8)
 2025-08-13 11:49:35 +00:00
Mihir Kandoi
69eb31028a Merge pull request #49138 from frappe/mergify/bp/version-15-hotfix/pr-49134 
chore: add default value for posting_time field in subcontracting receipt (backport #49134)
 2025-08-13 14:21:41 +05:30
Karm Soni
15a104b0f8 chore: add default value for posting_time field in subcontracting receipt 
(cherry picked from commit b7470617e0)
 2025-08-13 08:35:45 +00:00
Mihir Kandoi
6b436e1e71 Merge pull request #49124 from frappe/mergify/bp/version-15-hotfix/pr-49122 
feat: select child item when creating one document from another (backport #49122)
 2025-08-12 21:53:39 +05:30
Mihir Kandoi
5f06d87f01 feat: select child item when creating one document from another 
(cherry picked from commit a9936ae133)
 2025-08-12 16:07:51 +00:00
mergify[bot]
76b0f4fb25 perf: multiple performance fixes in get_item_warehouse (backport #49118) 
Co-authored-by: Sagar Vora <16315650+sagarvora@users.noreply.github.com>
 2025-08-12 11:43:43 +00:00
ruthra kumar
167ff00c99 Merge pull request #48999 from frappe/mergify/bp/version-15-hotfix/pr-48761 
fix: prevent gain or loss entry cancellation upon reposting (backport #48761)
 2025-08-12 17:03:12 +05:30
Logesh Periyasamy
6e7fb2ea01 Merge pull request #48761 from aerele/exchange-gain-or-loss-on-repost 
fix: prevent gain or loss entry cancellation upon reposting
(cherry picked from commit a8d17b7590)
 2025-08-12 16:47:07 +05:30
ruthra kumar
daf3aab6ae Merge pull request #49111 from frappe/mergify/bp/version-15-hotfix/pr-49086 
fix(process statement of accounts): use date instead of formatted date (backport #49086)
 2025-08-12 11:39:14 +05:30
ruthra kumar
1c9a74f81c Merge pull request #49110 from frappe/mergify/bp/version-15-hotfix/pr-49096 
fix: table render issue on pop-up edit (backport #49096)
 2025-08-12 10:49:38 +05:30
ruthra kumar
2eaffa119f Merge pull request #48715 from wojosc/patch-44 
refactor: remove default value for opportunity type
 2025-08-12 10:49:16 +05:30
ravibharathi656
6ad3461953 fix(process statement of accounts): use date instead of formatted date 
(cherry picked from commit aa3f50ab77)
 2025-08-12 05:18:09 +00:00
l0gesh29
52db89f73f fix: table render issue on pop-up edit 
(cherry picked from commit 3431c6c90e)
 2025-08-12 05:10:22 +00:00
Khushi Rawat
4f72635698 Merge pull request #49100 from frappe/mergify/bp/version-15-hotfix/pr-48862 
feat: show party name in reports (backport #48862)
 2025-08-11 18:25:50 +05:30
khushi8112
0e7f778b3f fix: show name of the employee in general ledger report 
(cherry picked from commit 70411ec086)
 2025-08-11 12:24:45 +00:00
khushi8112
d6e9216a45 chore: code format 
(cherry picked from commit b0c0a86fcf)
 2025-08-11 12:24:45 +00:00
khushi8112
9cd60531d2 feat: add customer name column in gross profit report 
(cherry picked from commit 9dee411eb5)
 2025-08-11 12:24:44 +00:00
khushi8112
3763ad451b feat: add party name in GL entries 
(cherry picked from commit 3d94a7cf2c)
 2025-08-11 12:24:44 +00:00
khushi8112
680fa3b8f3 feat: add party name column in general ledger report 
(cherry picked from commit 5f24061dd4)
 2025-08-11 12:24:44 +00:00
ruthra kumar
0644c78c2e Merge pull request #49097 from frappe/mergify/bp/version-15-hotfix/pr-49093 
fix: allow creation of root accounts in account tree view  (backport #49093)
 2025-08-11 17:44:51 +05:30
Lakshit Jain
c2ad5d0fc7 Merge pull request #49093 from ljain112/fix-account-coa 
fix: allow creation of root accounts in account tree view

(cherry picked from commit d45cd5af2b)
 2025-08-11 11:38:30 +00:00
Asmita Hase
6de74697c9 Merge pull request #49095 from frappe/mergify/bp/version-15-hotfix/pr-49088 
fix: Include Employee party type in Receivable and Payable account filters (backport #49088)
 2025-08-11 17:01:48 +05:30
Wolfram Schmidt
36197afa19 refactor: remove default value for opportunity type 
removing default value as this leads to an error in non-english setups
 2025-08-11 16:54:56 +05:30
Assem Bahnasy
e762007e0e refactor: Move Employee inclusion to SQL level to preserve search semantics 
(cherry picked from commit 8a9bf166c6)
 2025-08-11 11:15:19 +00:00
Assem Bahnasy
c462219dd7 refactor: Use parameterized SQL queries to prevent injection and handle None values 
(cherry picked from commit a08c7f37d3)
 2025-08-11 11:15:19 +00:00
ruthra kumar
0cd9330e44 Merge pull request #49085 from frappe/mergify/bp/version-15-hotfix/pr-48730 
fix(regional-uae): mark export items as zero rated (backport #48730)
 2025-08-11 12:35:56 +05:30
ruthra kumar
faba523086 chore: resolve conflict 2025-08-11 11:41:10 +05:30
Dany Robert
90913c66ae fix: handle case where taxes is added invoice changed to non-export later 
(cherry picked from commit 29c3ef8280)
 2025-08-11 06:06:08 +00:00
Dany Robert
d47c25287d chore: code styling 
(cherry picked from commit c8940a39b3)
 2025-08-11 06:06:08 +00:00
Dany Robert
614d38d0e6 fix: show message only if no tax is applied 
(cherry picked from commit 38471995e7)
 2025-08-11 06:06:08 +00:00
Dany Robert
534b27afa5 chore: linters 
(cherry picked from commit eb6c8d8938)
 2025-08-11 06:06:07 +00:00
Dany Robert
faae734797 fix: avoid property setter for custom field 
(cherry picked from commit 0c15b65756)
 2025-08-11 06:06:07 +00:00
Dany Robert
68c65866bf fix: simplify export determination logic 
(cherry picked from commit d25846f383)
 2025-08-11 06:06:07 +00:00
Dany Robert
62db42cf2f fix(regional-uae): restrict zero rated export to invoice 
(cherry picked from commit 1170e4fb2c)
 2025-08-11 06:06:06 +00:00
Dany Robert
106b83e9f9 fix(regional-uae): split export determination 
(cherry picked from commit dc72e6cf36)
 2025-08-11 06:06:06 +00:00
Dany Robert
9df6424a20 fix(regional-uae): mark export items as zero rated 
(cherry picked from commit b8224693c4)

# Conflicts:
#	erpnext/patches.txt
 2025-08-11 06:06:06 +00:00
Mihir Kandoi
474ddbae0c Merge pull request #49083 from frappe/mergify/bp/version-15-hotfix/pr-48691 
fix: handle negative inventory check (#48558) (backport #48691)
 2025-08-11 10:45:20 +05:30
Vishist16
9da2be2325 fix: handle negative inventory check (#48558) (#48691) 
* fix: handle negative inventory check (#48558)

* fix: updated DocField via Desk UI as suggested

* fix: update DocField via Desk UI and fix linting issues

(cherry picked from commit 3ee23d9ee8)
 2025-08-11 05:00:20 +00:00
mergify[bot]
15e8fa3189 Merge pull request #49081 from frappe/mergify/bp/version-15-hotfix/pr-49068 
fix(job-card): Add filter to item_code query for scrap_items to exclude disabled (backport #49068)
 2025-08-11 10:25:21 +05:30
Mihir Kandoi
02d2ad6442 Merge pull request #49080 from frappe/mergify/bp/version-15-hotfix/pr-49071 
feat: add item_name column to Material Request dialog in Purchase Order (backport #49071)
 2025-08-11 10:11:47 +05:30