ruthra kumar
|
e70f0f6d8d
|
refactor: handle dynamic dimension in order query
(cherry picked from commit 7c2cb70387)
|
2024-01-23 11:59:31 +00:00 |
|
ruthra kumar
|
9a3bde9350
|
refactor: update dimensions, only if provided
(cherry picked from commit ec0f17ca8b)
|
2024-01-23 11:59:31 +00:00 |
|
ruthra kumar
|
51bc225fe5
|
refactor: dynamic dimension filters in pop up
(cherry picked from commit f8bbb0619c)
|
2024-01-23 11:59:31 +00:00 |
|
ruthra kumar
|
15db7b8ae4
|
test: dimension inheritance on adv allocation
(cherry picked from commit fcf4687c52)
|
2024-01-23 11:59:30 +00:00 |
|
ruthra kumar
|
d4828f3cf5
|
refactor: pass dimensions on advance allocation
(cherry picked from commit cbd443a78a)
|
2024-01-23 11:59:30 +00:00 |
|
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 |
|
Frappe PR Bot
|
26ca27a431
|
chore(release): Bumped to Version 14.61.1
## [14.61.1](https://github.com/frappe/erpnext/compare/v14.61.0...v14.61.1) (2024-01-23)
### Bug Fixes
* linting issue ([6895b74](6895b74ecc))
* party field in pdf html ([a19b41d](a19b41d8c8))
* set unallocated amount after base tax ([f7ba736](f7ba7361ca))
* UOM needs to be whole number not being checked in quotations ([55c9cc3](55c9cc3f26))
* use most reliable section reference per report line ([3bdff18](3bdff18467))
v14.61.1
|
2024-01-23 11:54:25 +00:00 |
|
ruthra kumar
|
f8f3c917d2
|
Merge pull request #39506 from frappe/version-14-hotfix
chore: release v14
|
2024-01-23 17:23:12 +05:30 |
|
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 |
|
Frappe PR Bot
|
9aa1e7444e
|
chore(release): Bumped to Version 14.61.0
# [14.61.0](https://github.com/frappe/erpnext/compare/v14.60.1...v14.61.0) (2024-01-17)
### Bug Fixes
* added indexing to improve performance ([d9f7070](d9f7070f92))
* added item group in stock reco ([c69a59c](c69a59c3c6))
* broken dimension filters in Sales/Purchase register ([298cdf5](298cdf5f0e))
* Cancel asset capitalisation record on cancellation of asset and vice-versa ([1dff960](1dff96057c))
* circular dependency error while deleting QC ([dfcb746](dfcb746774))
* composite asset capitalization using asset components ([ac6020a](ac6020a940))
* consider all years in holiday list ([3180266](3180266150))
* date in master document for dictionary condition ([670d615](670d61547f))
* empty category in Plaid ([1acaa20](1acaa20ee1))
* ignore cancelled payments in Sales/Purchase Register ([36b8e97](36b8e972f1))
* incorrect active serial nos due to backdated transactions ([1a26c70](1a26c70df2))
* incorrect percentage received in purchase invoice ([453700d](453700d0ab))
* incorrect sql error if account name has '%' ([d0e3458](d0e3458c8c))
* modified date ([e9d2437](e9d2437c7a))
* modified date ([28434d1](28434d101b))
* modified date was not set ([724c934](724c934fbb))
* modified date was not updated ([cb67574](cb6757437e))
* pass accounts as list to query ([a6bc5ca](a6bc5cae90))
* performance issue related to stock entry (backport [#39301](https://github.com/frappe/erpnext/issues/39301)) ([#39302](https://github.com/frappe/erpnext/issues/39302)) ([dc7c9e7](dc7c9e7aff))
* possible typeerror in consolidated report ([9395f75](9395f7535b))
* possible typerror in utils.js ([4ea72f4](4ea72f4b69))
* project filters on Delivery Note and Sales Order ([520cdb6](520cdb6f32))
* project query controller logic ([f2e577b](f2e577bec7))
* reset default after test ([6bd01f2](6bd01f227e))
* resolved merge conflict ([4edb73d](4edb73d398))
* show bill_date and bill_no in Purchase Register ([4b19792](4b197920c1))
* **test:** test case for project query ([98967ed](98967ed584))
* unreconcile Bank Transaction on cancel of payment voucher ([755576b](755576bd78))
* use child table values instead of global min max ([d21fc60](d21fc6055c))
* WDV as per IT Act: calculate yearly amount first and then split it based on months ([3989b97](3989b97579))
* wrong file name ([9d256e1](9d256e131d))
### Features
* provision to select the qty field for Product Page ([#39292](https://github.com/frappe/erpnext/issues/39292)) ([d42db11](d42db1174d))
v14.61.0
|
2024-01-17 17:05:44 +00:00 |
|
Deepesh Garg
|
e74e5875ea
|
Merge pull request #39404 from frappe/version-14-hotfix
chore: release v14
|
2024-01-17 22:34:31 +05:30 |
|
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 |
|