nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-02 08:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,390 Commits 622 Branches 1,806 Tags
36e2cf49f359cb59bb52e5ebdaf0327cf446c7b5
Commit Graph

7643 Commits

Author SHA1 Message Date
Kavin
36e2cf49f3 fix: resolve conflicts 
- Remove POS Settings configuration for version 15 backport.
 2026-02-10 13:35:52 +05:30
Sudharsanan11
aedab5c210 test(stock): add test to ignore pos reserved batches for stock levels 
(cherry picked from commit 47ac67f7a2)
 2026-02-09 06:28:42 +00:00
Sudharsanan11
635a421807 fix(stock): ignore pos reserved batches for stock levels 
(cherry picked from commit 277ba9cb79)
 2026-02-09 06:28:42 +00:00
Sudharsanan11
5b7ee0af66 fix(stock): add is group filter for warehouse fields 
(cherry picked from commit a9829f5f7b)
 2026-02-07 16:11:16 +00:00
Pandiyan37
d0a8639a2d test(stock): testcase for different inventory dimension 
(cherry picked from commit 21d0ee8db1)
 2026-02-06 12:28:22 +05:30
Pandiyan37
9cfd704eef fix(stock): update target field attribute 
(cherry picked from commit 7e08154217)
 2026-02-06 12:28:22 +05:30
rohitwaghchaure
3cf10fafdf Merge pull request #52462 from rohitwaghchaure/fixed-stock-reco-balance-value-v15 
fix: stock balance report issue
 2026-02-05 15:49:33 +05:30
Rohit Waghchaure
bda7220b70 fix: stock balance report issue 2026-02-05 15:00:40 +05:30
Mihir Kandoi
195f020636 fix: return None instead of 0 if valuation rate is falsy 
(cherry picked from commit e8d1e9d946)
 2026-02-04 06:48:17 +00:00
Mihir Kandoi
cacca812ed fix: rate comparison in stock reco 
(cherry picked from commit f1b4fe12a2)
 2026-02-04 06:48:16 +00:00
Mihir Kandoi
2d2bbe5fc2 Merge pull request #52384 from frappe/mergify/bp/version-15-hotfix/pr-52259 
fix(stock): include subcontracting order qty while calculating the bin qty (backport #52259)
 2026-02-03 20:48:53 +05:30
Sudharsanan11
ba17fdd072 fix(stock): include subcontracting order qty while calculating the bin qty 
(cherry picked from commit de8f8ef9f4)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py
 2026-02-03 14:55:08 +00:00
kavin-114
f1ba825818 fix(stock): fetch batch wise valuation rate in get_items 
(cherry picked from commit c5df570262)
 2026-02-03 14:47:36 +00:00
Rohit Waghchaure
28929df0e8 fix: zero valuation rate if returning from different warehouse 2026-02-03 18:54:36 +05:30
ruthra kumar
e7297f2fc0 Merge pull request #52364 from frappe/mergify/bp/version-15-hotfix/pr-52160 
fix(stock): remove is_return condition on pos batch qty calculation (backport #52160)
 2026-02-03 17:20:04 +05:30
ruthra kumar
d14d09c286 Merge pull request #52361 from frappe/mergify/bp/version-15-hotfix/pr-51997 
Add partially billed status indicator (backport #51997)
 2026-02-03 17:19:21 +05:30
kavin-114
a638dece6b fix(stock): remove is_return condition on pos batch qty calculation 
(cherry picked from commit 2c19c1fd06)
 2026-02-03 11:11:32 +00:00
rohitwaghchaure
d479930bef Merge pull request #52335 from aerele/v15/pr-52281 
fix(stock): add stock recon opening stock condition
 2026-02-03 16:40:22 +05:30
Dharanidharan2813
e5e3b8a6ae feat(delivery-note): add status indicator when document is partially billed 
(cherry picked from commit 7767000ccf)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/delivery_note.json
 2026-02-03 16:30:49 +05:30
Rohit Waghchaure
c30d76ae68 fix: negative stock for purchase return 2026-02-03 15:56:53 +05:30
kavin-114
0cbb7f8714 fix(stock): add stock recon opening stock condition 2026-02-03 13:41:21 +05:30
Mihir Kandoi
12a2e98751 chore: resolve conflicts 2026-02-03 09:10:41 +05:30
Mihir Kandoi
5f60c0e85e Merge pull request #52246 from mihir-kandoi/st58765 
(cherry picked from commit 135a433018)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py
 2026-02-02 15:15:17 +00:00
Rohit Waghchaure
6d14cb0c6b chore: fix conflicts 2026-02-01 16:30:59 +05:30
Rohit Waghchaure
fec3a8b511 fix: validation when more than one FG items in repack stock entry 
(cherry picked from commit 6423ce2fa7)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/stock_entry.py
 2026-01-31 07:16:29 +00:00
kavin-114
3ccd1b4a6c test: add unit test to check internal purchase with lcv 
(cherry picked from commit dd4fd89ef8)
 2026-01-29 12:02:34 +00:00
kavin-114
41c592a1a8 fix(stock): set incoming_rate with lcv rate for internal purchase 
(cherry picked from commit f0dccc3cd7)
 2026-01-29 12:02:34 +00:00
harrishragavan
90dc22a57d fix(shipment): user contact validation to use full name 
(cherry picked from commit 3c6eb9a531)
 2026-01-27 15:57:05 +00:00
Mihir Kandoi
cd8c6eac7c Merge pull request #52096 from frappe/mergify/bp/version-15-hotfix/pr-52088 
fix: show message if image is removed from item description (backport #52088)
 2026-01-27 14:56:03 +05:30
Mihir Kandoi
90d6bb34dc chore: resolve conflicts 2026-01-27 14:38:19 +05:30
Pandiyan37
dadd4b1f95 fix(stock): use purchase UOM in Supplier Quotation items 2026-01-27 12:28:07 +05:30
Mihir Kandoi
0c89cd5524 fix: show message if image is removed from item description 
(cherry picked from commit b49c679a50)

# Conflicts:
#	erpnext/stock/doctype/item/item.py
 2026-01-27 06:50:16 +00:00
rohitwaghchaure
6be30bbd71 Merge pull request #51904 from frappe/mergify/bp/version-15-hotfix/pr-51900 
fix: validation to check at-least one raw material for manufacture entry (backport #51900)
 2026-01-25 10:45:52 +05:30
rohitwaghchaure
c351d6b1c0 chore: fix conflicts 
Removed old implementation of make_serialized_item function and updated its definition.
 2026-01-24 13:51:54 +05:30
rohitwaghchaure
a4b099e481 chore: fix conflicts 
Removed subcontracting order validation methods from stock entry.
 2026-01-24 13:50:33 +05:30
rohitwaghchaure
3489b65f1a chore: fix conflicts 2026-01-23 12:27:37 +05:30
rohitwaghchaure
c8a52ec43c chore: fix conflicts 
Removed deprecated method for batch-wise total available quantity and adjusted stock value calculations.
 2026-01-23 11:51:02 +05:30
Rohit Waghchaure
f9fd0ffbae fix: negative stock for purchae return 
(cherry picked from commit d68a04ad16)

# Conflicts:
#	erpnext/stock/serial_batch_bundle.py
 2026-01-23 06:03:47 +00:00
mergify[bot]
11544818f1 Merge pull request #51950 from frappe/mergify/bp/version-15-hotfix/pr-51948 
fix: warehouse permissions in MR incorrectly ignored (backport #51948)
 2026-01-21 08:51:41 +00:00
mergify[bot]
502a262637 Merge pull request #51935 from frappe/mergify/bp/version-15-hotfix/pr-51934 
fix: validation message in stock reco row idx (backport #51934)
 2026-01-20 16:11:53 +00:00
rohitwaghchaure
dad7657853 Revert "perf: prevent duplicate reposting for the same item" 
(cherry picked from commit 6e4b90055f)
 2026-01-20 14:19:24 +00:00
Rohit Waghchaure
eff9595e34 perf: prevent duplicate reposting for the same item 
(cherry picked from commit 7535931571)
 2026-01-20 12:08:49 +00:00
Rohit Waghchaure
650f874fbd fix: validation to check at-least one raw material for manufacture entry 
(cherry picked from commit f003b3c378)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/stock_entry.py
#	erpnext/stock/doctype/stock_entry/test_stock_entry.py
 2026-01-20 08:25:57 +00:00
mergify[bot]
be2069883e fix: allow disassemble stock entry without work order (backport #51761) (#51835) 
* fix: allow disassemble stock entry without work order (#51761)

* fix: allow disassemble stock entry without work order

* fix: use existing functionality to load fg item

* chore: better dict update

(cherry picked from commit 83919119f8)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/test_stock_entry.py

* chore: fix conflicts

Removed unused test functions related to stock entry and sample retention.

* chore: fix linters issue

---------

Co-authored-by: Smit Vora <smitvora203@gmail.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2026-01-19 12:55:03 +05:30
mergify[bot]
1da781f2ae fix(stock entry): calculate transferred quantity using transfer_qty (backport #51656) (#51675) 
* fix(stock entry): calculate transferred quantity using transfer_qty

(cherry picked from commit 4e6d86d6f0)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/stock_entry.py

* test: allow from_warehouse while creating material request

(cherry picked from commit 7e99148357)

* test: validate transferred quantity for material transfer entry

(cherry picked from commit bf2ab32abf)

* chore: fix conflicts

---------

Co-authored-by: Navin-S-R <navin@aerele.in>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2026-01-16 10:42:01 +05:30
rohitwaghchaure
de46ac8b62 chore: fix conflicts 2026-01-15 19:27:46 +05:30
Rohit Waghchaure
6219d7d9a5 fix: Show non-SLE vouchers with GL entries in Stock vs Account Value Comparison report 
(cherry picked from commit 1db9ce205f)

# Conflicts:
#	erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py
 2026-01-15 12:20:31 +00:00
rohitwaghchaure
eb0249310c Merge pull request #51751 from frappe/mergify/bp/version-15-hotfix/pr-51729 
fix: valuation rate for non batchwise valuation (backport #51729)
 2026-01-15 17:01:48 +05:30
mahsem
b3df300ea5 fix: docs_path 
(cherry picked from commit 7ef8c81caf)
 2026-01-14 15:59:59 +00:00
rohitwaghchaure
0a363f879d chore: fix conflicts 
Removed multiple test cases related to purchase receipts and negative stock handling.
 2026-01-14 19:43:39 +05:30