nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-19 11:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,163 Commits 636 Branches 1,812 Tags
31dc6021e2a4200a7d7f90378f0c5b7a3e94ecbd
Commit Graph

7076 Commits

Author SHA1 Message Date
rohitwaghchaure
043539fcdb chore: fix conflicts 2025-03-10 17:37:29 +05:30
Rohit Waghchaure
c2001e9c67 fix: stock balance in and out value 
(cherry picked from commit e917bd5334)

# Conflicts:
#	erpnext/stock/report/stock_balance/stock_balance.py
 2025-03-10 10:06:09 +00:00
mergify[bot]
c816f9bd0a fix: validate accounting dimension company in Journal Entry & Stock Entry (backport #46204) (#46369) 
fix: validate accounting dimension company in Journal Entry & Stock Entry (#46204)

* fix: validate accounting dimension company in journal entry and stock entry

* test: update test cases to validate company-based accounting dimension

* fix(test): ensure 'Pick List' company matches 'Delivery Note' to prevent test failures

* chore: remove redundant lines of code

(cherry picked from commit 7b6ebad9e6)

Co-authored-by: Bhavansathru <122002510+Bhavan23@users.noreply.github.com>
 2025-03-06 18:12:06 +05:30
Rohit Waghchaure
1dcbdf3257 fix: doctype name 
(cherry picked from commit d039310d80)
 2025-03-05 15:48:13 +00:00
mergify[bot]
1e85f69072 fix: replacing serial and batch bundle on pos with auto fetch serial nos (backport #46236) (#46337) 
fix: replacing serial and batch bundle on pos with auto fetch serial nos (#46236)

* fix: replacing serial and batch bundle on pos with auto fetch serial nos

* fix: reserved serial no

added a check to look for serial no in reserved serial nos list before removing it as there might be a situation where an item is returned which was already consolidated.

(cherry picked from commit 35512d40bb)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-03-05 18:00:31 +05:30
Mihir Kandoi
8f278ab7c7 Merge pull request #46317 from frappe/mergify/bp/version-15-hotfix/pr-45947 
fix: set landed cost based on purchase invoice rate (backport #45947)
 2025-03-05 16:58:41 +05:30
Mihir Kandoi
941d67a0b6 chore: resolve conflicts 2025-03-05 14:48:41 +05:30
mergify[bot]
5a3073c4c1 fix: incorrect batch picked in the pick list (backport #45761) (#46315) 
fix: incorrect batch picked in the pick list

(cherry picked from commit e1b7688a17)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2025-03-05 14:48:01 +05:30
Mihir Kandoi
8f2fdcae88 fix: patch 
(cherry picked from commit 1230127d24)

# Conflicts:
#	erpnext/patches.txt
 2025-03-05 09:02:36 +00:00
Mihir Kandoi
a09c57f0d1 fix: revert last commit 
(cherry picked from commit 154e9813c4)

# Conflicts:
#	erpnext/patches.txt
 2025-03-05 09:02:35 +00:00
Mihir Kandoi
7b13d8cd98 fix: fiscal year error 
(cherry picked from commit 7cf8e498c4)
 2025-03-05 09:02:34 +00:00
Mihir Kandoi
ee41e55343 perf: patch 
(cherry picked from commit a41024813b)
 2025-03-05 09:02:34 +00:00
Mihir Kandoi
fdaf5fafda fix: set landed cost based on purchase invoice rate 
(cherry picked from commit 17d415b105)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
#	erpnext/patches.txt
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
 2025-03-05 09:02:34 +00:00
ruthra kumar
3c39888227 Merge pull request #46069 from frappe/mergify/bp/version-15-hotfix/pr-46049 
feat: add total weight in shipment (backport #46049)
 2025-03-05 14:23:49 +05:30
ruthra kumar
36fa6bf15c chore: resolve conflict 2025-03-05 13:55:50 +05:30
Mihir Kandoi
0b50f1a9c3 chore: fix pre-commit/linter error 2025-03-05 12:57:53 +05:30
Mihir Kandoi
e4fbd22173 Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-46223 2025-03-05 12:51:01 +05:30
mergify[bot]
d02d005913 fix: use valuation method from settings in stock ageing report (backport #46068) (#46297) 
fix: use valuation method from settings in stock ageing report

(cherry picked from commit da09c278c8)

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2025-03-05 12:40:13 +05:30
Rohit Waghchaure
8bd71954f3 fix: stock reservation issue while making Purchase Invoice 
(cherry picked from commit 64985bffe0)
 2025-03-04 14:41:41 +00:00
ruthra kumar
c09c4cc243 Merge pull request #46252 from frappe/mergify/bp/version-15-hotfix/pr-46070 
fix: Batch Price gets updated only if it is a billed item (backport #46070)
 2025-03-04 15:49:25 +05:30
ruthra kumar
854632dd51 chore: resolve conflict 2025-03-04 15:03:03 +05:30
mergify[bot]
f3cafef6a7 fix(patch): Ensure SLE indexes (backport #46131) (#46135) 
* fix(patch): Ensure SLE indexes (#46131)

Because of the way this change was pushed in parts, some sites don't see
this as "update" and don't have the new indexes.

(cherry picked from commit f62aa8fc57)

# Conflicts:
#	erpnext/patches.txt

* fix: resolved conflict

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2025-03-03 21:37:02 +05:30
ruthra kumar
6762dc3392 chore: linter fix 
(cherry picked from commit 0a2193e458)

# Conflicts:
#	erpnext/stock/get_item_details.py
 2025-03-03 14:27:25 +00:00
Nirmalrajaa K
dbd47dff98 fix: Batch Price gets updated only if it is a billed item 
(cherry picked from commit 1a56b83054)

# Conflicts:
#	erpnext/stock/get_item_details.py
 2025-03-03 14:27:25 +00:00
Nirmalrajaa K
8ed512f6c6 fix: Batch Price gets updated only if it is a billed item 
(cherry picked from commit 9597b1a69e)

# Conflicts:
#	erpnext/stock/get_item_details.py
 2025-03-03 14:27:25 +00:00
Mihir Kandoi
bd48d391e4 fix: syntax error 2025-03-03 16:40:19 +05:30
rohitwaghchaure
9082ff6aa9 Merge pull request #46242 from frappe/mergify/bp/version-15-hotfix/pr-46239 
fix: incorrectly billed amount in the purchase receipt (backport #46239)
 2025-03-03 16:16:09 +05:30
Mihir Kandoi
cc535b7636 fix: syntax error 2025-03-03 15:27:35 +05:30
Mihir Kandoi
81c7b8c273 chore: resolve conflicts 2025-03-03 15:05:44 +05:30
Rohit Waghchaure
e94f0b1cca fix: incorrect batch picked 
(cherry picked from commit d2564cad68)
 2025-03-03 09:24:24 +00:00
Rohit Waghchaure
c247cf888b fix: incorrectly billed amount in the purchase receipt 
(cherry picked from commit a5271fdb2e)
 2025-03-03 09:15:48 +00:00
Mihir Kandoi
7f4d553201 chore: resolve conflicts 2025-03-03 12:28:06 +05:30
Mihir Kandoi
61d5680c8d fix: error 
(cherry picked from commit 7c9c0c7776)

# Conflicts:
#	erpnext/stock/get_item_details.py
 2025-03-03 04:46:28 +00:00
Mihir Kandoi
9e649d8522 fix: dont update rate of free item when batch is updated 
(cherry picked from commit a3596f717b)

# Conflicts:
#	erpnext/stock/get_item_details.py
 2025-03-03 04:46:28 +00:00
rohitwaghchaure
93fed0ce86 chore: fix conflicts 2025-03-01 12:53:44 +05:30
Rohit Waghchaure
87703c6511 fix: rearrange stock settings fields 
(cherry picked from commit 93f461c6f3)

# Conflicts:
#	erpnext/stock/doctype/stock_settings/stock_settings.json
 2025-03-01 06:57:35 +00:00
Rohit Waghchaure
c72dab49f4 fix: valuation rate for batch 
(cherry picked from commit b88305a95f)
 2025-02-25 17:45:05 +00:00
Ravibharathi
171df3aba5 feat: add total weight in shipment (#46049) 
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit 1ec182430d)

# Conflicts:
#	erpnext/stock/doctype/shipment/shipment.json
 2025-02-21 14:16:46 +00:00
Rohit Waghchaure
ec3b281a3b fix: inventory dimension for maintence visit 
(cherry picked from commit cd4ba69262)
 2025-02-20 06:13:19 +00:00
rohitwaghchaure
9318e4f0e8 Merge pull request #46028 from frappe/mergify/bp/version-15-hotfix/pr-46021 
fix: incorrect stock value difference for adjustment entry (backport #46021)
 2025-02-19 17:24:42 +05:30
mergify[bot]
eead6d46ff fix: remove public access to list items (backport #45838) (#46018) 
fix: remove public access to list items

(cherry picked from commit 2bd596ee3d)

Co-authored-by: CaseSolved <richard@casesolved.co.uk>
 2025-02-19 16:52:09 +05:30
Rohit Waghchaure
96d44e362d fix: incorrect stock value difference for adjustment entry 
(cherry picked from commit df83e427a3)
 2025-02-19 11:11:15 +00:00
Mihir Kandoi
f782900a15 refactor: rename field 
(cherry picked from commit f3d598881c)
 2025-02-19 07:21:54 +00:00
Mihir Kandoi
f63a9dbf9b fix: tests 
(cherry picked from commit 366ae85d85)
 2025-02-19 07:21:53 +00:00
rohitwaghchaure
d3d0aacd4c Merge pull request #45993 from frappe/mergify/bp/version-15-hotfix/pr-45977 
fix: millisecond issue for posting datetime (backport #45977)
 2025-02-18 20:31:20 +05:30
rohitwaghchaure
69f5be65f6 Merge pull request #45975 from frappe/mergify/bp/version-15-hotfix/pr-45970 
fix: serial no status for internal transfer delivery note (backport #45970)
 2025-02-18 20:23:20 +05:30
rohitwaghchaure
050bb1eef5 chore: fix conflicts 2025-02-18 20:10:30 +05:30
Rohit Waghchaure
42923656ee fix: millisecond issue for posting datetime 
(cherry picked from commit ac9e5c0163)

# Conflicts:
#	erpnext/patches.txt
#	erpnext/stock/utils.py
 2025-02-18 14:39:39 +00:00
rohitwaghchaure
0acdae02c1 chore: fix conflicts 2025-02-18 20:00:08 +05:30
Rohit Waghchaure
8306d6fdb6 fix: slow query 
(cherry picked from commit 8cfab57fc8)

# Conflicts:
#	erpnext/stock/doctype/packed_item/packed_item.json
 2025-02-18 14:28:19 +00:00