Mihir Kandoi
|
f6edd5aa7d
|
fix: backslash in url
(cherry picked from commit ecf15130ba)
# Conflicts:
# erpnext/stock/doctype/material_request/material_request.json
|
2025-04-22 10:46:36 +00:00 |
|
ruthra kumar
|
31af933c1c
|
Merge pull request #47207 from frappe/mergify/bp/version-15-hotfix/pr-47171
fix: set correct paid/receive amount if doc currency is different from party account currency (backport #47171)
|
2025-04-22 15:58:28 +05:30 |
|
Soham Kulkarni
|
e152c72a7b
|
Merge pull request #47201 from frappe/mergify/bp/version-15-hotfix/pr-47175
fix: add grand_total to show correct status in quick list widget (backport #47175)
|
2025-04-22 15:41:49 +05:30 |
|
ljain112
|
5dc63f97a1
|
fix: set correct paid/receive amount if doc currency is different from party account currency
(cherry picked from commit 9612521894)
|
2025-04-22 10:07:17 +00:00 |
|
rohitwaghchaure
|
8bc00ffbb4
|
Merge pull request #47206 from frappe/mergify/bp/version-15-hotfix/pr-47184
feat: add button to view Supplier Quotation Comparison directly from RFQ (backport #47184)
|
2025-04-22 15:16:01 +05:30 |
|
Mihir Kandoi
|
9655bfa199
|
fix: show button only when RFQ is submitted
(cherry picked from commit ef57d2b328)
|
2025-04-22 09:43:41 +00:00 |
|
Mihir Kandoi
|
cb2b9563e0
|
feat: add button to show request for comparison report directly from RFQ
(cherry picked from commit b4aa88b59b)
|
2025-04-22 09:43:41 +00:00 |
|
ruthra kumar
|
bb71b91d4a
|
Merge pull request #47203 from frappe/mergify/bp/version-15-hotfix/pr-47180
fix: set default company address in selling Doctype on change of company (backport #47180)
|
2025-04-22 15:12:20 +05:30 |
|
ljain112
|
05d4c1e6ca
|
fix: set default company address in Sales Doctype on change of company
(cherry picked from commit a31075692c)
|
2025-04-22 08:59:04 +00:00 |
|
Soham Kulkarni
|
d7556069e4
|
Merge pull request #47175 from sokumon/purchase-receipt-quick-list
fix: add grand_total to show correct status in quick list widget
(cherry picked from commit 68ca4a77c9)
|
2025-04-22 08:52:51 +00:00 |
|
ruthra kumar
|
a3821cf182
|
Merge pull request #47199 from frappe/mergify/bp/version-15-hotfix/pr-47138
fix: rate based on posting date in Tax Withholding Report (backport #47138)
|
2025-04-22 14:07:08 +05:30 |
|
ruthra kumar
|
18e3171cc9
|
Merge pull request #47197 from frappe/mergify/bp/version-15-hotfix/pr-47191
fix: expense account in stock entry (backport #47191)
|
2025-04-22 13:34:01 +05:30 |
|
ljain112
|
1f8fce253d
|
chore: added test case for date period in multiple tax withholding rules
(cherry picked from commit 515fe340a8)
# Conflicts:
# erpnext/accounts/report/tax_withholding_details/test_tax_withholding_details.py
|
2025-04-22 13:31:28 +05:30 |
|
ljain112
|
9184c40371
|
fix: rate based on posting date in Tax Withholding Report
(cherry picked from commit a32a79e90a)
|
2025-04-22 07:59:58 +00:00 |
|
Rohit Waghchaure
|
2f1f229144
|
fix: expense account in stock entry
(cherry picked from commit 75874b4986)
|
2025-04-22 07:46:37 +00:00 |
|
ruthra kumar
|
393e4462f8
|
Merge pull request #47195 from frappe/mergify/bp/version-15-hotfix/pr-47124
fix: `TypeError` in group field filter in supplier ledger summary (backport #47124)
|
2025-04-22 12:44:05 +05:30 |
|
ljain112
|
3b349f44b1
|
fix: TypeError in group field filter in supplier ledger summary
(cherry picked from commit 872e94a316)
|
2025-04-22 06:51:57 +00:00 |
|
rohitwaghchaure
|
c430ce96b3
|
Merge pull request #47185 from frappe/mergify/bp/version-15-hotfix/pr-47144
fix: provision to recalculate the qty in the Bin (backport #47144)
|
2025-04-22 12:20:46 +05:30 |
|
rohitwaghchaure
|
7b5297bb7f
|
Merge pull request #47188 from frappe/mergify/bp/version-15-hotfix/pr-47186
fix: disabled UOM showing in the list (backport #47186)
|
2025-04-22 12:20:34 +05:30 |
|
Rohit Waghchaure
|
3d4f3e1be7
|
fix: disbaled UOM showing in the list
(cherry picked from commit 3745825052)
|
2025-04-21 16:43:17 +00:00 |
|
Rohit Waghchaure
|
5535eb4817
|
fix: provision to recalculate the qty in the Bin
(cherry picked from commit 36081413d8)
|
2025-04-21 15:49:11 +00:00 |
|
ruthra kumar
|
af35e43555
|
Merge pull request #47095 from frappe/mergify/bp/version-15-hotfix/pr-47007
chore: Fix typo "Item Wise Tax Detail " (backport #47007)
|
2025-04-21 16:50:22 +05:30 |
|
ruthra kumar
|
f53a45cfef
|
chore: resolve conflict
|
2025-04-21 16:30:20 +05:30 |
|
ruthra kumar
|
19045bcace
|
Merge pull request #47177 from frappe/mergify/bp/version-15-hotfix/pr-47067
fix: correct error message in validate_internal_transfer_qty (backport #47067)
|
2025-04-21 16:24:11 +05:30 |
|
ljain112
|
b8a7f6dac1
|
fix: correct error message in validate_internal_transfer_qty
(cherry picked from commit 5063f1174e)
|
2025-04-21 10:28:27 +00:00 |
|
ruthra kumar
|
f2c3150687
|
Merge pull request #47013 from frappe/mergify/bp/version-15-hotfix/pr-45924
fix(Employee): remove User Permissions if create_user_permission is unchecked (backport #45924)
|
2025-04-21 15:55:03 +05:30 |
|
mergify[bot]
|
390780d871
|
fix: update country wise fiscal year (backport #47141) (#47176)
fix: update country wise fiscal year (#47141)
(cherry picked from commit cb2ad4acdb)
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
|
2025-04-21 14:26:47 +05:30 |
|
mergify[bot]
|
7adba1f0f3
|
fix: pos disable customer selection at payment (backport #47169) (#47170)
fix: pos disable customer selection at payment (#47169)
(cherry picked from commit f52cbf6165)
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
|
2025-04-21 11:56:54 +05:30 |
|
Sagar Vora
|
d6d042868d
|
Merge pull request #43067 from frappe/mergify/bp/version-15-hotfix/pr-41721
fix: distributed discounts on si (backport #41721)
|
2025-04-19 16:35:12 +05:30 |
|
Sagar Vora
|
f764b9713b
|
Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-41721
|
2025-04-19 16:18:37 +05:30 |
|
Sagar Vora
|
16877fade8
|
Merge pull request #47157 from frappe/mergify/bp/version-15-hotfix/pr-47154
fix: respect mapped accounting dimensions (backport #47154)
|
2025-04-19 13:04:01 +05:30 |
|
Sagar Vora
|
846b24ba52
|
fix: respect mapped accounting dimensions
(cherry picked from commit 7dbe27da19)
|
2025-04-19 07:22:45 +00:00 |
|
mergify[bot]
|
451b1a19a8
|
chore: migrate pre-commit config (backport #47132) (#47134)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
|
2025-04-17 14:18:00 +02:00 |
|
mergify[bot]
|
ad177e08b8
|
fix: create default warehouse (backport #47125) (#47131)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: create default warehouse (#47125)
|
2025-04-17 13:40:05 +02:00 |
|
ruthra kumar
|
673694ae48
|
Merge pull request #47128 from frappe/mergify/bp/version-15-hotfix/pr-47118
fix: add group by after user permission condition (backport #47118)
|
2025-04-17 16:22:07 +05:30 |
|
venkat102
|
f07c3d9124
|
fix: add group by after user permission condition
(cherry picked from commit 756d496235)
|
2025-04-17 10:36:57 +00:00 |
|
rohitwaghchaure
|
d18266d839
|
Merge pull request #47048 from frappe/mergify/bp/version-15-hotfix/pr-46938
fix: group sub assemblies in production plan (backport #46938)
|
2025-04-17 15:31:08 +05:30 |
|
rohitwaghchaure
|
0c714e2bd9
|
Merge pull request #47114 from frappe/mergify/bp/version-15-hotfix/pr-47050
fix: consider per_ordered instead of per_billed when creating PO from MR (backport #47050)
|
2025-04-16 22:49:24 +05:30 |
|
Mihir Kandoi
|
20aba541c4
|
fix: cherry pick
|
2025-04-16 20:32:05 +05:30 |
|
Mihir Kandoi
|
be154a469f
|
fix: consider per_ordered instead of per_billed when creating PO from MR
(cherry picked from commit 5a524854de)
# Conflicts:
# erpnext/stock/doctype/material_request/material_request.js
|
2025-04-16 10:58:52 +00:00 |
|
Shariq Ansari
|
bb6d6c3edf
|
Merge pull request #47109 from frappe/mergify/bp/version-15-hotfix/pr-47108
|
2025-04-16 10:22:33 +05:30 |
|
Shariq Ansari
|
99735e0af4
|
revert: disable customer if creating from opportunity
(cherry picked from commit fc16199a49)
|
2025-04-16 04:51:33 +00:00 |
|
ruthra kumar
|
4a7b91352b
|
Merge pull request #47099 from frappe/mergify/bp/version-15-hotfix/pr-46770
fix: correct outstanding amount for invoice in dunning (backport #46770)
|
2025-04-16 07:44:32 +05:30 |
|
Raffael Meyer
|
188c4f896a
|
fix: backport translations from develop (#47104)
|
2025-04-15 19:30:17 +02:00 |
|
rohitwaghchaure
|
9bdeacbbfa
|
Merge pull request #47097 from frappe/mergify/bp/version-15-hotfix/pr-46973
fix: precision issue on qty_to_be_reserved (backport #46973)
|
2025-04-15 22:01:34 +05:30 |
|
ljain112
|
c42f76b15a
|
chore: added test for Fetch Overdue Payments in dunning
(cherry picked from commit 3b613c44a6)
# Conflicts:
# erpnext/accounts/doctype/dunning/test_dunning.py
|
2025-04-15 20:35:09 +05:30 |
|
Diptanil Saha
|
a944853b56
|
fix: configuration to accept partial payment in pos invoice (#47052)
|
2025-04-15 19:03:55 +05:30 |
|
ljain112
|
b7c3fa23d2
|
fix: correct outstanding amount for invoice in dunning
(cherry picked from commit c2bdd30e6d)
|
2025-04-15 12:21:58 +00:00 |
|
ruthra kumar
|
073a7a6ca6
|
Merge pull request #47096 from frappe/mergify/bp/version-15-hotfix/pr-47001
fix: fetch exchange rate while creating inter-company order and invoice (backport #47001)
|
2025-04-15 17:46:38 +05:30 |
|
Dany Robert
|
c8691b6516
|
fix: precision issue on qty_to_be_reserved
(cherry picked from commit 860699ee7b)
# Conflicts:
# erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py
|
2025-04-15 17:42:30 +05:30 |
|