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 |
|
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 |
|
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
|
5d92f38bbe
|
Merge pull request #48807 from frappe/mergify/bp/version-14-hotfix/pr-48801
fix: incorrect GL entries (backport #48801)
|
2025-07-28 17:54:00 +05:30 |
|
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 |
|
ruthra kumar
|
77ea06dc7d
|
Merge pull request #48740 from frappe/mergify/bp/version-14-hotfix/pr-48665
fix: show amount for exchange gain or loss account (backport #48665)
|
2025-07-22 12:56:31 +05:30 |
|
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 |
|
rohitwaghchaure
|
e0be83caa5
|
Merge pull request #48728 from frappe/mergify/bp/version-14-hotfix/pr-48704
fix(production plan): add company filter to sub assembly warehouse (backport #48704)
|
2025-07-21 20:04:07 +05:30 |
|
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 |
|
rohitwaghchaure
|
27105501fb
|
Merge pull request #48636 from frappe/mergify/bp/version-14-hotfix/pr-48633
fix: performance issue while submitting the purchase invoice (backport #48633)
|
2025-07-16 17:10:28 +05:30 |
|
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
|
5ddfe3ce1d
|
Merge pull request #48585 from frappe/mergify/bp/version-14-hotfix/pr-47892
refactor: use sql for building voucher balance in Receivable report (backport #47892)
|
2025-07-15 08:23:20 +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 |
|
ruthra kumar
|
006a8c71fd
|
refactor: utility to drop existing procedures and include cost center
(cherry picked from commit da32bb5f51)
# Conflicts:
# erpnext/accounts/doctype/accounts_settings/accounts_settings.js
# erpnext/accounts/doctype/accounts_settings/accounts_settings.json
# erpnext/accounts/doctype/accounts_settings/accounts_settings.py
|
2025-07-15 01:52:44 +00:00 |
|
ruthra kumar
|
ba25d334b1
|
refactor: order by posting date
(cherry picked from commit 7b7440d44a)
|
2025-07-15 01:52:43 +00:00 |
|
ruthra kumar
|
dd1020ccfb
|
refactor: call procedures based on config
(cherry picked from commit e90c6a33bd)
# Conflicts:
# erpnext/accounts/report/accounts_receivable/accounts_receivable.py
|
2025-07-15 01:52:43 +00:00 |
|
ruthra kumar
|
de2f80811f
|
refactor: introduce sql option for data fetch
(cherry picked from commit 8cf8f6abad)
# Conflicts:
# erpnext/accounts/doctype/accounts_settings/accounts_settings.py
|
2025-07-15 01:52:43 +00:00 |
|
ruthra kumar
|
12eaa64572
|
refactor: better readability
(cherry picked from commit 097e74979f)
|
2025-07-15 01:52:42 +00:00 |
|
ruthra kumar
|
da1dcb8b21
|
refactor: using sql procedures for AR report
- dynamic filters are passed
(cherry picked from commit e5920c57aa)
# Conflicts:
# erpnext/accounts/report/accounts_receivable/accounts_receivable.py
|
2025-07-15 01:52:42 +00:00 |
|
mergify[bot]
|
9dad08274a
|
fix(Employee): add context to status in List View (backport #48576) (#48578)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix(Employee): add context to status in List View (#48576)
|
2025-07-14 15:53:42 +02:00 |
|
rohitwaghchaure
|
d8d53bc43e
|
Merge pull request #48496 from frappe/mergify/bp/version-14-hotfix/pr-48490
feat: update the modified date of the SLE after reposting (backport #48490)
|
2025-07-09 19:45:26 +05:30 |
|
Rohit Waghchaure
|
8966c956d5
|
feat: update the modified date of the SLE after reposting
(cherry picked from commit c2cd4934e7)
|
2025-07-09 13:52:11 +00:00 |
|