mergify[bot]
|
a118417645
|
refactor: provision to filter on dimensions in reconciliation tool (#39054)
* refactor: dimensions section in allocation table in reconciliation
(cherry picked from commit 1cde804c773de41520a6148e7d99ab0c23c39ae1)
# Conflicts:
# erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
* refactor: update dimension doctypes in hooks
(cherry picked from commit cfb3d872673844f04f5c9dd3f7d7f56288e5dd22)
* refactor: dimensions filter section in payment reconciliation
(cherry picked from commit 20e0acc20a218029d7101a1ba6ff3c1ae03fac02)
* refactor: column break in dimension section
(cherry picked from commit 20576e0f47ba3c4937121bfab1e0d8d395a590ce)
# Conflicts:
# erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
* refactor: handle dimension filters
(cherry picked from commit c1fe4bcc64775507a3bd8e02b61274d8dc2d6447)
* refactor: pass dimension filters to query
(cherry picked from commit ff60ec85b85d5548886e247b72cf1262587feba3)
* refactor: set query filters for dimensions
(cherry picked from commit ad8475cb8b24d40b04f86903feee08ecac6aa1f1)
* refactor: pass dimension details to query
(cherry picked from commit 5dc22e1811bb1841bb8c790cc3a1e1315cef6074)
* refactor: replace sql with query builder for Jourals query
(cherry picked from commit 9c5a79209eb014c90aac46a5dd5ed0d9b7cb8f87)
* refactor: partial change on outstanding invoice popup
(cherry picked from commit 2154502955166243e354897d7dcb22d1987c4693)
* fix: typo's and parameter changes
(cherry picked from commit 0ec17590ae062fbda0c14a2806ec1ac07c638593)
* refactor: Credit Note and its Exc gain/loss JE inherits dimensions
(cherry picked from commit ab939cc6e8ab3669f1e9b0f007e9459be180ac32)
* refactor: apply dimension filters on cr/dr notes
(cherry picked from commit 188ff8cde794bb1ef1043f0e47469d65944aac1e)
* chore: test dimension filter output
(cherry picked from commit e3c44231abbbe389a1f815ab77f2d6ff0c614e1b)
* test: dimension inheritance for cr note reconciliation
(cherry picked from commit ba5a7c8cd8ee6fc09b0d81ffbe8b364e584f1f1b)
* refactor: pass dimension values to Gain/Loss journal
(cherry picked from commit c44eb432a59fb3ffb3748e47356068499f1129b1)
# Conflicts:
# erpnext/accounts/utils.py
* test: dimension inheritance in PE reconciliation
(cherry picked from commit 6148fb024b7157d637aa2308e7c856969858468d)
* refactor: pass dimensions on advance allocation
(cherry picked from commit cbd443a78afbc7c58055881e534a8aa56ca4bea6)
* test: dimension inheritance on adv allocation
(cherry picked from commit fcf4687c523202436234814af3da4c4d84f5eba9)
* refactor: dynamic dimension filters in pop up
(cherry picked from commit f8bbb0619cbbbaace8f54a9f8758c3962ebe4725)
* refactor: update dimensions, only if provided
(cherry picked from commit ec0f17ca8bd810e41ae73f5a45f304ba38c63d0a)
* refactor: handle dynamic dimension in order query
(cherry picked from commit 7c2cb70387d7dbb7f976d28919ce21f25a0b6acd)
* chore: resolve conflicts
---------
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
|
2024-01-28 13:50:08 +05:30 |
|
ruthra kumar
|
0366928db5
|
test: cost center inheritance from payment
|
2023-09-03 09:21:26 +05:30 |
|
ruthra kumar
|
79fa562004
|
test: extend test to cancellation
|
2023-09-02 14:43:25 +05:30 |
|
ruthra kumar
|
cb6da6ec59
|
test: deduplicate gain/loss JE on reconciling journals against inv
|
2023-09-02 13:29:33 +05:30 |
|
ruthra kumar
|
466734fb4b
|
fix(test): replace hardcoded reference to adv with dynamic one
|
2023-08-05 14:11:57 +05:30 |
|
ruthra kumar
|
804afaa647
|
chore(test): use existing company for unit test
|
2023-07-27 09:30:38 +05:30 |
|
ruthra kumar
|
47bbb37291
|
chore: use frappetestcase
|
2023-07-27 05:54:13 +05:30 |
|
ruthra kumar
|
ae424fdfed
|
test: assert ledger after cr note cancellation
|
2023-07-26 22:33:58 +05:30 |
|
ruthra kumar
|
e3d2a2c5bd
|
test: cr notes against invoice
|
2023-07-26 22:33:58 +05:30 |
|
ruthra kumar
|
70dd9d0671
|
chore(test): fix broken unit test
|
2023-07-26 22:33:58 +05:30 |
|
ruthra kumar
|
f3363e813a
|
test: journals against sales invoice
|
2023-07-26 22:33:58 +05:30 |
|
ruthra kumar
|
5695d6a5a6
|
refactor: unit tests for journals
|
2023-07-26 22:33:58 +05:30 |
|
ruthra kumar
|
73cc1ba654
|
refactor: assert payment ledger outstanding in both currencies
|
2023-07-26 22:33:58 +05:30 |
|
ruthra kumar
|
6e18bb6456
|
refactor: cancel gain/loss JE on Journal as payment cancellation
|
2023-07-26 22:33:58 +05:30 |
|
ruthra kumar
|
5e1cd1f227
|
test: different scenarios for exchange booking
|
2023-07-26 22:33:58 +05:30 |
|