nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 16:45:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,035 Commits 401 Branches 1,700 Tags
1c214eec98e04b2ff772bb1d2b5fde1b341e9388
Commit Graph

56035 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
1c214eec98 Merge pull request #51844 from frappe/mergify/bp/version-16-hotfix/pr-51826 
fix: common_party_path (backport #51826)
 2026-01-19 13:21:14 +05:30
mahsem
aeb2b60450 fix: common_party_path (#51826) 
* fix: common_pary_path

* chore: remove non-existent anchor

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
(cherry picked from commit 0c0f43f7f7)
 2026-01-19 07:50:30 +00:00
ruthra kumar
1b3f5e1c96 Merge pull request #51841 from frappe/mergify/bp/version-16-hotfix/pr-51513 
fix: calculate net profit amount from root node accounts (backport #51513)
 2026-01-19 13:05:56 +05:30
mergify[bot]
c830bf6fc7 fix: allow disassemble stock entry without work order (backport #51761) (#51836) 
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)

Co-authored-by: Smit Vora <smitvora203@gmail.com>
 2026-01-19 12:54:06 +05:30
ruthra kumar
e2b95da24d Merge pull request #51839 from frappe/mergify/bp/version-16-hotfix/pr-51787 
fix: recalculate taxes when item tax template changes after discount (backport #51787)
 2026-01-19 12:50:34 +05:30
Navin-S-R
89b44c41a2 fix: calculate net profit amount from root node accounts 
(cherry picked from commit c84986d00e)
 2026-01-19 07:15:50 +00:00
Lakshit Jain
181141b56a Merge pull request #51787 from ljain112/fix-taxes-disc 
fix: recalculate taxes when item tax template changes after discount
(cherry picked from commit f00aeec9b4)
 2026-01-19 07:01:52 +00:00
ruthra kumar
5742a5d86a Merge pull request #51834 from frappe/mergify/bp/version-16-hotfix/pr-51742 
fix: add other charges in total (backport #51742)
 2026-01-19 11:34:22 +05:30
SowmyaArunachalam
68c8dfb24c fix: add other charges in total 
(cherry picked from commit 9406c07c42)
 2026-01-19 05:45:20 +00:00
Mihir Kandoi
7f54de7926 Merge pull request #51829 from frappe/mergify/bp/version-16-hotfix/pr-51824 
fix: setting process loss qty causes fg item qty to be incorrect (backport #51824)
 2026-01-18 22:51:58 +05:30
Mihir Kandoi
cb2d4550af fix: setting process loss qty causes fg item qty to be incorrect 
(cherry picked from commit 56f5df6847)
 2026-01-18 17:21:03 +00:00
Mihir Kandoi
c22d7e16d1 Merge pull request #51821 from frappe/mergify/bp/version-16-hotfix/pr-51817 
fix: prevent UOM from updating incorrectly while scanning barcode (backport #51817)
 2026-01-18 15:10:56 +05:30
Pandiyan5273
9d5a0e56a0 fix: prevent UOM from updating incorrectly while scanning barcode 
(cherry picked from commit 30263b26a5)
 2026-01-18 09:36:44 +00:00
mergify[bot]
fcea7603a8 fix: change docfield type to render html format (backport #51795) (#51804) 
fix: change docfield type to render html format (#51795)

(cherry picked from commit 3fe5b5c80d)

Co-authored-by: Sowmya <106989392+SowmyaArunachalam@users.noreply.github.com>
 2026-01-17 15:12:57 +05:30
ruthra kumar
42ebb7446a Merge pull request #51797 from frappe/mergify/bp/version-16-hotfix/pr-51555 
fix(postgres): compute current month sales without DATE_FORMAT (backport #51555)
 2026-01-16 17:15:48 +05:30
Matt Howard
49760e4542 fix(postgres): compute current month sales without DATE_FORMAT 
(cherry picked from commit 64f391adf7)
 2026-01-16 11:29:08 +00:00
Mihir Kandoi
6e1f4d84b6 Merge pull request #51794 from frappe/mergify/bp/version-16-hotfix/pr-51790 
fix(stock): resolve quantity issue when adding items via barcode scan (backport #51790)
 2026-01-16 16:20:37 +05:30
Pandiyan5273
ab482caac9 fix(stock): resolve quantity issue when adding items via barcode scan 
(cherry picked from commit f959b2c59a)
 2026-01-16 10:49:36 +00:00
Mihir Kandoi
d8506fb2c0 Merge pull request #51792 from frappe/mergify/bp/version-16-hotfix/pr-51791 
fix: dont show certain fields based on permissions (backport #51791)
 2026-01-16 16:02:37 +05:30
Mihir Kandoi
d3dfed909e fix: dont show certain fields based on permissions 
(cherry picked from commit b3db2981de)
 2026-01-16 10:31:39 +00:00
Mihir Kandoi
ac31c5ca19 Merge pull request #51789 from frappe/mergify/bp/version-16-hotfix/pr-51784 
fix: add company filters for warehouse (backport #51784)
 2026-01-16 15:16:05 +05:30
SowmyaArunachalam
ccab91b9ed fix: add company filters for warehouse 
(cherry picked from commit f952b92d71)
 2026-01-16 09:44:42 +00:00
Mihir Kandoi
541a8b135a Merge pull request #51785 from frappe/mergify/bp/version-16-hotfix/pr-51693 2026-01-16 14:09:49 +05:30
Mihir Kandoi
c0a30a5302 chore: typo 
(cherry picked from commit 8fd1d6aec8)
 2026-01-16 08:25:03 +00:00
Mihir Kandoi
accce1fe59 fix: bugs 
(cherry picked from commit 19ae405742)
 2026-01-16 08:25:03 +00:00
Mihir Kandoi
f04221417e test: add test case 
(cherry picked from commit b567184dd7)
 2026-01-16 08:25:03 +00:00
Mihir Kandoi
c4c2d35565 feat: support for serial item 
(cherry picked from commit 3d0f649411)
 2026-01-16 08:25:02 +00:00
Mihir Kandoi
f1e41f4a4f fix: remove already transferred batch 
(cherry picked from commit b54067e04d)
 2026-01-16 08:25:02 +00:00
Mihir Kandoi
d9326d80de refactor: sample retention stock entry 
(cherry picked from commit 8d188cd32b)
 2026-01-16 08:25:02 +00:00
ruthra kumar
5c93bf5798 fix: add below-0 column in ar/ap report (backport #51673) (#51780) 
Merge pull request #51673 from Jatin3128/ar/ap-future-range-fix

fix: add below-0 column in ar/ap report
(cherry picked from commit c5b0787de6)

Co-authored-by: Jatin3128 <140256508+Jatin3128@users.noreply.github.com>
 2026-01-16 12:46:26 +05:30
Jatin3128
f62ad83d6f Merge pull request #51673 from Jatin3128/ar/ap-future-range-fix 
fix: add below-0 column in ar/ap report
(cherry picked from commit c5b0787de6)
 2026-01-16 06:37:34 +00:00
Ankush Menat
876e2d4e6e build: Update Frappe dependency (#51779) 2026-01-16 11:24:43 +05:30
rohitwaghchaure
4977e06c50 Merge pull request #51772 from frappe/mergify/bp/version-16-hotfix/pr-51768 
fix: Show non-SLE vouchers with GL entries in Stock vs Account Value … (backport #51768)
 2026-01-15 19:26:45 +05:30
Rohit Waghchaure
e64ae9a8a9 fix: Show non-SLE vouchers with GL entries in Stock vs Account Value Comparison report 
(cherry picked from commit 1db9ce205f)
 2026-01-15 12:20:36 +00:00
rohitwaghchaure
6ddf4eee15 Merge pull request #51752 from frappe/mergify/bp/version-16-hotfix/pr-51729 
fix: valuation rate for non batchwise valuation (backport #51729)
 2026-01-15 17:00:32 +05:30
Mihir Kandoi
d27a09cb9f Merge pull request #51755 from frappe/mergify/bp/version-16-hotfix/pr-51753 
fix: docs_path (backport #51753)
 2026-01-14 21:31:31 +05:30
mahsem
86d5939d91 fix: docs_path 
(cherry picked from commit 7ef8c81caf)
 2026-01-14 16:00:03 +00:00
Rohit Waghchaure
768c131073 fix: valuation rate for non batchwise valuation 
(cherry picked from commit b6312bca9c)
 2026-01-14 14:06:50 +00:00
Diptanil Saha
8f77223057 Merge pull request #51748 from frappe/mergify/bp/version-16-hotfix/pr-51730 
fix(transaction.js): use flt instead of cint for plc_conversion_rate (backport #51730)
 2026-01-14 15:55:13 +05:30
diptanilsaha
8ba470160d fix(transaction.js): use flt instead of cint for plc_conversion_rate 
(cherry picked from commit 8b445e04e5)
 2026-01-14 10:22:21 +00:00
Mihir Kandoi
1a6264d831 Merge pull request #51737 from frappe/mergify/bp/version-16-hotfix/pr-51684 2026-01-14 11:37:00 +05:30
Mihir Kandoi
19a90c0980 Merge pull request #51736 from frappe/mergify/bp/version-16-hotfix/pr-51295 2026-01-14 11:18:57 +05:30
Pandiyan5273
d57fc49896 test(stock-entry): manufacture entry without work order 
(cherry picked from commit 784e338be4)
 2026-01-14 05:34:40 +00:00
l0gesh29
fe0431a6d0 chore: modify error msg 
(cherry picked from commit f7004aa8c3)
 2026-01-14 05:33:39 +00:00
l0gesh29
bfd6375508 fix: add validation for direct return 
(cherry picked from commit 8379b39aaf)
 2026-01-14 05:33:38 +00:00
l0gesh29
6dade11d8f fix: add validation for return against 
(cherry picked from commit ff9b936634)
 2026-01-14 05:33:38 +00:00
Logesh Periyasamy
ce421bb1d4 fix: add validation for amount and hours 
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
(cherry picked from commit 43d1d685c6)
 2026-01-14 05:33:38 +00:00
l0gesh29
84a749e3d0 fix: add validation for duplication 
(cherry picked from commit cda8a97f4a)
 2026-01-14 05:33:37 +00:00
l0gesh29
65a1c7086b fix: handle return cancellation 
(cherry picked from commit 50f73a5072)
 2026-01-14 05:33:37 +00:00
l0gesh29
a04da71182 test: add test for partial billing and return 
(cherry picked from commit ae594e81f9)
 2026-01-14 05:33:37 +00:00