Rohit Waghchaure
96e1db80ac
fix: added button to make serial / batch from Purchase Invoice
...
(cherry picked from commit b4393bc03d68769f57678bb56a09baf7b4ec3dc0)
2024-01-21 16:53:46 +00:00
rohitwaghchaure
35d3edfca4
Merge pull request #39477 from frappe/mergify/bp/version-15-hotfix/pr-39475
...
fix: key error during reposting (backport #39475 )
2024-01-21 22:23:26 +05:30
Rohit Waghchaure
b4981f8816
fix: key error during reposting
...
(cherry picked from commit ebc8230d4564385b151e19f21d57172afe803108)
2024-01-21 14:22:36 +00:00
Gursheen Kaur Anand
7c666435a2
Merge pull request #39474 from frappe/mergify/bp/version-15-hotfix/pr-39229
...
fix: use most reliable section reference per report line (backport #39229 )
2024-01-21 14:23:12 +05:30
David Arnold
b388adcb2e
fix: use most reliable section reference per report line
...
(cherry picked from commit b5be17c6dfc9ab10e9eb57669f697fbb5576489c)
2024-01-21 08:14:55 +00:00
Gursheen Kaur Anand
3ba413a150
Merge pull request #39471 from frappe/mergify/bp/version-15-hotfix/pr-39424
...
Revert "fix(minor): financial statements period end date" (backport #39424 )
2024-01-20 18:51:34 +05:30
Gursheen Kaur Anand
ddb84d9036
Revert "fix(minor): financial statements period end date"
...
(cherry picked from commit 73625a2622f29a83c98179c0b5048a29e61ce243)
2024-01-20 12:29:27 +00:00
mergify[bot]
00a3ee313b
refactor(UX): Accounts workspace cleanup (backport #39232 ) ( #39456 )
...
* refactor(UX): Accounts workspace cleanup (#39232 )
* refactor(UX): Accounts workspace cleanup
* chore: move asset workspace outside accounting
* fix: remove redundant links from parent workspace
* chore: change icons for payable & receivable workspaces
* chore: remove redundant links from subworkspaces
(cherry picked from commit 35067282cfeaf88a1e4251e3725f7557d3b2d356)
* chore: fix conflicts
---------
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2024-01-19 12:40:25 +05:30
Gursheen Kaur Anand
f8d7ca515c
Merge pull request #39451 from frappe/mergify/bp/version-15-hotfix/pr-39449
...
fix: unallocated amount after taxes and charges (backport #39449 )
2024-01-19 10:57:35 +05:30
Gursheen Anand
86f3f62e00
fix: linting issue
...
(cherry picked from commit 99b94af49ffd34bccb76b73c2f06187540444a44)
2024-01-18 10:45:49 +00:00
Gursheen Anand
74613c7fe8
fix: set unallocated amount after base tax
...
(cherry picked from commit e9bc63aacf20dd83cb7e15494bb8f2f025491991)
2024-01-18 10:45:49 +00:00
rohitwaghchaure
3244ef3a68
Merge pull request #39443 from frappe/mergify/bp/version-15-hotfix/pr-39436
...
fix: duplicate name error while making variant (backport #39436 )
2024-01-18 06:52:17 +05:30
Rohit Waghchaure
b649c50ecc
fix: duplicate name error while making variant
...
(cherry picked from commit d7e6b83e6432a6c46ce6e374252d25c0438c2205)
2024-01-18 01:21:52 +00:00
Nabin Hait
6509548474
Merge pull request #39438 from frappe/mergify/bp/version-15-hotfix/pr-39429
...
fix: composite asset capitalization using asset components (backport #39429 )
2024-01-17 22:13:50 +05:30
mergify[bot]
c8b3478fe1
Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-39429
2024-01-17 16:26:04 +00:00
Nabin Hait
f453aaeab0
Merge pull request #39439 from nabinhait/test-case-fix-asset-depr
...
fix: test for asset depreciation
2024-01-17 21:54:55 +05:30
Nabin Hait
ff1647a1d2
fix: test for asset depreciation
2024-01-17 21:53:00 +05:30
Nabin Hait
8bc8bc1822
fix: composite asset capitalization using asset components
...
(cherry picked from commit 5df40661d2d857eeb987e51ea6f4b465aa3d502e)
2024-01-17 15:36:04 +00:00
Nabin Hait
9f86b92eb7
Merge pull request #39431 from frappe/mergify/bp/version-15-hotfix/pr-39427
...
fix: Asset module tests (backport #39427 )
2024-01-17 17:38:46 +05:30
Nabin Hait
04c8e9b355
Merge pull request #39422 from frappe/mergify/bp/version-15-hotfix/pr-39386
...
fix: Cancel asset capitalisation record on cancellation of asset and vice-versa (backport #39386 )
2024-01-17 17:33:21 +05:30
Nabin Hait
fbfd0a6db0
Merge pull request #39420 from frappe/mergify/bp/version-15-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:12 +05:30
Nabin Hait
9e33216c24
fix: Asset module tests
...
(cherry picked from commit 97f69986ff3c56c032fe32d554b9f162df3f8b33)
2024-01-17 11:56:41 +00:00
Deepesh Garg
62f7d984be
Merge pull request #39425 from frappe/mergify/bp/version-15-hotfix/pr-39423
...
fix: Update subscription period (#39423 )
2024-01-17 15:03:51 +05:30
Deepesh Garg
e219042304
fix: Update subscription period
...
(cherry picked from commit 7eefedfb119bcd8d01bbad2e43d87f5ed3b707ee)
2024-01-17 07:28:57 +00:00
Nabin Hait
011c5a69f0
fix: Cancel asset capitalisation record on cancellation of asset and vice-versa
...
(cherry picked from commit efe9f6656f01c46a6ac02e3bb61851564670d6bc)
2024-01-17 06:45:39 +00:00
Nabin Hait
e3cd35b959
fix: WDV as per IT Act: calculate yearly amount first and then split it based on months
...
(cherry picked from commit 22bd6a54b24129403e0b399938bddcaa9d630cae)
2024-01-17 06:44:26 +00:00
mergify[bot]
53f61f1ad1
fix: consistency in display reserved_stock checkbox on Sales Order Item according global settings and item.is_stock_item (backport #38322 ) ( #39417 )
...
fix: consistency in display reserved_stock checkbox on Sales Order Item according global settings and item.is_stock_item (#38322 )
* fix: consistency in display reserved_stock checkbox on Sales Order Item according global settings and item.is_stock_item
* fix: evaluate depends_on for fdata visibility in grid
* fix: evaluate depends_on for fdata visibility in grid
* chore: change after review
* chore: change for review
(cherry picked from commit af80d253dbf5d1502f3df4a18b234d392bd96556)
Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
2024-01-17 10:45:57 +05:30
rohitwaghchaure
c939aa5cf8
Merge pull request #39409 from frappe/mergify/bp/version-15-hotfix/pr-39406
...
fix: permission issue for the Bin (backport #39406 )
2024-01-16 16:55:50 +05:30
ruthra kumar
93a861fac5
Merge pull request #39412 from frappe/mergify/bp/version-15-hotfix/pr-39402
...
fix: project query controller logic (backport #39402 )
2024-01-16 16:49:56 +05:30
ruthra kumar
5a65a10dba
refactor: better ordering of query result
...
(cherry picked from commit bfe42fdccb13ab797ac7252ada58df49af43ad54)
2024-01-16 10:55:36 +00:00
ruthra kumar
1b8f572e80
fix(test): test case for project query
...
(cherry picked from commit 3349dde5e2914bd9e2dbe0ce4de94023bfee2e7f)
2024-01-16 10:55:36 +00:00
ruthra kumar
07e2901e4b
fix: project query controller logic
...
(cherry picked from commit 4eefb445a748100f3c36094188e38c127ad80051)
2024-01-16 10:55:35 +00:00
Rohit Waghchaure
8816b2740a
fix: permission issue for the BIN
...
(cherry picked from commit 6e4d4a55cd70964d8ab8870105591abaa1b17b9e)
2024-01-16 10:22:22 +00:00
ruthra kumar
bcf8053fd9
Merge pull request #39383 from frappe/mergify/bp/version-15-hotfix/pr-39332
...
refactor: prevent foreign currency subscription for a party (backport #39332 )
2024-01-16 11:19:37 +05:30
ruthra kumar
cd1820f680
refactor(test): set default currency for party
2024-01-16 10:47:51 +05:30
ruthra kumar
235e3893a0
Merge pull request #39393 from frappe/mergify/bp/version-15-hotfix/pr-39391
...
fix: possible typerror in utils.js (backport #39391 )
2024-01-15 20:49:48 +05:30
ruthra kumar
80956b7956
fix: possible typerror in utils.js
...
and remove unwanted debugging statements
(cherry picked from commit 60b26ad8b262752e7d491b3fe21b398c0928bfaf)
2024-01-15 15:16:51 +00:00
Nabin Hait
9897c26ae6
Merge pull request #39285 from frappe/mergify/bp/version-15-hotfix/pr-39052
...
fix: asset WDV depreciation calc according to IT act [dev] (backport #39052 )
2024-01-15 16:58:45 +05:30
ruthra kumar
32afe7de31
refactor(test): supply default currency for subscription plans
...
(cherry picked from commit 1387b0ba7f9edf71f838a270e5c8aa40b30b3a70)
2024-01-15 09:36:50 +00:00
ruthra kumar
c288db0356
refactor: making currency mandatory for subcscription plans
...
(cherry picked from commit 19975dcb7bb688f5b93b8e7757d6a906cb68a2bc)
2024-01-15 09:36:50 +00:00
ruthra kumar
61f073f8b1
refactor: prevent foreign currency subscription for a party
...
(cherry picked from commit 6b5fa2c673accab13a174a2945b333bd1b991cdb)
2024-01-15 09:36:49 +00:00
mergify[bot]
e282ba78c1
ci: bump node in release workflow (backport #39377 ) ( #39378 )
...
* ci: bump node in release workflow
(cherry picked from commit aef87cced7da0524c7ca2dadfcd111aaf13ef0c2)
# Conflicts:
# .github/workflows/release.yml
* chore: `conflicts`
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2024-01-15 12:08:44 +05:30
ruthra kumar
1b8b92b8d7
Merge pull request #39376 from frappe/mergify/bp/version-15-hotfix/pr-39336
...
refactor: disallow bank transactions on different currencies (backport #39336 )
2024-01-15 10:41:26 +05:30
ruthra kumar
f2e19ca6fd
Merge pull request #39375 from frappe/mergify/bp/version-15-hotfix/pr-39371
...
fix: incorrect sql error if account name has '%' (backport #39371 )
2024-01-15 10:40:54 +05:30
ruthra kumar
32c6111728
refactor(test): supply default currency to Bank Transaction
...
(cherry picked from commit a27a4db3de6d6df7dd340d4212c114b7f4c0762c)
2024-01-15 04:32:46 +00:00
ruthra kumar
f609b8ae5d
refactor: better error message
...
(cherry picked from commit b4354cbc8dfb22fafaed2cd39b92c438e5f199db)
2024-01-15 04:32:46 +00:00
ruthra kumar
dbbba046ab
refactor: disallow bank transactions on different currencies
...
(cherry picked from commit cdd0acc672e471d94693c04079ab78ba48b82a30)
2024-01-15 04:32:45 +00:00
ruthra kumar
b43f70325c
fix: incorrect sql error if account name has '%'
...
(cherry picked from commit 641c3de0caf3dd542a353edd78c8c18f686b8cae)
2024-01-15 04:10:40 +00:00
rohitwaghchaure
3f5b1bcd05
Merge pull request #39373 from frappe/mergify/bp/version-15-hotfix/pr-39372
...
fix: batches not coming correctly in the batch selector (backport #39372 )
2024-01-15 06:34:11 +05:30
Rohit Waghchaure
1394a1c5e9
fix: batches not coming correctly in the batch selector
...
(cherry picked from commit 114f2b432628b55201dfbfcac8c4e6a65c577cc7)
2024-01-14 18:19:30 +00:00
