ravibharathi656
4fccef0636
fix(dunning): include accounting dimension upon gl creation
2025-08-22 12:34:39 +05:30
Diptanil Saha
43a723546d
Merge pull request #49220 from frappe/mergify/bp/version-14-hotfix/pr-49192
...
fix: improve queries with query builder and input sanitization (backport #49192 )
2025-08-19 11:51:32 +05:30
diptanilsaha
ea454ef770
fix: include missing cint import
2025-08-19 11:27:55 +05:30
diptanilsaha
0d6be69ce5
fix: handle empty loyalty point details
...
(cherry picked from commit 1231ca17c9 )
2025-08-19 05:25:23 +00:00
diptanilsaha
22d7bbb081
fix: use query builder instead of raw SQL in get_timesheet_detail_rate
...
(cherry picked from commit e563ed0c75 )
2025-08-19 05:25:23 +00:00
diptanilsaha
4b643feb92
fix: use query builder instead of raw SQL in get_rfq_containing_supplier
...
(cherry picked from commit 7f2a52ff71 )
2025-08-19 05:25:22 +00:00
diptanilsaha
06f04cad3e
fix: use query builder instead of raw SQL in unset_existing_data
...
(cherry picked from commit 7fa4ed6139 )
2025-08-19 05:25:22 +00:00
diptanilsaha
c3ebc39f3b
fix: sanitize column name for inventory_dimensions in get_stock_balance
...
(cherry picked from commit eb22794f14 )
2025-08-19 05:25:22 +00:00
diptanilsaha
9d06e093a6
fix: use query builder instead of raw SQL in get_blanket_orders
...
(cherry picked from commit 1db135262d )
2025-08-19 05:25:22 +00:00
diptanilsaha
1c24bedaf6
fix: formatted string for disabled filter in get_income_account
...
(cherry picked from commit 6320f7290f )
2025-08-19 05:25:21 +00:00
diptanilsaha
5a0e690307
fix: use query builder instead of raw SQL in get_material_requests_based_on_supplier
...
(cherry picked from commit de919568b4 )
2025-08-19 05:25:21 +00:00
diptanilsaha
64e6d65c00
fix: use query builder instead of raw SQL in get_loyalty_details
...
(cherry picked from commit 8696ba2f5d )
2025-08-19 05:25:21 +00:00
ruthra kumar
2f4bfa77b2
Merge pull request #48998 from frappe/mergify/bp/version-14-hotfix/pr-48761
...
fix: prevent gain or loss entry cancellation upon reposting (backport #48761 )
2025-08-12 16:44:09 +05:30
Vignesh S
5eeaaf4757
chore: fix text case failure casued by mergify
2025-08-12 16:25:59 +05:30
ruthra kumar
8faabb8110
Merge pull request #49115 from frappe/mergify/bp/version-14-hotfix/pr-48909
...
fix(tax withholding details): avoid voucher duplication (backport #48909 )
2025-08-12 16:07:00 +05:30
ravibharathi656
92ee871b79
fix(tax withholding details): avoid voucher duplication
...
(cherry picked from commit 8837016243 )
2025-08-12 09:31:36 +00:00
Mihir Kandoi
25ff9e0a4d
Merge pull request #49048 from frappe/mergify/bp/version-14-hotfix/pr-48813
...
fix(purchase invoice): filter only enabled account (backport #48813 )
2025-08-08 12:00:55 +05:30
mithili
a230a0d94c
chore: add back filter
...
(cherry picked from commit 23308f6d10 )
2025-08-08 05:25:01 +00:00
mithili
8fc8aa2dfd
fix: add condition to fetch active accounts
...
(cherry picked from commit 7c8dd86a35 )
2025-08-08 05:25:01 +00:00
mithili
e0d9a47ff7
fix(purchase invoice): filter only enabled account
...
(cherry picked from commit c3111db6e2 )
2025-08-08 05:25:01 +00:00
rohitwaghchaure
9d0034f0a4
Merge pull request #49018 from frappe/mergify/bp/version-14-hotfix/pr-49010
...
fix: timeout while submitting purchase receipt (backport #49010 )
2025-08-07 12:28:30 +05:30
Diptanil Saha
f3d780c5bc
Merge pull request #49024 from frappe/mergify/bp/version-14-hotfix/pr-49023
...
fix: NoneType error on applying presentation_currency filter on financial statements and trial balance report (backport #49023 )
2025-08-07 02:31:03 +05:30
diptanilsaha
89d00ee4a2
fix: nonetype error on applying presentation_currency filter on financial statements and trial balance report
...
(cherry picked from commit d7e22de44c )
2025-08-06 20:41:33 +00:00
rohitwaghchaure
22e63099ee
chore: fix conflicts
2025-08-06 22:24:45 +05:30
Rohit Waghchaure
06c3839abc
fix: timeout while submitting purchase receipt
...
(cherry picked from commit c433943c46 )
# Conflicts:
# erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
2025-08-06 14:35:43 +00:00
Logesh Periyasamy
b3035ec7d4
Merge pull request #48761 from aerele/exchange-gain-or-loss-on-repost
...
fix: prevent gain or loss entry cancellation upon reposting
(cherry picked from commit a8d17b7590 )
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
2025-08-06 07:44:42 +05:30
ruthra kumar
0ecc056a3f
Merge pull request #48996 from frappe/mergify/bp/version-14-hotfix/pr-48901
...
fix: do not split round off when there is a cost center allocation (backport #48901 )
2025-08-05 20:55:34 +05:30
ravibharathi656
7a9150aac0
test: add test for cost center allocation commercial rounding
...
(cherry picked from commit dd24cce509 )
# Conflicts:
# erpnext/accounts/doctype/cost_center_allocation/test_cost_center_allocation.py
2025-08-05 20:35:21 +05:30
venkat102
388b5fb8f6
fix: do not split round off when there is a cost center allocation
...
(cherry picked from commit f0df41d521 )
2025-08-05 20:35:18 +05:30
ruthra kumar
96a1a4a8b8
Merge pull request #48984 from frappe/mergify/bp/version-14-hotfix/pr-48798
...
feat: add show_amount_in_company_currency in gl report (backport #48798 )
2025-08-05 17:44:27 +05:30
l0gesh29
eb691226d5
feat: add show_amount_in_company_currency in gl report
...
(cherry picked from commit 468e5e9b2e )
# Conflicts:
# erpnext/accounts/report/general_ledger/general_ledger.js
2025-08-05 17:11:33 +05:30
Mihir Kandoi
00e61a531a
Merge pull request #48986 from mihir-kandoi/st45290
...
fix: closing balance being added twice to fifo queue in stock ageing report
2025-08-05 15:48:38 +05:30
Mihir Kandoi
7abc4c4022
fix: closing balance being added twice to fifo queue
2025-08-05 15:25:25 +05:30
Mihir Kandoi
1ae3fd3e27
Merge pull request #48966 from frappe/mergify/bp/version-14-hotfix/pr-48693
...
fix: Use correct Attachments folder in code list import (backport #48693 )
2025-08-05 14:29:16 +05:30
ruthra kumar
ade44fbdb4
Merge pull request #48970 from frappe/mergify/bp/version-14-hotfix/pr-48861
...
chore: correct description for `consider_party_ledger_amount` in Tax Withholding Category (backport #48861 )
2025-08-05 14:26:25 +05:30
ljain112
82e8fb8a5e
chore: correct description for consider_party_ledger_amount in Tax Withholding Category
...
(cherry picked from commit f619bca2d6 )
# Conflicts:
# erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
2025-08-05 14:24:38 +05:30
Corentin Forler
f415bc3d14
fix: Use correct Attachments folder in code list import
...
(cherry picked from commit bc2cb1737a )
2025-08-05 08:34:37 +00:00
ruthra kumar
5bc3273460
Merge pull request #48963 from frappe/mergify/bp/version-14-hotfix/pr-48860
...
fix: add doctype fieldname in condition (backport #48860 )
2025-08-05 13:09:37 +05:30
l0gesh29
c263e6d67e
fix: add doctype fieldname in condition
...
(cherry picked from commit e2d63e4c32 )
# Conflicts:
# erpnext/accounts/utils.py
2025-08-05 12:16:33 +05:30
ruthra kumar
11b5a81170
Merge pull request #48927 from pps190/backport/version-14-hotfix/48926
...
fix: provide missing company in report records that require reference to Company:company:default_currency (Backport #48926 )
2025-08-04 10:29:49 +05:30
Mihir Kandoi
27485b9472
Merge pull request #48329 from pps190/backport/version-14-hotfix/34909
...
Get incoming rate v14 fix (Backport #34909 )
2025-08-02 22:09:30 +05:30
Devin Slauenwhite
0de4477ddf
fix: payment ledger voucher seperator row currencies
2025-08-02 12:29:52 -04:00
Devin Slauenwhite
235f271729
fix: provide company for outstanding record.
2025-08-02 12:23:32 -04:00
Devin Slauenwhite
d38fd0779c
fix: provide missing company in report records that require reference to Company:company:default_currency
2025-08-02 12:03:40 -04:00
Mihir Kandoi
093c6bb17e
Merge pull request #48907 from frappe/st45332
...
fix: add flt to prevent NoneType errors
2025-08-01 17:07:50 +05:30
Mihir Kandoi
2c98081be6
fix: add flt to prevent NoneType errors
2025-08-01 16:39:56 +05:30
ruthra kumar
451326fdeb
Merge pull request #48846 from frappe/mergify/bp/version-14-hotfix/pr-48835
...
fix: include empty values in user permission (backport #48835 )
2025-07-29 20:17:18 +05:30
l0gesh29
4d12ae069e
fix: include empty values in user permission
...
(cherry picked from commit f13d98fc7c )
2025-07-29 14:26:33 +00:00
Khushi Rawat
4297c58e5e
Merge pull request #48834 from frappe/mergify/bp/version-14-hotfix/pr-48833
...
fix: post gl entry on completion date of asset repair (backport #48833 )
2025-07-29 16:57:02 +05:30
Khushi Rawat
b43fbf2a7d
fix: import get_link_to_form from utils
2025-07-29 15:48:41 +05:30