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
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
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
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
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
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
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
9842fb5b64
Merge pull request #39361 from frappe/mergify/bp/version-15-hotfix/pr-39225
...
Update sales_taxes_and_charges.json (backport #39225 )
2024-01-14 11:24:20 +05:30
rohitwaghchaure
c548c57207
Merge pull request #39365 from frappe/mergify/bp/version-15-hotfix/pr-39359
...
fix: added item group in stock reco (backport #39359 )
2024-01-14 11:24:00 +05:30
rohitwaghchaure
f0480173fb
fix: modified date
2024-01-14 10:43:34 +05:30
Rohit Waghchaure
eec6c25f9e
fix: added item group in stock reco
...
(cherry picked from commit 116ff8241caeb98df28c91143a076dfa9e3179d6)
2024-01-14 04:58:42 +00:00
Rohit Waghchaure
bf4e514cde
chore: removed extra field
2024-01-14 10:21:38 +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
rohitwaghchaure
15e116375b
Merge pull request #39325 from frappe/mergify/bp/version-15-hotfix/pr-39305
...
fix: naming series variable parsing for FY (backport #39305 )
2024-01-14 09:39:06 +05:30
s-aga-r
ca18853785
fix: SBB Total Qty validation for SE
...
(cherry picked from commit c20241fcb5d7269c08c38f51c92bf73289650708)
2024-01-12 15:30:36 +00:00
rohitwaghchaure
049864e7a2
Merge pull request #39342 from frappe/mergify/bp/version-15-hotfix/pr-38970
...
fix: use local attribute range in multiple item variant dialog (backport #38970 )
2024-01-12 20:57:14 +05:30
Rohit Waghchaure
50fe4191d3
fix: added indexing to improve performance
...
(cherry picked from commit ac81323fec7287a986feaf7ba496395bf3f6a424)
2024-01-12 13:10:47 +00:00
Gursheen Anand
04c96ddc6c
fix: use child table values instead of global min max
...
(cherry picked from commit 43fed29514c0d839312f33e1d7d490ae73d9830f)
2024-01-12 13:08:31 +00:00
mergify[bot]
d7840559a0
chore: remove share, print and email permissions from Buying Settings (backport #39337 ) ( #39339 )
...
chore: remove share, print and email permissions from Buying Settings
(cherry picked from commit 3c46abca6c362f8ddd7d269d8f28ee07ee557cc8)
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2024-01-12 16:49:00 +05:30
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
barredterra
8a84f8a465
test: improve test for local holidays
...
(cherry picked from commit 60329ade9e4377741ef1578b4a9cc9529e3766c1)
2024-01-11 13:29:01 +00:00
barredterra
21eed78fa1
fix: consider all years in holiday list
...
(cherry picked from commit 300aaa39fecf5b65fadf9ec18d122b6d8e327fca)
2024-01-11 13:29:00 +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
