37579 Commits

Author	SHA1	Message	Date
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
ravibharathi656	92ee871b79	fix(tax withholding details): avoid voucher duplication ... (cherry picked from commit 8837016243)	2025-08-12 09:31:36 +00:00
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
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
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	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
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
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	2c98081be6	fix: add flt to prevent NoneType errors	2025-08-01 16:39:56 +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	b43fbf2a7d	fix: import get_link_to_form from utils	2025-07-29 15:48:41 +05:30
Khushi Rawat	6cdc7811b8	fix: resolved conflicts	2025-07-29 15:42:00 +05:30
Khushi Rawat	59ac7aeb23	chore: resolved conflicts	2025-07-29 15:41:20 +05:30
Khushi Rawat	4524c74968	fix: resolved conflicts	2025-07-29 15:39:10 +05:30
khushi8112	80ae9820f0	fix: post gl entry on completion date of asset repair ... (cherry picked from commit 5a82b723c2) # Conflicts: # erpnext/assets/doctype/asset_repair/asset_repair.json # erpnext/assets/doctype/asset_repair/asset_repair.py # erpnext/assets/doctype/asset_repair/test_asset_repair.py	2025-07-29 10:07:22 +00:00
rohitwaghchaure	a944eaf054	chore: fix conflicts	2025-07-28 16:35:39 +05:30
Rohit Waghchaure	493c8ce04e	fix: incorrect GL entries ... (cherry picked from commit 4c273fcc99) # Conflicts: # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py	2025-07-28 10:58:37 +00:00
l0gesh29	360f3b7c25	fix: add validation for account key ... (cherry picked from commit b6da350c20)	2025-07-22 06:44:03 +00:00
l0gesh29	581221f1ec	fix: show amount for exchange gain or loss account ... (cherry picked from commit 4f90f50eb2)	2025-07-22 06:44:03 +00:00
ravibharathi656	8934adfef4	fix(production plan): add company filter to sub assembly warehouse ... (cherry picked from commit 1728a95111)	2025-07-21 14:27:40 +00:00
Marica	2d6f4740be	Merge pull request #48638 from frappe/mergify/bp/version-14-hotfix/pr-46416 ... fix: calculate due date based on payment term (backport #46416)	2025-07-16 17:18:04 +02:00
ruthra kumar	7aaea9f5b6	Merge pull request #48615 from aerele/backport-48612 ... fix(period closing voucher): closing account head debit and debit in account currency should be equal	2025-07-16 20:13:11 +05:30
Sudharsanan Ashok	9e7a5bb1bb	fix: calculate due date based on payment term (#46416) ... (cherry picked from commit 9e808c832f)	2025-07-16 14:40:15 +00:00
Rohit Waghchaure	4fe09fd7e8	fix: performance issue while submitting the purchase invoice ... (cherry picked from commit 47979871de)	2025-07-16 11:16:37 +00:00
venkat102	76a233e1b7	fix(period closing voucher): closing account head debit and debit in account currency should be equal	2025-07-15 18:24:54 +05:30
ruthra kumar	ff998572e7	chore: resolve conflicts	2025-07-15 08:03:48 +05:30
ruthra kumar	f364a41490	chore: rename method ... (cherry picked from commit fc8ca7d82c) # Conflicts: # erpnext/accounts/report/accounts_receivable/accounts_receivable.py	2025-07-15 01:52:45 +00:00
ruthra kumar	804edad233	refactor: build and pass match conditions as qb criterion ... (cherry picked from commit 7efeed54de) # Conflicts: # erpnext/accounts/report/accounts_receivable/accounts_receivable.py # erpnext/accounts/utils.py	2025-07-15 01:52:45 +00:00
ruthra kumar	e533158a1c	chore: drop unused utility method ... (cherry picked from commit 52c0df24e3)	2025-07-15 01:52:45 +00:00
ruthra kumar	5bcf642dff	refactor: dynamic DB field types ... (cherry picked from commit 9d0ebe3427) # Conflicts: # erpnext/accounts/report/accounts_receivable/accounts_receivable.py	2025-07-15 01:52:44 +00:00
ruthra kumar	d7822f493b	refactor: better variable name ... (cherry picked from commit 1a90c0d031)	2025-07-15 01:52:44 +00:00
ruthra kumar	5188745c53	refactor: prefix-ed names for easy distinction ... (cherry picked from commit c5e35cc330)	2025-07-15 01:52:44 +00:00