ruthra kumar
10488520e7
test: future payment with foreign currency
...
(cherry picked from commit 7b37389115cd10aac154c292e7b34fcefd4d7ba2)
2024-01-27 07:23:17 +00:00
ruthra kumar
9e15a3c981
refactor: do currency conversion on future amount columns
...
(cherry picked from commit 0de4197c886f6dfa500c0b3f1869c13cc3807aaf)
2024-01-27 07:23:16 +00:00
Deepesh Garg
ab99414242
Merge pull request #39577 from frappe/mergify/bp/version-15-hotfix/pr-39511
...
refactor(Sales Invoice): set account and sum for payments (#39511 )
2024-01-26 10:04:23 +05:30
barredterra
4fc3a264f9
refactor(Sales Invoice): set account for mode of payment
...
(cherry picked from commit 3815f07c33d9c84230304d53a735d8f580f3288e)
2024-01-26 04:15:14 +00:00
Deepesh Garg
5df2f5d523
feat: In words in payment entry
...
(cherry picked from commit b21da472f6e106ea7b2430c285ce24400a0208dd)
2024-01-26 04:01:45 +00:00
Dany Robert
ed032b3224
chore: avoid explicit escaping for precision
...
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit a8949174c878499e14228517abe66050f9b9ddb9)
2024-01-25 07:00:45 +00:00
Dany Robert
8b7900e6a7
chore: change f-string to sql params
...
(cherry picked from commit 383a4b132ed5cc3383b035de8c22ba759b1e1241)
2024-01-25 07:00:45 +00:00
Dany Robert
e0a38207f6
fix: honour currency precision while fetching balance
...
(cherry picked from commit bfaa93b0ca641352917be16a50e602a7fe458386)
2024-01-25 07:00:45 +00:00
Gursheen Anand
e2d85c513c
fix: skip liability account for internal transfer
...
(cherry picked from commit 236b73565e6889aaa7027929f770918e89bca7fc)
2024-01-24 05:04:45 +00:00
Gursheen Anand
9a0834987c
fix: party field in pdf html
...
(cherry picked from commit b2d9380596dd8ca134777148337ef039f10cc2ca)
2024-01-22 09:51:29 +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
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
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 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
Nabin Hait
9e33216c24
fix: Asset module tests
...
(cherry picked from commit 97f69986ff3c56c032fe32d554b9f162df3f8b33)
2024-01-17 11:56:41 +00:00
Deepesh Garg
e219042304
fix: Update subscription period
...
(cherry picked from commit 7eefedfb119bcd8d01bbad2e43d87f5ed3b707ee)
2024-01-17 07:28:57 +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
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
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
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
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
Deepesh Garg
7ca9ffbaa7
Merge pull request #39329 from frappe/mergify/bp/version-15-hotfix/pr-38974
...
fix: unreconciled Bank Transaction on cancel of payment voucher (#38974 )
2024-01-14 17:55:32 +05:30
rohitwaghchaure
cd870ee30c
fix: modified date
...
(cherry picked from commit 6827edb2c51ffe44f5af32fc63e065481bb85662)
2024-01-14 05:57:45 +00:00
rohitwaghchaure
2dc8686a81
fix: modified date was not set
...
(cherry picked from commit 566876ae7a9ac4ce70f0c72dd69c933ed022bf46)
2024-01-14 05:57:44 +00:00
mahsem
6bdf944ecf
Update purchase_taxes_and_charges.json label Rate to Tax Rate
...
Change Rate label to existing Tax Rate label so it can be correctly translated in other languages
(cherry picked from commit bd464197c41329ddf3cff50cd3eb876df9c6c382)
2024-01-14 05:57:44 +00:00
rohitwaghchaure
f0480173fb
fix: modified date
2024-01-14 10:43:34 +05:30
rohitwaghchaure
61595c7ede
fix: modified date was not updated
...
(cherry picked from commit f567af49a697568ba1d5dc3507953c332cb1a60a)
2024-01-14 04:46:29 +00:00
mahsem
d510b46f13
Update sales_taxes_and_charges.json
...
Change Rate label to existing Tax Rate label so it can be correctly translated in other languages
(cherry picked from commit 2b93be1139bcb963a89c10f261a1dd2c83f01980)
2024-01-14 04:46:29 +00:00
barredterra
6b2e3503d9
chore: resolve merge confilcts
2024-01-11 14:56:20 +01:00
barredterra
b2fc5e4988
test: cancel voucher linked to Bank Transaction
...
(cherry picked from commit 517bedeb7ee68d7794d09a5f49b97ab64f652abf)
2024-01-11 13:37:48 +00:00
barredterra
16860c228d
fix: unreconcile Bank Transaction on cancel of payment voucher
...
(cherry picked from commit 0a95b38166e36946f89286d39081b0f529e88cb6)
# Conflicts:
# erpnext/accounts/doctype/bank_transaction/bank_transaction.py
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
# erpnext/accounts/doctype/sales_invoice/sales_invoice.js
2024-01-11 13:37:48 +00:00
Gursheen Anand
e6f3a14289
fix: reset default after test
...
(cherry picked from commit 813b7a96fbb0ff048c112dec5551edf5980d0955)
2024-01-11 13:27:13 +00:00
Gursheen Anand
2beb3f8718
test: naming series variable parsing
...
(cherry picked from commit bbdf98a8f0a53b0b4c5a73eb1842401d67314760)
2024-01-11 13:27:06 +00:00
Gursheen Anand
9aae439b1f
fix: date in master document for dictionary condition
...
(cherry picked from commit d96a777edd9cad698b9d9bb90863c1080eacb36f)
2024-01-11 13:27:02 +00:00
Nabin Hait
b748095589
Merge pull request #39220 from frappe/mergify/bp/version-15-hotfix/pr-39202
...
fix: parse naming series with FY name (backport #39202 )
2024-01-11 18:24:34 +05:30
ruthra kumar
04037b7e38
fix: broken dimension filters in Sales/Purchase register
...
(cherry picked from commit 7b3f9386d7af54181a59c42e9e07ee3d6f54903e)
2024-01-11 11:20:43 +00:00
Rohit Waghchaure
758b9b8a81
fix: incorrect percentage received in purchase invoice
...
(cherry picked from commit 8d2c78867e1d563aafa740b3dc5f8a4fae68e52f)
2024-01-11 09:21:41 +00:00
mergify[bot]
2598f8e7ec
fix: Show timesheet table after fetching data from timesheet (backport #39275 ) ( #39281 )
...
fix: Show timesheet table after fetching data from timesheet
(cherry picked from commit e1ba5878a3c61d44006dbc5f1f269e6a2542583c)
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2024-01-10 12:33:24 +05:30
Nabin Hait
f0070b4046
fix: Set asset purchase amount based on qty and valuation_rate
...
(cherry picked from commit 135e19d0aab3b1f4ae2361b327c579468d71d6d6)
2024-01-10 06:03:01 +00:00
Raffael Meyer
4fa978ef1f
test: fix wrong fieldname ( #39270 )
2024-01-10 10:32:01 +05:30
mergify[bot]
bb6025ca26
fix: TypeError is pricing rules (backport #39252 ) ( #39260 )
...
fix: TypeError is pricing rules (#39252 )
(cherry picked from commit 274c65c451ccc71f11f29a2abc6d13b2b49b776c)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-09 17:41:53 +05:30
ruthra kumar
a147e2954f
fix: update status on manual allocation
...
(cherry picked from commit d32a407e08609737fa0bc880d5ef737ebf2b3e4c)
2024-01-09 10:29:36 +00:00
