Rohit Waghchaure
|
eff9595e34
|
perf: prevent duplicate reposting for the same item
(cherry picked from commit 7535931571)
|
2026-01-20 12:08:49 +00:00 |
|
ruthra kumar
|
8847e1c2bd
|
Merge pull request #51915 from frappe/mergify/bp/version-15-hotfix/pr-51671
fix(accounts): add missing accounting dimensions in advance taxes and charges (backport #51671)
|
2026-01-20 17:21:07 +05:30 |
|
Nikhil Kothari
|
1d5f406930
|
fix(accounts): add missing accounting dimensions in advance taxes and charges
(cherry picked from commit 22e9cb4cf4)
# Conflicts:
# erpnext/patches.txt
|
2026-01-20 17:03:46 +05:30 |
|
Mihir Kandoi
|
091272409e
|
Merge pull request #51674 from aerele/v15-sales-analytics-curve-filter
|
2026-01-20 13:26:31 +05:30 |
|
ravibharathi656
|
c2995f6800
|
fix(sales analytics): add curve filter
|
2026-01-20 13:01:59 +05:30 |
|
ruthra kumar
|
39cd371fb6
|
Merge pull request #51892 from frappe/mergify/bp/version-15-hotfix/pr-51886
fix(accounts_controller): make return message translatable (backport #51886)
|
2026-01-20 08:30:46 +05:30 |
|
barredterra
|
8f6095d05f
|
fix(accounts_controller): make return message translatable
(cherry picked from commit 0209f0fe29)
# Conflicts:
# erpnext/controllers/accounts_controller.py
|
2026-01-20 08:17:09 +05:30 |
|
ruthra kumar
|
6b61eabf61
|
Merge pull request #51883 from frappe/mergify/bp/version-15-hotfix/pr-51830
fix(manufacturing): consider process loss qty while validating the work order (backport #51830)
|
2026-01-20 08:08:43 +05:30 |
|
ruthra kumar
|
25112468bc
|
Merge pull request #51890 from frappe/mergify/bp/version-15-hotfix/pr-51561
fix: delete advance ledger entries while reconciling payment entry (backport #51561)
|
2026-01-20 08:06:13 +05:30 |
|
Lakshit Jain
|
d27fe6f57a
|
Merge pull request #51561 from ljain112/fic-adv-ple-po
fix: delete advance ledger entries while reconciling payment entry
(cherry picked from commit aea70c5ec1)
|
2026-01-20 02:21:23 +00:00 |
|
Diptanil Saha
|
e60064f6f1
|
Merge pull request #51885 from frappe/mergify/bp/version-15-hotfix/pr-49957
fix: process statement of accounts (backport #49957)
|
2026-01-19 22:19:58 +05:30 |
|
diptanilsaha
|
e621a51225
|
chore: resolve conflicts
|
2026-01-19 22:03:01 +05:30 |
|
diptanilsaha
|
054468a5ef
|
fix(process statement of accounts): naming of reports
(cherry picked from commit 4a4c2188ec)
# Conflicts:
# erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html
# erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html
|
2026-01-19 16:23:43 +00:00 |
|
diptanilsaha
|
546ab05eb5
|
feat(process statement of accounts): added more frequency options for auto email
(cherry picked from commit d610d1dccd)
# Conflicts:
# erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
|
2026-01-19 16:23:42 +00:00 |
|
diptanilsaha
|
8b2778b29f
|
fix(process statement of accounts): allow renaming
(cherry picked from commit dbab718aaa)
# Conflicts:
# erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
|
2026-01-19 16:23:42 +00:00 |
|
Sudharsanan11
|
4418fb48a9
|
fix(manufacturing): consider process loss qty while validating the work order
(cherry picked from commit e6366e830c)
|
2026-01-19 16:18:35 +00:00 |
|
Diptanil Saha
|
cfafd39543
|
Merge pull request #51876 from frappe/mergify/bp/version-15-hotfix/pr-51595
|
2026-01-19 18:07:22 +05:30 |
|
Florian HENRY
|
794d005923
|
chore: re add older template
(cherry picked from commit b3efb3084f)
|
2026-01-19 12:23:31 +00:00 |
|
Florian HENRY
|
da19761fbd
|
chore: fix bank account type
(cherry picked from commit 4fe1b214c1)
|
2026-01-19 12:23:31 +00:00 |
|
Florian HENRY
|
5fcda5f3ed
|
chore: fix CASH acount type
(cherry picked from commit 6a876de838)
|
2026-01-19 12:23:31 +00:00 |
|
Florian HENRY
|
763cf6ae10
|
chore: fix bank acount type
(cherry picked from commit 765487a087)
|
2026-01-19 12:23:30 +00:00 |
|
Florian HENRY
|
b301be1a74
|
chore: add Expenses Included In Valuation account
(cherry picked from commit c519cd0268)
|
2026-01-19 12:23:30 +00:00 |
|
Florian HENRY
|
e568ab2255
|
feat: remove old French chart of accounts with code as nex 2025 is provided
(cherry picked from commit bf430fce09)
|
2026-01-19 12:23:30 +00:00 |
|
Florian HENRY
|
61295e7d47
|
chore: Review PR #51595
(cherry picked from commit 6bdaeb983d)
|
2026-01-19 12:23:30 +00:00 |
|
Florian HENRY
|
6af6fe8204
|
feat: add new 2025 Charts of Accounts for France
(cherry picked from commit c81dee137f)
|
2026-01-19 12:23:30 +00:00 |
|
rohitwaghchaure
|
d0d776486e
|
Merge pull request #51865 from frappe/mergify/bp/version-15-hotfix/pr-51769
fix(pos): reapply set warehouse during cart update (backport #51769)
|
2026-01-19 15:44:52 +05:30 |
|
ravibharathi656
|
75b4a0a89c
|
fix(pos): reapply set warehouse during cart update
(cherry picked from commit 5a53c45321)
|
2026-01-19 10:07:47 +00:00 |
|
ruthra kumar
|
a2c86dbe01
|
Merge pull request #51838 from frappe/mergify/bp/version-15-hotfix/pr-51787
fix: recalculate taxes when item tax template changes after discount (backport #51787)
|
2026-01-19 14:36:59 +05:30 |
|
ljain112
|
2bf75a2c24
|
chore: resolve conflicts
|
2026-01-19 13:41:40 +05:30 |
|
ruthra kumar
|
2b38bc191e
|
Merge pull request #51843 from frappe/mergify/bp/version-15-hotfix/pr-51826
fix: common_party_path (backport #51826)
|
2026-01-19 13:20:48 +05:30 |
|
mahsem
|
62252170dd
|
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:20 +00:00 |
|
ruthra kumar
|
c55512c9d3
|
Merge pull request #51840 from frappe/mergify/bp/version-15-hotfix/pr-51513
fix: calculate net profit amount from root node accounts (backport #51513)
|
2026-01-19 13:06:17 +05:30 |
|
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 |
|
Navin-S-R
|
e9573b0b93
|
fix: calculate net profit amount from root node accounts
(cherry picked from commit c84986d00e)
|
2026-01-19 07:15:09 +00:00 |
|
Lakshit Jain
|
1d64373c26
|
Merge pull request #51787 from ljain112/fix-taxes-disc
fix: recalculate taxes when item tax template changes after discount
(cherry picked from commit f00aeec9b4)
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
|
2026-01-19 07:01:36 +00:00 |
|
ruthra kumar
|
6df80901b9
|
Merge pull request #51833 from frappe/mergify/bp/version-15-hotfix/pr-51742
fix: add other charges in total (backport #51742)
|
2026-01-19 11:34:12 +05:30 |
|
SowmyaArunachalam
|
3ef4fa51dc
|
fix: add other charges in total
(cherry picked from commit 9406c07c42)
|
2026-01-19 05:45:16 +00:00 |
|
Mihir Kandoi
|
cce32507d9
|
Merge pull request #51820 from frappe/mergify/bp/version-15-hotfix/pr-51817
fix: prevent UOM from updating incorrectly while scanning barcode (backport #51817)
|
2026-01-18 15:11:05 +05:30 |
|
Pandiyan5273
|
d196956307
|
fix: prevent UOM from updating incorrectly while scanning barcode
(cherry picked from commit 30263b26a5)
|
2026-01-18 09:36:26 +00:00 |
|
ruthra kumar
|
4db62cab3b
|
Merge pull request #51796 from frappe/mergify/bp/version-15-hotfix/pr-51555
fix(postgres): compute current month sales without DATE_FORMAT (backport #51555)
|
2026-01-16 17:15:41 +05:30 |
|
Matt Howard
|
fbf4305028
|
fix(postgres): compute current month sales without DATE_FORMAT
(cherry picked from commit 64f391adf7)
|
2026-01-16 11:28:48 +00:00 |
|
ili.ad
|
eef26fea9a
|
fix(postgres): fix v15 migration failures on Postgres (#51481)
* fix(postgres): avoid DISTINCT(...) in repost allowed types query
* fix(postgres): rewrite update pick list patch to avoid UPDATE JOIN
* chore: linting changes
---------
Co-authored-by: Matt Howard <github.severity519@passmail.net>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
|
2026-01-16 16:35:16 +05:30 |
|
Mihir Kandoi
|
043d208580
|
Merge pull request #51793 from frappe/mergify/bp/version-15-hotfix/pr-51790
fix(stock): resolve quantity issue when adding items via barcode scan (backport #51790)
|
2026-01-16 16:20:18 +05:30 |
|
Pandiyan5273
|
c508ef5b82
|
fix(stock): resolve quantity issue when adding items via barcode scan
(cherry picked from commit f959b2c59a)
|
2026-01-16 10:48:53 +00:00 |
|
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
|
e2b53884fe
|
Merge pull request #51771 from frappe/mergify/bp/version-15-hotfix/pr-51768
fix: Show non-SLE vouchers with GL entries in Stock vs Account Value … (backport #51768)
|
2026-01-15 20:59:48 +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 |
|
Mihir Kandoi
|
dfb1722dc4
|
Merge pull request #51766 from aerele/rfq-email-refactor
|
2026-01-15 16:38:15 +05:30 |
|