ruthra kumar
|
ec58c309d2
|
test: dimension inheritance in PE reconciliation
(cherry picked from commit 6148fb024b)
|
2024-01-23 11:59:30 +00:00 |
|
ruthra kumar
|
a919702319
|
refactor: pass dimension values to Gain/Loss journal
(cherry picked from commit c44eb432a5)
# Conflicts:
# erpnext/accounts/utils.py
|
2024-01-23 11:59:29 +00:00 |
|
ruthra kumar
|
de948f23c1
|
test: dimension inheritance for cr note reconciliation
(cherry picked from commit ba5a7c8cd8)
|
2024-01-23 11:59:29 +00:00 |
|
ruthra kumar
|
c1591ec8e1
|
chore: test dimension filter output
(cherry picked from commit e3c44231ab)
|
2024-01-23 11:59:29 +00:00 |
|
ruthra kumar
|
c3ffb7a4c4
|
refactor: apply dimension filters on cr/dr notes
(cherry picked from commit 188ff8cde7)
|
2024-01-23 11:59:28 +00:00 |
|
ruthra kumar
|
937262b572
|
refactor: Credit Note and its Exc gain/loss JE inherits dimensions
(cherry picked from commit ab939cc6e8)
|
2024-01-23 11:59:28 +00:00 |
|
ruthra kumar
|
41c074d0bb
|
fix: typo's and parameter changes
(cherry picked from commit 0ec17590ae)
|
2024-01-23 11:59:28 +00:00 |
|
ruthra kumar
|
ecd36501af
|
refactor: partial change on outstanding invoice popup
(cherry picked from commit 2154502955)
|
2024-01-23 11:59:28 +00:00 |
|
ruthra kumar
|
8f87c588ec
|
refactor: replace sql with query builder for Jourals query
(cherry picked from commit 9c5a79209e)
|
2024-01-23 11:59:28 +00:00 |
|
ruthra kumar
|
dac422a0e1
|
refactor: pass dimension details to query
(cherry picked from commit 5dc22e1811)
# Conflicts:
# erpnext/accounts/utils.py
|
2024-01-23 11:59:27 +00:00 |
|
ruthra kumar
|
b2db6d0546
|
refactor: set query filters for dimensions
(cherry picked from commit ad8475cb8b)
|
2024-01-23 11:59:27 +00:00 |
|
ruthra kumar
|
3d62bce885
|
refactor: pass dimension filters to query
(cherry picked from commit ff60ec85b8)
# Conflicts:
# erpnext/controllers/accounts_controller.py
|
2024-01-23 11:59:27 +00:00 |
|
ruthra kumar
|
66cadb8b9f
|
refactor: handle dimension filters
(cherry picked from commit c1fe4bcc64)
|
2024-01-23 11:59:26 +00:00 |
|
ruthra kumar
|
81b87ef2e2
|
refactor: column break in dimension section
(cherry picked from commit 20576e0f47)
|
2024-01-23 11:59:26 +00:00 |
|
ruthra kumar
|
4114c0e854
|
refactor: dimensions filter section in payment reconciliation
(cherry picked from commit 20e0acc20a)
|
2024-01-23 11:59:26 +00:00 |
|
ruthra kumar
|
b25e8ae14c
|
refactor: update dimension doctypes in hooks
(cherry picked from commit cfb3d87267)
|
2024-01-23 11:59:25 +00:00 |
|
ruthra kumar
|
5c9ad21a3f
|
refactor: dimensions section in allocation table in reconciliation
(cherry picked from commit 1cde804c77)
|
2024-01-23 11:59:25 +00:00 |
|
ruthra kumar
|
956f05238a
|
refactor: Payment btn criteria for Cr/Dr notes
(cherry picked from commit 60eee564bf)
|
2024-01-23 06:36:09 +00:00 |
|
ruthra kumar
|
1aeeac4d06
|
refactor: criteria for Credit Note Issued and Debit Note Issued
(cherry picked from commit 8f695123cd)
|
2024-01-23 06:36:09 +00:00 |
|
ruthra kumar
|
fecab1338e
|
refactor(test): payments to invoice with -ve outstanding
(cherry picked from commit f6e4ac2b62)
|
2024-01-23 06:36:09 +00:00 |
|
ruthra kumar
|
03040c1c7f
|
refactor(test): ledger entries will be against itself
(cherry picked from commit 0e2fb1188a)
|
2024-01-23 06:36:08 +00:00 |
|
ruthra kumar
|
43b40d92e5
|
refactor(test): return invoice will have -ve outstanding
(cherry picked from commit b30c1e1abf)
|
2024-01-23 06:36:08 +00:00 |
|
ruthra kumar
|
014fcfa611
|
refactor: remove return_against for cr/dr note filter
(cherry picked from commit 00878707ae)
|
2024-01-23 06:36:08 +00:00 |
|
ruthra kumar
|
0a6af795c4
|
refactor: cr notes will post for itself
(cherry picked from commit db76e8a277)
|
2024-01-23 06:36:08 +00:00 |
|
rohitwaghchaure
|
5be99295da
|
Merge pull request #39491 from frappe/mergify/bp/version-14-hotfix/pr-39488
fix: UOM needs to be whole number not being checked in quotations (backport #39488)
|
2024-01-23 11:54:47 +05:30 |
|
Rohit Waghchaure
|
55c9cc3f26
|
fix: UOM needs to be whole number not being checked in quotations
(cherry picked from commit aaf83da3e9)
|
2024-01-22 11:55:27 +00:00 |
|
Gursheen Kaur Anand
|
be56c1838b
|
Merge pull request #39482 from frappe/mergify/bp/version-14-hotfix/pr-39462
fix: party field in PDF for AP / AR reports (backport #39462)
|
2024-01-22 17:06:09 +05:30 |
|
Gursheen Anand
|
a19b41d8c8
|
fix: party field in pdf html
(cherry picked from commit b2d9380596)
|
2024-01-22 09:51:30 +00:00 |
|
Gursheen Kaur Anand
|
1a46f60633
|
Merge pull request #39473 from frappe/mergify/bp/version-14-hotfix/pr-39229
fix: use most reliable section reference per report line (backport #39229)
|
2024-01-21 14:23:34 +05:30 |
|
David Arnold
|
3bdff18467
|
fix: use most reliable section reference per report line
(cherry picked from commit b5be17c6df)
|
2024-01-21 08:14:13 +00:00 |
|
Gursheen Kaur Anand
|
5c1bf1f3fa
|
Merge pull request #39470 from frappe/mergify/bp/version-14-hotfix/pr-39424
Revert "fix(minor): financial statements period end date" (backport #39424)
|
2024-01-20 18:51:59 +05:30 |
|
Gursheen Kaur Anand
|
837fff4533
|
Revert "fix(minor): financial statements period end date"
(cherry picked from commit 73625a2622)
|
2024-01-20 12:29:22 +00:00 |
|
Nabin Hait
|
f604798a45
|
fix: asset module test cases
|
2024-01-19 16:59:52 +05:30 |
|
Gursheen Kaur Anand
|
f405a6c31d
|
Merge pull request #39450 from frappe/mergify/bp/version-14-hotfix/pr-39449
fix: unallocated amount after taxes and charges (backport #39449)
|
2024-01-19 10:58:27 +05:30 |
|
Nabin Hait
|
b840eb90eb
|
fix: Asset Depreciation WDV as per Income Tax Act
|
2024-01-18 19:06:41 +05:30 |
|
Gursheen Anand
|
6895b74ecc
|
fix: linting issue
(cherry picked from commit 99b94af49f)
|
2024-01-18 10:45:49 +00:00 |
|
Gursheen Anand
|
f7ba7361ca
|
fix: set unallocated amount after base tax
(cherry picked from commit e9bc63aacf)
|
2024-01-18 10:45:49 +00:00 |
|
Nabin Hait
|
05a2fb3011
|
Merge pull request #39437 from frappe/mergify/bp/version-14-hotfix/pr-39429
fix: composite asset capitalization using asset components (backport #39429)
|
2024-01-17 22:05:19 +05:30 |
|
Nabin Hait
|
ac6020a940
|
fix: composite asset capitalization using asset components
(cherry picked from commit 5df40661d2)
|
2024-01-17 15:35:56 +00:00 |
|
Nabin Hait
|
9bcbd94bf1
|
Merge pull request #39421 from frappe/mergify/bp/version-14-hotfix/pr-39386
fix: Cancel asset capitalisation record on cancellation of asset and vice-versa (backport #39386)
|
2024-01-17 21:05:42 +05:30 |
|
Nabin Hait
|
4edb73d398
|
fix: resolved merge conflict
|
2024-01-17 17:36:42 +05:30 |
|
Nabin Hait
|
82732f976a
|
Merge pull request #39432 from frappe/revert-39419-mergify/bp/version-14-hotfix/pr-39385
Revert "fix: WDV as per IT Act: calculate yearly amount first and then split it based on months (backport #39385)"
|
2024-01-17 17:32:38 +05:30 |
|
Nabin Hait
|
8014839795
|
Revert "fix: WDV as per IT Act: calculate yearly amount first and then split it based on months (backport #39385)"
|
2024-01-17 17:32:14 +05:30 |
|
Nabin Hait
|
8d1164f652
|
Merge pull request #39419 from frappe/mergify/bp/version-14-hotfix/pr-39385
fix: WDV as per IT Act: calculate yearly amount first and then split it based on months (backport #39385)
|
2024-01-17 17:29:32 +05:30 |
|
Nabin Hait
|
1dff96057c
|
fix: Cancel asset capitalisation record on cancellation of asset and vice-versa
(cherry picked from commit efe9f6656f)
# Conflicts:
# erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
|
2024-01-17 06:44:52 +00:00 |
|
Nabin Hait
|
3989b97579
|
fix: WDV as per IT Act: calculate yearly amount first and then split it based on months
(cherry picked from commit 22bd6a54b2)
# Conflicts:
# erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
|
2024-01-17 06:44:25 +00:00 |
|
Deepesh Garg
|
bee90e56f5
|
Merge pull request #39410 from ljain112/fix-pr
fix(Purchase Register): show bill_date and bill_no (#38742)
|
2024-01-17 11:00:24 +05:30 |
|
ruthra kumar
|
5693979165
|
Merge pull request #39411 from frappe/mergify/bp/version-14-hotfix/pr-39402
fix: project query controller logic (backport #39402)
|
2024-01-17 10:57:36 +05:30 |
|
ruthra kumar
|
42c1de640c
|
chore: resolve conflict
|
2024-01-17 10:36:29 +05:30 |
|
ruthra kumar
|
b35a83ee47
|
refactor: better ordering of query result
(cherry picked from commit bfe42fdccb)
# Conflicts:
# erpnext/controllers/queries.py
|
2024-01-16 10:55:31 +00:00 |
|