CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 10:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,844 Commits 423 Branches 1,723 Tags
bc1c57a18a1fbe6da9b18468fa23dd01ce0e9fd7
Commit Graph

52844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
bc1c57a18a Merge pull request #49195 from frappe/mergify/bp/version-15-hotfix/pr-49193 
fix: additional cost not consider in valuation rate for Stock Entry transfer (backport #49193)
 2025-08-17 11:15:19 +05:30
rohitwaghchaure
016948804d chore: fix test case 2025-08-17 10:55:54 +05:30
rohitwaghchaure
41e7463412 chore: fix conflicts 2025-08-17 10:54:46 +05:30
Rohit Waghchaure
e4398d3761 fix: additional cost not consider in valuation rate for Stock Entry transfer 
(cherry picked from commit bbc772abe7)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/test_stock_entry.py
 2025-08-17 05:22:52 +00:00
Mihir Kandoi
6030eb2992 fix: wrap inter-company order button labels in __() for translation (backport #49178) (#49179) 
fix: wrap inter-company order button labels in __() for translation (#49178)

* Updated purchase_order.js

* Update sales_order.js

(cherry picked from commit 078b8439d9)

Co-authored-by: divyalekha99 <32547248+divyalekha99@users.noreply.github.com>
 2025-08-14 20:33:32 +05:30
divyalekha99
db486356db fix: wrap inter-company order button labels in __() for translation (#49178) 
* Updated purchase_order.js

* Update sales_order.js

(cherry picked from commit 078b8439d9)
 2025-08-14 15:00:01 +00:00
Diptanil Saha
464f504b61 Merge pull request #49177 from frappe/mergify/bp/version-15-hotfix/pr-49108 
fix(pos): include Product Bundle components in reserved qty to preven… (backport #49108)
 2025-08-14 19:09:42 +05:30
Diptanil Saha
84fda4afb5 Merge pull request #49176 from frappe/mergify/bp/version-15-hotfix/pr-49163 
fix: product bundle child item quantity should be a positive number (backport #49163)
 2025-08-14 19:08:53 +05:30
Lewis
93ad17ac7b chore: improve code clarity per reviewer feedback 
- Rename stock_qty variable to reserved_qty for clarity
- Update get_pos_reserved_qty_from_table to return float
- Simplify aggregation logic in get_pos_reserved_qty
- Ensure return values match docstring specifications

(cherry picked from commit 54d3e5675f)
 2025-08-14 13:19:28 +00:00
diptanilsaha
f831d45cc3 fix: product bundle child item quantity should be a positive number 
(cherry picked from commit 711076d02d)
 2025-08-14 13:19:27 +00:00
Lewis
cc82836109 fix(pos): use packed_items snapshot for bundle reservations 
Replaced live Product Bundle queries with `Packed Item` table
lookups to ensure historical reservation accuracy.
Addresses bundle qty underestimation and avoids errors when
bundle definitions change after sale.

Inspired by approach from @diptanilsaha in #49106.

(cherry picked from commit d77d79e011)
 2025-08-14 13:19:27 +00:00
Lewis
383744b8e4 fix: remove unclear message related to availability of product bundle 
(cherry picked from commit f5e5f7b588)
 2025-08-14 13:19:27 +00:00
Lewis
1f3d8e8d64 fix(pos): populate packed_items table in POS Invoice 
(cherry picked from commit a65b200eb7)
 2025-08-14 13:19:27 +00:00
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