Rohit Waghchaure
|
98c56535d8
|
fix: email list for auto reorder material request
(cherry picked from commit 764f3422a0826e22d116616daa3849d02cc1e117)
|
2024-01-24 07:07:16 +00:00 |
|
rohitwaghchaure
|
f6a779e1aa
|
Merge pull request #39527 from frappe/mergify/bp/version-15-hotfix/pr-39521
fix: not able to edit address through portal (backport #39521)
|
2024-01-24 12:17:05 +05:30 |
|
Rohit Waghchaure
|
1f5dbebe68
|
fix: not able to edit address through portal
(cherry picked from commit b046d980ad83b906d46515082bd32038daadcb3c)
|
2024-01-24 06:20:31 +00:00 |
|
Gursheen Kaur Anand
|
4073dfb90b
|
Merge pull request #39522 from frappe/mergify/bp/version-15-hotfix/pr-39493
fix: skip setting liability account for internal transfer (backport #39493)
|
2024-01-24 11:08:53 +05:30 |
|
Gursheen Anand
|
e2d85c513c
|
fix: skip liability account for internal transfer
(cherry picked from commit 236b73565e6889aaa7027929f770918e89bca7fc)
|
2024-01-24 05:04:45 +00:00 |
|
rohitwaghchaure
|
880f648846
|
Merge pull request #39513 from frappe/mergify/bp/version-15-hotfix/pr-39503
fix: Serial No Ledger permission issue (backport #39503)
|
2024-01-24 10:27:23 +05:30 |
|
Raffael Meyer
|
84d2a80f30
|
Merge pull request #39516 from frappe/mergify/bp/version-15-hotfix/pr-39512
|
2024-01-23 19:00:53 +01:00 |
|
barredterra
|
fe41e2a341
|
refactor(Batch): use const instead of var
(cherry picked from commit 7a7a2132855e496a0b1d51698cdb7d675c527650)
|
2024-01-23 16:55:27 +00:00 |
|
barredterra
|
a97b8fd876
|
fix(Batch): reload doc after splitting
to show updated qty
(cherry picked from commit 34ec2f8a2b805e63c531ad293f3adb2061c219eb)
|
2024-01-23 16:55:27 +00:00 |
|
barredterra
|
6ed42e939b
|
refactor: split batch
(cherry picked from commit 3c7e7a76f0c89b6bedf0b27062895f05f68c1fa5)
|
2024-01-23 16:55:26 +00:00 |
|
Rohit Waghchaure
|
f9d1995954
|
fix: Serial No Ledger permission issue
(cherry picked from commit 1a670ff266c83ea1b18ede1c504873c08c310de1)
|
2024-01-23 13:37:35 +00:00 |
|
rohitwaghchaure
|
1331fb75a3
|
Merge pull request #39496 from frappe/mergify/bp/version-15-hotfix/pr-39478
fix: UX improvements for Serial and Batch Bundle (backport #39478)
|
2024-01-23 13:18:16 +05:30 |
|
Rohit Waghchaure
|
ca93f671df
|
fix: auto create serial no on scan
(cherry picked from commit fc0d2aeeffed9a2f87be0d87f0a0af0e837c5955)
|
2024-01-23 06:27:59 +00:00 |
|
Rohit Waghchaure
|
c76145985d
|
fix: UX improvements for Serial and Batch Bundle
(cherry picked from commit 5d94f0bde55329411c419c242749e0260d3bb7c9)
|
2024-01-23 06:27:59 +00:00 |
|
rohitwaghchaure
|
a6b4d5b101
|
Merge pull request #39492 from frappe/mergify/bp/version-15-hotfix/pr-39488
fix: UOM needs to be whole number not being checked in quotations (backport #39488)
|
2024-01-23 11:54:54 +05:30 |
|
Rohit Waghchaure
|
c7d5857014
|
fix: UOM needs to be whole number not being checked in quotations
(cherry picked from commit aaf83da3e9a28244c0f57f01a86b98257bdf503b)
|
2024-01-22 11:55:29 +00:00 |
|
Gursheen Kaur Anand
|
b53e072082
|
Merge pull request #39483 from frappe/mergify/bp/version-15-hotfix/pr-39462
fix: party field in PDF for AP / AR reports (backport #39462)
|
2024-01-22 17:05:48 +05:30 |
|
ruthra kumar
|
dc88614f89
|
Merge pull request #39486 from frappe/mergify/bp/version-15-hotfix/pr-39484
refactor: move 'project' set_query to sales_common.js (backport #39484)
|
2024-01-22 16:48:52 +05:30 |
|
ruthra kumar
|
0acbbefa8b
|
refactor: move 'project' set_query to sales_common.js
(cherry picked from commit 52814724eb3e7d0a350ddeb01214ba3855a1ccc9)
|
2024-01-22 10:21:28 +00:00 |
|
Gursheen Anand
|
9a0834987c
|
fix: party field in pdf html
(cherry picked from commit b2d9380596dd8ca134777148337ef039f10cc2ca)
|
2024-01-22 09:51:29 +00:00 |
|
ruthra kumar
|
3e9449d511
|
Merge pull request #39480 from frappe/mergify/bp/version-15-hotfix/pr-39457
refactor: delete transactions in background (backport #39457)
|
2024-01-22 10:44:04 +05:30 |
|
ruthra kumar
|
80e3597338
|
refactor: delete transactions in background
(cherry picked from commit a50808a077b8d6475ff360b611cd5f0a8cb37d65)
|
2024-01-22 04:28:27 +00:00 |
|
rohitwaghchaure
|
3c84d5ec02
|
Merge pull request #39479 from frappe/mergify/bp/version-15-hotfix/pr-39476
fix: added button to make serial / batch from Purchase Invoice (backport #39476)
|
2024-01-22 07:36:55 +05:30 |
|
Rohit Waghchaure
|
b0e872aad4
|
test: fixed test
(cherry picked from commit 63ffce58cce6c68c210572287024da9ca414aca9)
|
2024-01-21 16:53:46 +00:00 |
|
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 |
|