Frappe PR Bot
550213b4f4
chore(release): Bumped to Version 15.10.3
...
## [15.10.3](https://github.com/frappe/erpnext/compare/v15.10.2...v15.10.3 ) (2024-01-19)
### Bug Fixes
* duplicate name error while making variant ([0c222aa ](0c222aa504 ))
2024-01-19 00:44:51 +00:00
rohitwaghchaure
a962657c7b
Merge pull request #39444 from frappe/mergify/bp/version-15/pr-39443
...
fix: duplicate name error while making variant (backport #39436 ) (backport #39443 )
2024-01-19 06:13:35 +05:30
Rohit Waghchaure
0c222aa504
fix: duplicate name error while making variant
...
(cherry picked from commit d7e6b83e64 )
(cherry picked from commit b649c50ecc )
2024-01-18 01:24:00 +00:00
Frappe PR Bot
d5c26efb8c
chore(release): Bumped to Version 15.10.2
...
## [15.10.2](https://github.com/frappe/erpnext/compare/v15.10.1...v15.10.2 ) (2024-01-17)
### Bug Fixes
* added indexing to improve performance ([50fe419 ](50fe4191d3 ))
* added item group in stock reco ([eec6c25 ](eec6c25f9e ))
* Asset module tests ([9e33216 ](9e33216c24 ))
* asset WDV depreciation calc according to IT act ([2448ba6 ](2448ba6bc4 ))
* batches not coming correctly in the batch selector ([1394a1c ](1394a1c5e9 ))
* broken dimension filters in Sales/Purchase register ([04037b7 ](04037b7e38 ))
* Cancel asset capitalisation record on cancellation of asset and vice-versa ([011c5a6 ](011c5a69f0 ))
* circular dependency error while deleting QC ([7ca8e49 ](7ca8e49b38 ))
* composite asset capitalization using asset components ([8bc8bc1 ](8bc8bc1822 ))
* consider all years in holiday list ([21eed78 ](21eed78fa1 ))
* consistency in display reserved_stock checkbox on Sales Order Item according global settings and item.is_stock_item (backport [#38322 ](https://github.com/frappe/erpnext/issues/38322 )) ([#39417 ](https://github.com/frappe/erpnext/issues/39417 )) ([53f61f1 ](53f61f1ad1 ))
* date in master document for dictionary condition ([9aae439 ](9aae439b1f ))
* fetch name for fy ([53208df ](53208dfb3e ))
* Ignore default payment terms template for opening invoices ([5dc2e80 ](5dc2e80987 ))
* incorrect percentage received in purchase invoice ([758b9b8 ](758b9b8a81 ))
* incorrect sql error if account name has '%' ([b43f703 ](b43f70325c ))
* modified date ([cd870ee ](cd870ee30c ))
* modified date ([f048017 ](f0480173fb ))
* modified date was not set ([2dc8686 ](2dc8686a81 ))
* modified date was not updated ([61595c7 ](61595c7ede ))
* performance issue related to stock entry (backport [#39301 ](https://github.com/frappe/erpnext/issues/39301 )) ([#39303 ](https://github.com/frappe/erpnext/issues/39303 )) ([d882305 ](d882305c72 ))
* permission issue for the BIN ([8816b27 ](8816b2740a ))
* possible typerror in utils.js ([80956b7 ](80956b7956 ))
* project filters on Delivery Note and Sales Order ([a51f956 ](a51f956f3e ))
* project query controller logic ([07e2901 ](07e2901e4b ))
* reset default after test ([e6f3a14](e6f3a14289 ))
* SBB Total Qty validation for SE ([ca18853 ](ca18853785 ))
* test for asset depreciation ([ff1647a ](ff1647a1d2 ))
* **test:** test case for project query ([1b8f572 ](1b8f572e80 ))
* unreconcile Bank Transaction on cancel of payment voucher ([16860c2 ](16860c228d ))
* Update subscription period ([e219042 ](e219042304 ))
* use child table values instead of global min max ([04c96dd ](04c96ddc6c ))
* WDV as per IT Act: calculate yearly amount first and then split it based on months ([e3cd35b ](e3cd35b959 ))
2024-01-17 17:06:29 +00:00
Deepesh Garg
e00533ff4e
Merge pull request #39405 from frappe/version-15-hotfix
...
chore: release v15
2024-01-17 22:34:57 +05:30
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 5df40661d2 )
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 97f69986ff )
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 7eefedfb11 )
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 efe9f6656f )
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 22bd6a54b2 )
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 af80d253db )
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 bfe42fdccb )
2024-01-16 10:55:36 +00:00
ruthra kumar
1b8f572e80
fix(test): test case for project query
...
(cherry picked from commit 3349dde5e2 )
2024-01-16 10:55:36 +00:00
ruthra kumar
07e2901e4b
fix: project query controller logic
...
(cherry picked from commit 4eefb445a7 )
2024-01-16 10:55:35 +00:00
Rohit Waghchaure
8816b2740a
fix: permission issue for the BIN
...
(cherry picked from commit 6e4d4a55cd )
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 60b26ad8b2 )
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 1387b0ba7f )
2024-01-15 09:36:50 +00:00
ruthra kumar
c288db0356
refactor: making currency mandatory for subcscription plans
...
(cherry picked from commit 19975dcb7b )
2024-01-15 09:36:50 +00:00
ruthra kumar
61f073f8b1
refactor: prevent foreign currency subscription for a party
...
(cherry picked from commit 6b5fa2c673 )
2024-01-15 09:36:49 +00:00
Frappe PR Bot
8a356cbe51
chore(release): Bumped to Version 15.10.1
...
## [15.10.1](https://github.com/frappe/erpnext/compare/v15.10.0...v15.10.1 ) (2024-01-15)
### Bug Fixes
* SBB Total Qty validation for SE (backport [#39335 ](https://github.com/frappe/erpnext/issues/39335 )) (backport [#39348 ](https://github.com/frappe/erpnext/issues/39348 )) ([#39353 ](https://github.com/frappe/erpnext/issues/39353 )) ([b8f4c31 ](b8f4c3193a ))
2024-01-15 06:47:45 +00:00
mergify[bot]
1503ba92e3
ci: bump node in release workflow (backport #39377 ) (backport #39378 ) ( #39380 )
...
ci: bump node in release workflow (backport #39377 ) (#39378 )
* ci: bump node in release workflow
(cherry picked from commit aef87cced7 )
# Conflicts:
# .github/workflows/release.yml
* chore: `conflicts`
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
(cherry picked from commit e282ba78c1 )
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2024-01-15 12:12:35 +05:30
mergify[bot]
e282ba78c1
ci: bump node in release workflow (backport #39377 ) ( #39378 )
...
* ci: bump node in release workflow
(cherry picked from commit aef87cced7 )
# 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 a27a4db3de )
2024-01-15 04:32:46 +00:00
ruthra kumar
f609b8ae5d
refactor: better error message
...
(cherry picked from commit b4354cbc8d )
2024-01-15 04:32:46 +00:00
ruthra kumar
dbbba046ab
refactor: disallow bank transactions on different currencies
...
(cherry picked from commit cdd0acc672 )
2024-01-15 04:32:45 +00:00
ruthra kumar
b43f70325c
fix: incorrect sql error if account name has '%'
...
(cherry picked from commit 641c3de0ca )
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 114f2b4326 )
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
137ce76a35
Merge pull request #39369 from frappe/mergify/bp/version-15-hotfix/pr-39224
...
Update purchase_taxes_and_charges.json label Rate to Tax Rate (backport #39224 )
2024-01-14 11:59:41 +05:30
rohitwaghchaure
cd870ee30c
fix: modified date
...
(cherry picked from commit 6827edb2c5 )
2024-01-14 05:57:45 +00:00
rohitwaghchaure
2dc8686a81
fix: modified date was not set
...
(cherry picked from commit 566876ae7a )
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 bd464197c4 )
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
cb326ac0db
Merge pull request #39362 from rohitwaghchaure/fixed-closing-stock-balance-field-issue
...
chore: removed extra field
2024-01-14 10:44:47 +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 116ff8241c )
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 f567af49a6 )
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 2b93be1139 )
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
mergify[bot]
b8f4c3193a
fix: SBB Total Qty validation for SE (backport #39335 ) (backport #39348 ) ( #39353 )
...
fix: SBB Total Qty validation for SE
(cherry picked from commit c20241fcb5 )
(cherry picked from commit ca18853785 )
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2024-01-13 10:25:53 +05:30
rohitwaghchaure
832aa5f5ab
Merge pull request #39348 from frappe/mergify/bp/version-15-hotfix/pr-39335
...
fix: SBB Total Qty validation for SE (backport #39335 )
2024-01-12 21:19:26 +05:30
s-aga-r
ca18853785
fix: SBB Total Qty validation for SE
...
(cherry picked from commit c20241fcb5 )
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
rohitwaghchaure
62db0d77ca
Merge pull request #39345 from frappe/mergify/bp/version-15-hotfix/pr-39333
...
fix: added indexing to improve performance (backport #39333 )
2024-01-12 20:55:57 +05:30
Rohit Waghchaure
50fe4191d3
fix: added indexing to improve performance
...
(cherry picked from commit ac81323fec )
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 43fed29514 )
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 3c46abca6c )
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2024-01-12 16:49:00 +05:30
Raffael Meyer
6f06313023
Merge pull request #39327 from frappe/mergify/bp/version-15-hotfix/pr-39117
...
fix: consider all years in holiday list (backport #39117 )
2024-01-11 15:04:29 +01: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 517bedeb7e )
2024-01-11 13:37:48 +00:00
barredterra
16860c228d
fix: unreconcile Bank Transaction on cancel of payment voucher
...
(cherry picked from commit 0a95b38166 )
# 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 60329ade9e )
2024-01-11 13:29:01 +00:00
barredterra
21eed78fa1
fix: consider all years in holiday list
...
(cherry picked from commit 300aaa39fe )
2024-01-11 13:29:00 +00:00
Gursheen Anand
e6f3a14289
fix: reset default after test
...
(cherry picked from commit 813b7a96fb )
2024-01-11 13:27:13 +00:00
Gursheen Anand
2beb3f8718
test: naming series variable parsing
...
(cherry picked from commit bbdf98a8f0 )
2024-01-11 13:27:06 +00:00
Gursheen Anand
9aae439b1f
fix: date in master document for dictionary condition
...
(cherry picked from commit d96a777edd )
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
7bd2acdef1
Merge pull request #39323 from frappe/mergify/bp/version-15-hotfix/pr-39212
...
fix: project filters on Delivery Note and Sales Order (backport #39212 )
2024-01-11 18:07:12 +05:30
ruthra kumar
a51f956f3e
fix: project filters on Delivery Note and Sales Order
...
(cherry picked from commit 9ba6ff67d5 )
2024-01-11 12:34:43 +00:00
ruthra kumar
494c26e48a
Merge pull request #39319 from frappe/mergify/bp/version-15-hotfix/pr-39317
...
fix: broken dimension filters in Sales/Purchase register (backport #39317 )
2024-01-11 17:12:35 +05:30
Deepesh Garg
da7b2febe0
Merge pull request #39295 from frappe/mergify/bp/version-15-hotfix/pr-39256
...
fix: Ignore default payment terms template for opening invoices (#39256 )
2024-01-11 17:06:53 +05:30
ruthra kumar
04037b7e38
fix: broken dimension filters in Sales/Purchase register
...
(cherry picked from commit 7b3f9386d7 )
2024-01-11 11:20:43 +00:00
rohitwaghchaure
484db65797
Merge pull request #39315 from frappe/mergify/bp/version-15-hotfix/pr-39215
...
fix: incorrect percentage received in purchase invoice (backport #39215 )
2024-01-11 15:14:44 +05:30
rohitwaghchaure
3f4cf15def
Merge pull request #39312 from frappe/mergify/bp/version-15-hotfix/pr-39299
...
fix: circular dependency error on deletion of QC and Stock Entry (backport #39299 )
2024-01-11 15:14:34 +05:30
Rohit Waghchaure
758b9b8a81
fix: incorrect percentage received in purchase invoice
...
(cherry picked from commit 8d2c78867e )
2024-01-11 09:21:41 +00:00
Rohit Waghchaure
7ca8e49b38
fix: circular dependency error while deleting QC
...
(cherry picked from commit 7cc324e31e )
2024-01-11 09:20:42 +00:00
mergify[bot]
d882305c72
fix: performance issue related to stock entry (backport #39301 ) ( #39303 )
...
fix: performance issue related to stock entry (#39301 )
(cherry picked from commit c67b0a3a64 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2024-01-10 22:18:16 +05:30
Deepesh Garg
5dc2e80987
fix: Ignore default payment terms template for opening invoices
...
(cherry picked from commit 53bf44d2b8 )
2024-01-10 10:37:45 +00:00
Frappe PR Bot
1dc85fcaf8
chore(release): Bumped to Version 15.10.0
...
# [15.10.0](https://github.com/frappe/erpnext/compare/v15.9.1...v15.10.0 ) (2024-01-10)
### Bug Fixes
* add expected_start_date in sort by ([b064944 ](b064944753 ))
* Add name to Hungary - Chart of Accounts for Microenterprises json ([0784488 ](0784488eec ))
* add read permission to Buying Settings ([e62dd0d ](e62dd0d7cb ))
* bank transction status upon reconciliation ([277aa7b ](277aa7bc2b ))
* BOM replace tool does not update exploded items of root (backport [#39244 ](https://github.com/frappe/erpnext/issues/39244 )) ([#39250 ](https://github.com/frappe/erpnext/issues/39250 )) ([0898ea5 ](0898ea5d92 ))
* Creating Asset Activity while Importing Asset ([#39113 ](https://github.com/frappe/erpnext/issues/39113 )) ([5e46937 ](5e4693763a ))
* don't set rate for non-stock item in Internal Transfer (backport [#39140 ](https://github.com/frappe/erpnext/issues/39140 )) ([#39169 ](https://github.com/frappe/erpnext/issues/39169 )) ([f3882a8 ](f3882a854f ))
* Duplicate Closing Stock Balance (backport [#39262 ](https://github.com/frappe/erpnext/issues/39262 )) ([#39264 ](https://github.com/frappe/erpnext/issues/39264 )) ([78c65f2 ](78c65f27b0 ))
* duplicate entry for serial / batch creation (backport [#39188 ](https://github.com/frappe/erpnext/issues/39188 )) ([#39192 ](https://github.com/frappe/erpnext/issues/39192 )) ([672e6d6 ](672e6d6d06 ))
* **Employee:** treeview ([#39126 ](https://github.com/frappe/erpnext/issues/39126 )) ([6020c8e ](6020c8e8f7 ))
* FG Item incorrect qty in the work order (backport [#39200 ](https://github.com/frappe/erpnext/issues/39200 )) ([#39211 ](https://github.com/frappe/erpnext/issues/39211 )) ([abc99f8 ](abc99f84e9 ))
* flaky demo test case (backport [#39135 ](https://github.com/frappe/erpnext/issues/39135 )) ([#39198 ](https://github.com/frappe/erpnext/issues/39198 )) ([3caf462 ](3caf462c6b ))
* Ignore asset qty and status validation while cancelling LCV ([87d1b0f ](87d1b0f476 ))
* ignore cancelled payments in Sales/Purchase Register ([9e1b443 ](9e1b443857 ))
* Ignore UP on "allowed to transact with" ([#39103 ](https://github.com/frappe/erpnext/issues/39103 )) ([aad39cf ](aad39cf686 ))
* improved validation message ([e89dce7 ](e89dce726b ))
* incorrect indicator title for portal sales order (backport [#39247 ](https://github.com/frappe/erpnext/issues/39247 )) ([#39255 ](https://github.com/frappe/erpnext/issues/39255 )) ([9f793b9 ](9f793b9b28 ))
* incorrect outstanding amt validation on advance as liability ([51d8a7a ](51d8a7a0c1 ))
* Introduced company field to show amounts in company currency ([1d2e831 ](1d2e831846 ))
* inventory dimension negative stock validation (backport [#39149 ](https://github.com/frappe/erpnext/issues/39149 )) ([#39151 ](https://github.com/frappe/erpnext/issues/39151 )) ([82b96d3 ](82b96d3688 ))
* possible key error on Financial ratios report ([16269b0 ](16269b0730 ))
* possible typeerror on transaction.js ([fec892c ](fec892c211 ))
* projects website list visible for guests and all logged in customers (backport [#39164 ](https://github.com/frappe/erpnext/issues/39164 )) ([#39273 ](https://github.com/frappe/erpnext/issues/39273 )) ([5d6bc96 ](5d6bc96375 )), closes [#39009 ](https://github.com/frappe/erpnext/issues/39009 )
* Purchase date and amount is not mandatory for composite asset creation ([d6d54ed ](d6d54ed220 ))
* Resolved conflict ([afefae0 ](afefae08af ))
* serial / batch barcode scanner (backport [#39114 ](https://github.com/frappe/erpnext/issues/39114 )) ([#39143 ](https://github.com/frappe/erpnext/issues/39143 )) ([2db1e1a ](2db1e1a737 ))
* Set asset purchase amount based on qty and valuation_rate ([f0070b4 ](f0070b4046 ))
* set parent doctype on chart (backport [#39286 ](https://github.com/frappe/erpnext/issues/39286 )) ([#39288 ](https://github.com/frappe/erpnext/issues/39288 )) ([fe973a4 ](fe973a4b53 ))
* Show maintain-stock and is-fixed-asset checkbox in item quick entry dialog ([50300b9 ](50300b9be6 ))
* Show timesheet table after fetching data from timesheet (backport [#39275 ](https://github.com/frappe/erpnext/issues/39275 )) ([#39281 ](https://github.com/frappe/erpnext/issues/39281 )) ([2598f8e ](2598f8e7ec ))
* skip rate validation for return `DN Items` with `Moving Average` valuation (backport [#39242 ](https://github.com/frappe/erpnext/issues/39242 )) ([#39266 ](https://github.com/frappe/erpnext/issues/39266 )) ([f00a6f6 ](f00a6f6c59 ))
* Subscription update patch ([7640fea ](7640feaaa7 ))
* total allocated percentage for sales team issue ([756c062 ](756c062733 ))
* TypeError is pricing rules (backport [#39252 ](https://github.com/frappe/erpnext/issues/39252 )) ([#39260 ](https://github.com/frappe/erpnext/issues/39260 )) ([bb6025c ](bb6025ca26 ))
* typerror on multi select dialog ([54a0df5 ](54a0df5164 ))
* update Maintenance Schedule status on Maintenance Visit submit (backport [#39167 ](https://github.com/frappe/erpnext/issues/39167 )) ([#39186 ](https://github.com/frappe/erpnext/issues/39186 )) ([926850d ](926850d1f6 ))
* update status on manual allocation ([a147e29 ](a147e2954f ))
* **UX:** dont override framework's permission check messages (backport [#39118 ](https://github.com/frappe/erpnext/issues/39118 )) ([#39120 ](https://github.com/frappe/erpnext/issues/39120 )) ([40ec5ff ](40ec5ff90f ))
### Features
* provision to close SCO (backport [#39127 ](https://github.com/frappe/erpnext/issues/39127 )) ([#39144 ](https://github.com/frappe/erpnext/issues/39144 )) ([b192ddd ](b192ddd13b ))
2024-01-10 10:36:08 +00:00
Deepesh Garg
e4e3313a0e
Merge pull request #39245 from frappe/version-15-hotfix
...
chore: release v15
2024-01-10 16:04:56 +05:30
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 e1ba5878a3 )
Co-authored-by: Nabin Hait <nabinhait@gmail.com >
2024-01-10 12:33:24 +05:30
mergify[bot]
fe973a4b53
fix: set parent doctype on chart (backport #39286 ) ( #39288 )
...
fix: set parent doctype on chart (#39286 )
(cherry picked from commit 38c5ecf007 )
Co-authored-by: Ankush Menat <ankush@frappe.io >
2024-01-10 12:27:16 +05:30
anandbaburajan
2448ba6bc4
fix: asset WDV depreciation calc according to IT act
...
(cherry picked from commit 026824880d )
2024-01-10 06:48:06 +00:00
Nabin Hait
f82125144a
Merge pull request #39190 from frappe/mergify/bp/version-15-hotfix/pr-39163
...
fix: Purchase information is not required for creating a composite asset (backport #39163 )
2024-01-10 12:15:02 +05:30
Nabin Hait
38c1350018
Merge pull request #39279 from frappe/mergify/bp/version-15-hotfix/pr-39191
...
fix: Ignore asset qty and status validation while cancelling LCV (backport #39191 )
2024-01-10 12:14:45 +05:30
Nabin Hait
24cfcf36e4
Merge pull request #39276 from frappe/mergify/bp/version-15-hotfix/pr-39238
...
fix: Set asset purchase amount based on qty and valuation_rate (backport #39238 )
2024-01-10 12:14:10 +05:30
Nabin Hait
0c0be03e90
Merge pull request #39218 from frappe/mergify/bp/version-15-hotfix/pr-39214
...
fix: Show maintain-stock and is-fixed-asset checkbox in item quick entry dialog (backport #39214 )
2024-01-10 12:12:32 +05:30
ruthra kumar
cd57bbc3d0
Merge pull request #39284 from frappe/mergify/bp/version-15-hotfix/pr-39282
...
fix: possible typeerror on transaction.js (backport #39282 )
2024-01-10 12:00:43 +05:30
Nabin Hait
afefae08af
fix: Resolved conflict
2024-01-10 11:59:54 +05:30
ruthra kumar
fec892c211
fix: possible typeerror on transaction.js
...
(cherry picked from commit 9f27ac142b )
2024-01-10 06:24:46 +00:00
Nabin Hait
87d1b0f476
fix: Ignore asset qty and status validation while cancelling LCV
...
(cherry picked from commit e9d36242ce )
2024-01-10 06:04:19 +00:00
Nabin Hait
f0070b4046
fix: Set asset purchase amount based on qty and valuation_rate
...
(cherry picked from commit 135e19d0aa )
2024-01-10 06:03:01 +00:00
mergify[bot]
5d6bc96375
fix: projects website list visible for guests and all logged in customers (backport #39164 ) ( #39273 )
...
fix: projects website list visible for guests and all logged in customers (#39164 )
* fix: projects website list visible for guests
fix: projects website list visible for guests and all logged in customers
see the issue for details
fixes issue #39009
* fix: remove user = frappe.session.user
(cherry picked from commit eabf706f37 )
Co-authored-by: 0xD0M1M0 <76812428+0xD0M1M0@users.noreply.github.com >
2024-01-10 10:45:45 +05:30
Raffael Meyer
4fa978ef1f
test: fix wrong fieldname ( #39270 )
2024-01-10 10:32:01 +05:30
mergify[bot]
f00a6f6c59
fix: skip rate validation for return DN Items with Moving Average valuation (backport #39242 ) ( #39266 )
...
fix: skip rate validation for return `DN Items` with `Moving Average` valuation
(cherry picked from commit e0ad52b500 )
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2024-01-09 22:02:20 +05:30
mergify[bot]
78c65f27b0
fix: Duplicate Closing Stock Balance (backport #39262 ) ( #39264 )
...
fix: Duplicate Closing Stock Balance
(cherry picked from commit b15795392b )
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2024-01-09 20:37:38 +05:30
Raffael Meyer
a326876cc5
Merge pull request #39258 from frappe/mergify/bp/version-15-hotfix/pr-39158
...
fix: add read permission to Buying Settings (backport #39158 )
2024-01-09 13:34:56 +01:00
mergify[bot]
9f793b9b28
fix: incorrect indicator title for portal sales order (backport #39247 ) ( #39255 )
...
fix: incorrect indicator title for portal sales order (#39247 )
(cherry picked from commit 2d2ff7cf52 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2024-01-09 17:42:27 +05:30
mergify[bot]
bb6025ca26
fix: TypeError is pricing rules (backport #39252 ) ( #39260 )
...
fix: TypeError is pricing rules (#39252 )
(cherry picked from commit 274c65c451 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2024-01-09 17:41:53 +05:30
ruthra kumar
4ad61fc3a5
Merge pull request #39253 from frappe/mergify/bp/version-15-hotfix/pr-39251
...
fix: update status on manual allocation (backport #39251 )
2024-01-09 16:36:35 +05:30
s-aga-r
e62dd0d7cb
fix: add read permission to Buying Settings
...
(cherry picked from commit e05bf9d32a )
2024-01-09 10:44:21 +00:00
ruthra kumar
a147e2954f
fix: update status on manual allocation
...
(cherry picked from commit d32a407e08 )
2024-01-09 10:29:36 +00:00
mergify[bot]
0898ea5d92
fix: BOM replace tool does not update exploded items of root (backport #39244 ) ( #39250 )
...
fix: BOM replace tool does not update exploded items of root (#39244 )
(cherry picked from commit 5e0d017497 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2024-01-09 15:59:12 +05:30
ruthra kumar
d0688e7a55
Merge pull request #39241 from frappe/mergify/bp/version-15-hotfix/pr-39237
...
fix: sales team commission overallocation on fetching items from multiple quotations to Sales Order (backport #39237 )
2024-01-09 14:40:24 +05:30
ruthra kumar
756c062733
fix: total allocated percentage for sales team issue
...
(cherry picked from commit b498094a97 )
2024-01-09 07:39:28 +00:00
ruthra kumar
ec7a60bd02
Merge pull request #39234 from frappe/mergify/bp/version-15-hotfix/pr-39196
...
fix: bank transaction status upon reconciliation (backport #39196 )
2024-01-09 11:57:50 +05:30
ruthra kumar
53eb6129ea
refactor: remove 'Bank Trasaction' logic from status_update
...
(cherry picked from commit cf988434e9 )
2024-01-09 05:51:38 +00:00
ruthra kumar
277aa7bc2b
fix: bank transction status upon reconciliation
...
(cherry picked from commit 6de8c18f98 )
2024-01-09 05:51:37 +00:00
Nabin Hait
97a51487c1
Merge pull request #39219 from frappe/mergify/bp/version-15-hotfix/pr-39209
...
fix: Introduced company field to show amounts in company currency (backport #39209 )
2024-01-08 21:53:16 +05:30
Gursheen Anand
53208dfb3e
fix: fetch name for fy
...
(cherry picked from commit d0ea598cdf )
2024-01-08 16:22:58 +00:00
Nabin Hait
1d2e831846
fix: Introduced company field to show amounts in company currency
...
(cherry picked from commit eab22eb282 )
2024-01-08 16:09:42 +00:00
Nabin Hait
50300b9be6
fix: Show maintain-stock and is-fixed-asset checkbox in item quick entry dialog
...
(cherry picked from commit c14986f9e6 )
2024-01-08 16:07:23 +00:00
mergify[bot]
abc99f84e9
fix: FG Item incorrect qty in the work order (backport #39200 ) ( #39211 )
...
fix: FG Item incorrect qty in the work order (#39200 )
(cherry picked from commit 466625213b )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2024-01-08 18:18:32 +05:30
mergify[bot]
3caf462c6b
fix: flaky demo test case (backport #39135 ) ( #39198 )
...
fix: flaky demo test case
(cherry picked from commit 5b1571879c )
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com >
2024-01-08 17:44:24 +05:30
Shariq Ansari
58357f8891
Merge pull request #39206 from frappe/mergify/bp/version-15-hotfix/pr-39204
...
fix: add expected_start_date in sort by (backport #39204 )
2024-01-08 16:37:37 +05:30
Shariq Ansari
8cc9ddaebd
chore: linter fix
2024-01-08 16:30:26 +05:30
Shariq Ansari
1f64b8fcd8
chore: linter fix
2024-01-08 16:30:03 +05:30
Shariq Ansari
80a2b79bba
chore: linter fix
2024-01-08 16:29:13 +05:30
Shariq Ansari
b064944753
fix: add expected_start_date in sort by
...
(cherry picked from commit 3d54fd8389 )
2024-01-08 10:40:20 +00:00
mergify[bot]
672e6d6d06
fix: duplicate entry for serial / batch creation (backport #39188 ) ( #39192 )
...
fix: duplicate entry for serial / batch creation (#39188 )
(cherry picked from commit b96c063c93 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2024-01-08 14:21:04 +05:30
mergify[bot]
926850d1f6
fix: update Maintenance Schedule status on Maintenance Visit submit (backport #39167 ) ( #39186 )
...
* fix: make `Sales Person` non-mandatory
(cherry picked from commit 4d56f725fe )
* fix: update Maintenance Schedule status on Maintenance Visit submit
(cherry picked from commit cd293a5173 )
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2024-01-08 13:23:12 +05:30
Nabin Hait
d6d54ed220
fix: Purchase date and amount is not mandatory for composite asset creation
...
(cherry picked from commit c34f09c503 )
# Conflicts:
# erpnext/assets/doctype/asset/asset.py
2024-01-08 06:53:11 +00:00
Nabin Hait
e89dce726b
fix: improved validation message
...
(cherry picked from commit fe43dab4d7 )
2024-01-08 06:53:10 +00:00
ruthra kumar
83288fedf1
Merge pull request #39187 from ruthra-kumar/backport_37613
...
fix: possible key error in Financial Ratio's report
2024-01-08 12:08:13 +05:30
ruthra kumar
16269b0730
fix: possible key error on Financial ratios report
2024-01-08 11:50:13 +05:30
ruthra kumar
f1d25700a8
Merge pull request #39183 from frappe/mergify/bp/version-15-hotfix/pr-39161
...
refactor: allow sales invoice in Bank Reconciliation tool (backport #39161 )
2024-01-08 11:09:42 +05:30
ruthra kumar
00d36d14fb
refactor: allow sales invoice in Bank Reconciliation tool
...
(cherry picked from commit b69cdeb4a6 )
2024-01-08 05:02:30 +00:00
ruthra kumar
c912e4c99d
Merge pull request #39182 from frappe/mergify/bp/version-15-hotfix/pr-39165
...
fix: incorrect outstanding amt validation on advance as liability (backport #39165 )
2024-01-08 10:31:17 +05:30
ruthra kumar
1eee52c59c
Merge pull request #39181 from frappe/mergify/bp/version-15-hotfix/pr-39159
...
refactor: prevent permission error by always processing bulk transaction in background (backport #39159 )
2024-01-08 10:30:48 +05:30
ruthra kumar
51d8a7a0c1
fix: incorrect outstanding amt validation on advance as liability
...
(cherry picked from commit 4cc3c1b765 )
2024-01-08 04:45:03 +00:00
ruthra kumar
f0bc0aa676
refactor: prevent permissions by always processing in background
...
(cherry picked from commit 15dc5c7e99 )
2024-01-08 04:43:11 +00:00
mergify[bot]
f3882a854f
fix: don't set rate for non-stock item in Internal Transfer (backport #39140 ) ( #39169 )
...
* fix: don't set rate for non-stock item in Internal Transfer
(cherry picked from commit e1b0fffd0c )
* test: internal transfer for non-stock item
(cherry picked from commit 57b6a98703 )
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2024-01-06 11:03:24 +05:30
Aulia Bismar
5e4693763a
fix: Creating Asset Activity while Importing Asset ( #39113 )
...
* fix: import asset not working on activity
* chore: fix linting issue in asset_activity.py
---------
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com >
2024-01-05 10:46:31 +05:30
mergify[bot]
82b96d3688
fix: inventory dimension negative stock validation (backport #39149 ) ( #39151 )
...
fix: inventory dimension negative stock validation (#39149 )
(cherry picked from commit bae7c64964 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2024-01-05 05:04:28 +05:30
Raffael Meyer
0454dede92
Merge pull request #39148 from frappe/mergify/bp/version-15-hotfix/pr-39126
...
fix(Employee): treeview (backport #39126 )
2024-01-04 15:24:43 +01:00
Raffael Meyer
6020c8e8f7
fix(Employee): treeview ( #39126 )
...
(cherry picked from commit e912e9597d )
2024-01-04 12:34:52 +00:00
mergify[bot]
b192ddd13b
feat: provision to close SCO (backport #39127 ) ( #39144 )
...
* feat: provision to close SCO
(cherry picked from commit 5e2669f4b6 )
* fix: don't allow to submit/cancel SCR against a closed SCO
(cherry picked from commit 9e973476b2 )
* fix: don't allow to submit/cancel SE against a closed SCO
(cherry picked from commit 5bc2035bd0 )
* fix(ux): filter closed SCO in `Get Items From` dialog
(cherry picked from commit bb839b2924 )
* fix: don't close PO on SCO close
(cherry picked from commit 0d01bd8a5a )
* fix: update qty on SCO status change
(cherry picked from commit 245effcccd )
* fix: don't allow to reopen SCO if PO is closed
(cherry picked from commit 784b6dcfea )
* fix: auto close and reopen SCO based on PO status
(cherry picked from commit 0819675fce )
* fix(text): test_update_status
(cherry picked from commit cdd5441435 )
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2024-01-04 17:22:58 +05:30
mergify[bot]
2db1e1a737
fix: serial / batch barcode scanner (backport #39114 ) ( #39143 )
...
fix: serial / batch barcode scanner (#39114 )
(cherry picked from commit f09e2130a1 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2024-01-04 16:02:29 +05:30
Deepesh Garg
7a5a4be02f
Merge pull request #39137 from frappe/mergify/bp/version-15-hotfix/pr-39125
...
fix: ignore cancelled payments in Sales/Purchase Register (#39125 )
2024-01-04 11:25:39 +05:30
Deepesh Garg
b834abbd4f
Merge pull request #39139 from frappe/mergify/bp/version-15-hotfix/pr-39138
...
fix: Subscription update patch (#39138 )
2024-01-04 11:25:21 +05:30
Deepesh Garg
7640feaaa7
fix: Subscription update patch
...
(cherry picked from commit 277dade9f9 )
2024-01-04 05:54:51 +00:00
ruthra kumar
9e1b443857
fix: ignore cancelled payments in Sales/Purchase Register
...
(cherry picked from commit 0f1be03faf )
2024-01-04 05:45:52 +00:00
Deepesh Garg
18575e137c
Merge pull request #39129 from monolithonadmin/version-15-hotfix
...
fix: Add name to Hungary - Chart of Accounts for Microenterprises json
2024-01-04 08:42:03 +05:30
Monolithonadmin
0784488eec
fix: Add name to Hungary - Chart of Accounts for Microenterprises json
2024-01-03 20:52:30 +01:00
Frappe PR Bot
290397172e
chore(release): Bumped to Version 15.9.1
...
## [15.9.1](https://github.com/frappe/erpnext/compare/v15.9.0...v15.9.1 ) (2024-01-03)
### Bug Fixes
* typerror on multi select dialog ([5ee6cc4 ](5ee6cc4bac ))
2024-01-03 15:37:59 +00:00
ruthra kumar
e3c473482b
Merge pull request #39124 from frappe/mergify/bp/version-15/pr-39116
...
fix: typerror on multi select dialog (backport #39116 )
2024-01-03 21:06:50 +05:30
ruthra kumar
bc529b51dc
Merge pull request #39122 from frappe/mergify/bp/version-15-hotfix/pr-39116
...
fix: typerror on multi select dialog (backport #39116 )
2024-01-03 21:06:06 +05:30
ruthra kumar
5ee6cc4bac
fix: typerror on multi select dialog
...
(cherry picked from commit 7da9ffa3bd )
2024-01-03 15:26:21 +00:00
ruthra kumar
54a0df5164
fix: typerror on multi select dialog
...
(cherry picked from commit 7da9ffa3bd )
2024-01-03 15:25:24 +00:00
mergify[bot]
40ec5ff90f
fix(UX): dont override framework's permission check messages (backport #39118 ) ( #39120 )
...
fix(UX): dont override framework's permission check messages (#39118 )
(cherry picked from commit e84c9f7c51 )
Co-authored-by: Ankush Menat <ankush@frappe.io >
2024-01-03 20:32:52 +05:30
Ankush Menat
aad39cf686
fix: Ignore UP on "allowed to transact with" ( #39103 )
...
If a customer is allowed to transact with some company it usually
doesn't imply that customer is somehow "linked with" that company.
2024-01-03 13:13:24 +05:30
Frappe PR Bot
3eac0e907e
chore(release): Bumped to Version 15.9.0
...
# [15.9.0](https://github.com/frappe/erpnext/compare/v15.8.3...v15.9.0 ) (2024-01-03)
### Bug Fixes
* auto fetch not working if bundle exists (backport [#39002 ](https://github.com/frappe/erpnext/issues/39002 )) ([#39004 ](https://github.com/frappe/erpnext/issues/39004 )) ([2e91934 ](2e919344df ))
* **DX:** capture tracebacks with context (backport [#39060 ](https://github.com/frappe/erpnext/issues/39060 )) ([#39063 ](https://github.com/frappe/erpnext/issues/39063 )) ([8ad7faf ](8ad7fafe2a ))
* enqueue demo data setup on setup complete (backport [#39043 ](https://github.com/frappe/erpnext/issues/39043 )) ([#39044 ](https://github.com/frappe/erpnext/issues/39044 )) ([d8cf994 ](d8cf994e94 ))
* incorrect total when Accumulating values ([7c7c3c9 ](7c7c3c932f ))
* Multiple subscription fixes ([#39005 ](https://github.com/frappe/erpnext/issues/39005 )) ([5158884 ](5158884dc9 ))
* non stock uom validation for serial and batch (backport [#39018 ](https://github.com/frappe/erpnext/issues/39018 )) ([#39026 ](https://github.com/frappe/erpnext/issues/39026 )) ([89d1069 ](89d1069472 ))
* not able to cancel sales invoice (backport [#38979 ](https://github.com/frappe/erpnext/issues/38979 )) ([#38980 ](https://github.com/frappe/erpnext/issues/38980 )) ([f8625f3 ](f8625f3eb7 ))
* on cancellation of document cancel the serial and batch bundle (backport [#39076 ](https://github.com/frappe/erpnext/issues/39076 )) ([#39082 ](https://github.com/frappe/erpnext/issues/39082 )) ([2e0abbd ](2e0abbd274 ))
* Opening balance in bank reconciliation tool ([#38977 ](https://github.com/frappe/erpnext/issues/38977 )) ([e0755f9 ](e0755f9a9a ))
* purchase return without item code not working (backport [#39014 ](https://github.com/frappe/erpnext/issues/39014 )) ([#39015 ](https://github.com/frappe/erpnext/issues/39015 )) ([2a390ac ](2a390ac2de ))
* remove bad defaults (backport [#38986 ](https://github.com/frappe/erpnext/issues/38986 )) ([#38988 ](https://github.com/frappe/erpnext/issues/38988 )) ([46035ed ](46035ed9ca ))
* select options should dynamically load dimensions ([21f9001 ](21f90011bc ))
* serial and batch bundle company mandatory error (backport [#38994 ](https://github.com/frappe/erpnext/issues/38994 )) ([#38999 ](https://github.com/frappe/erpnext/issues/38999 )) ([d2580be ](d2580be4fd ))
* take quantity into account when setting asset's gross purchase amt (backport [#39056 ](https://github.com/frappe/erpnext/issues/39056 )) ([#39058 ](https://github.com/frappe/erpnext/issues/39058 )) ([2e93275 ](2e932754e0 ))
* Unable to save Sales Invoice ([#39059 ](https://github.com/frappe/erpnext/issues/39059 )) ([73c0f37 ](73c0f3703c ))
* undefined error in Budget Variance and Profitability report ([9fdf5c8 ](9fdf5c8091 ))
* undefined error in consolidated financial report ([49f93f9 ](49f93f9fa1 ))
* use `Stock Qty` while getting `POS Reserved Qty` (backport [#38962 ](https://github.com/frappe/erpnext/issues/38962 )) ([#38965 ](https://github.com/frappe/erpnext/issues/38965 )) ([76c6b50 ](76c6b501f9 ))
* Validate account in Sales/Purchase Taxes and Charges Template ([#39013 ](https://github.com/frappe/erpnext/issues/39013 )) ([f3254c2 ](f3254c2010 ))
* work order with multi level, fetch operting cost from sub-assembly (backport [#38992 ](https://github.com/frappe/erpnext/issues/38992 )) ([#39028 ](https://github.com/frappe/erpnext/issues/39028 )) ([3a7506e ](3a7506ecbc ))
### Features
* Against voucher filter in General Ledger ([#39102 ](https://github.com/frappe/erpnext/issues/39102 )) ([458064f ](458064f8a1 ))
* group by Asset in Asset Depreciations and Balances report (backport [#38923 ](https://github.com/frappe/erpnext/issues/38923 )) ([#39066 ](https://github.com/frappe/erpnext/issues/39066 )) ([d85dad7 ](d85dad7198 ))
* Merge taxes from mapped docs ([#38346 ](https://github.com/frappe/erpnext/issues/38346 )) ([4e23048 ](4e2304818b ))
* voucher subtype for general ledger ([#38822 ](https://github.com/frappe/erpnext/issues/38822 )) ([e5d73c7 ](e5d73c780b ))
### Performance Improvements
* index item_code in bom explosion item (backport [#39085 ](https://github.com/frappe/erpnext/issues/39085 )) ([#39088 ](https://github.com/frappe/erpnext/issues/39088 )) ([57bcf9f ](57bcf9f568 ))
2024-01-03 06:01:15 +00:00
Deepesh Garg
d2fdce007e
Merge pull request #39090 from frappe/version-15-hotfix
...
chore: release v15
2024-01-03 11:29:39 +05:30
Deepesh Garg
458064f8a1
feat: Against voucher filter in General Ledger ( #39102 )
2024-01-03 10:51:34 +05:30
rohitwaghchaure
56d510b878
Merge branch 'version-15' into version-15-hotfix
2024-01-02 17:34:56 +05:30
mergify[bot]
57bcf9f568
perf: index item_code in bom explosion item (backport #39085 ) ( #39088 )
...
perf: index item_code in bom explosion item (#39085 )
(cherry picked from commit 739434b727 )
Co-authored-by: Ankush Menat <ankush@frappe.io >
2024-01-02 14:43:10 +05:30
mergify[bot]
2e0abbd274
fix: on cancellation of document cancel the serial and batch bundle (backport #39076 ) ( #39082 )
...
fix: on cancellation of document cancel the serial and batch bundle (#39076 )
(cherry picked from commit 6e5484ea03 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2024-01-02 13:28:43 +05:30
mergify[bot]
73c0f3703c
fix: Unable to save Sales Invoice ( #39059 )
...
fix: Unable to save Sales Invoice (#39059 )
(cherry picked from commit bacf2b7431 )
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com >
2024-01-01 19:28:29 +05:30
ruthra kumar
f3088e08bb
Merge pull request #39072 from frappe/mergify/bp/version-15-hotfix/pr-39067
...
fix: undefined error in Budget Variance and Profitability report (backport #39067 )
2024-01-01 17:42:45 +05:30
ruthra kumar
21f90011bc
fix: select options should dynamically load dimensions
...
(cherry picked from commit 1a9e091d12 )
2024-01-01 12:08:10 +00:00
ruthra kumar
9fdf5c8091
fix: undefined error in Budget Variance and Profitability report
...
'Budget' and 'Budget Account' doesn't have support for dynamic
dimension. It only supports hard-coded ones - Project and Cost Center
(cherry picked from commit 92bc962f60 )
2024-01-01 12:08:10 +00:00
ruthra kumar
7539623fb9
Merge pull request #39069 from frappe/mergify/bp/version-15-hotfix/pr-39023
...
refactor(perf): replace account subquery with 'in' condition (backport #39023 )
2024-01-01 16:29:25 +05:30
ruthra kumar
cbaa617d20
refactor(perf): replace account subquery with 'in' condition
...
(cherry picked from commit a517125d64 )
2024-01-01 10:13:51 +00:00
mergify[bot]
d85dad7198
feat: group by Asset in Asset Depreciations and Balances report (backport #38923 ) ( #39066 )
...
feat: group by Asset in Asset Depreciations and Balances report (#38923 )
feat: group by asset in asset depreciations and balances report
(cherry picked from commit a9576f0cf6 )
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com >
2024-01-01 15:05:04 +05:30
mergify[bot]
e5d73c780b
feat: voucher subtype for general ledger ( #38822 )
...
* feat: voucher subtype for general ledger (#38822 )
* feat: add voucher subtype column to gle
* feat: add logic to set voucher subtypes
* feat: fetch voucher subtype in ledger report
* fix: order of conditions
(cherry picked from commit 47f7b65058 )
# Conflicts:
# erpnext/accounts/doctype/gl_entry/gl_entry.json
* chore: resolve conflicts
---------
Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com >
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com >
2024-01-01 13:30:29 +05:30
mergify[bot]
8ad7fafe2a
fix(DX): capture tracebacks with context (backport #39060 ) ( #39063 )
...
fix(DX): capture tracebacks with context (#39060 )
(cherry picked from commit 510fdf7bf6 )
Co-authored-by: Ankush Menat <ankush@frappe.io >
2024-01-01 13:12:07 +05:30
mergify[bot]
2e932754e0
fix: take quantity into account when setting asset's gross purchase amt (backport #39056 ) ( #39058 )
...
fix: take quantity into account when setting asset's gross purchase amt (#39056 )
fix: take quantity into account when setting asset's gross purchase amount
(cherry picked from commit 0346f47c1d )
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com >
2024-01-01 11:27:55 +05:30
mergify[bot]
d8cf994e94
fix: enqueue demo data setup on setup complete (backport #39043 ) ( #39044 )
...
fix: enqueue demo data setup on setup complete (#39043 )
(cherry picked from commit 877cc7255d )
Co-authored-by: Smit Vora <smitvora203@gmail.com >
2023-12-31 18:25:15 +05:30
mergify[bot]
89d1069472
fix: non stock uom validation for serial and batch (backport #39018 ) ( #39026 )
...
fix: non stock uom validation for serial and batch (#39018 )
* fix: non stock uom validation for serial and batch
* test: delivery note for batch with non stock uom
(cherry picked from commit 0c6de4ecb2 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-29 20:54:49 +05:30
mergify[bot]
3a7506ecbc
fix: work order with multi level, fetch operting cost from sub-assembly (backport #38992 ) ( #39028 )
...
fix: work order with multi level, fetch operting cost from sub-assembly (#38992 )
(cherry picked from commit 70abedc57a )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-29 20:54:26 +05:30
mergify[bot]
f3254c2010
fix: Validate account in Sales/Purchase Taxes and Charges Template ( #39013 )
...
fix: Validate account in Sales/Purchase Taxes and Charges Template (#39013 )
(cherry picked from commit cd37fd790b )
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com >
2023-12-29 16:16:02 +05:30
mergify[bot]
2a390ac2de
fix: purchase return without item code not working (backport #39014 ) ( #39015 )
...
fix: purchase return without item code not working (#39014 )
(cherry picked from commit f983e09f92 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-29 13:07:38 +05:30
mergify[bot]
5158884dc9
fix: Multiple subscription fixes ( #39005 )
...
fix: Multiple subscription fixes (#39005 )
(cherry picked from commit 3b4b2275de )
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com >
2023-12-29 12:52:41 +05:30
Frappe PR Bot
ec436c18a3
chore(release): Bumped to Version 15.8.3
...
## [15.8.3](https://github.com/frappe/erpnext/compare/v15.8.2...v15.8.3 ) (2023-12-28)
### Bug Fixes
* auto fetch not working if bundle exists (backport [#39002 ](https://github.com/frappe/erpnext/issues/39002 )) (backport [#39004 ](https://github.com/frappe/erpnext/issues/39004 )) ([#39006 ](https://github.com/frappe/erpnext/issues/39006 )) ([17bae5a ](17bae5a5a1 ))
* serial and batch bundle company mandatory error (backport [#38994 ](https://github.com/frappe/erpnext/issues/38994 )) (backport [#38999 ](https://github.com/frappe/erpnext/issues/38999 )) ([#39003 ](https://github.com/frappe/erpnext/issues/39003 )) ([027a75b ](027a75bcb0 ))
2023-12-28 13:31:04 +00:00
mergify[bot]
17bae5a5a1
fix: auto fetch not working if bundle exists (backport #39002 ) (backport #39004 ) ( #39006 )
...
fix: auto fetch not working if bundle exists (backport #39002 ) (#39004 )
fix: auto fetch not working if bundle exists (#39002 )
(cherry picked from commit b5340c5ec0 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
(cherry picked from commit 2e919344df )
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-28 18:59:38 +05:30
mergify[bot]
027a75bcb0
fix: serial and batch bundle company mandatory error (backport #38994 ) (backport #38999 ) ( #39003 )
...
fix: serial and batch bundle company mandatory error (backport #38994 ) (#38999 )
fix: serial and batch bundle company mandatory error (#38994 )
(cherry picked from commit 10074e9980 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
(cherry picked from commit d2580be4fd )
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-28 18:59:20 +05:30
mergify[bot]
2e919344df
fix: auto fetch not working if bundle exists (backport #39002 ) ( #39004 )
...
fix: auto fetch not working if bundle exists (#39002 )
(cherry picked from commit b5340c5ec0 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-28 18:54:38 +05:30
mergify[bot]
d2580be4fd
fix: serial and batch bundle company mandatory error (backport #38994 ) ( #38999 )
...
fix: serial and batch bundle company mandatory error (#38994 )
(cherry picked from commit 10074e9980 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-28 18:22:14 +05:30
mergify[bot]
e0755f9a9a
fix: Opening balance in bank reconciliation tool ( #38977 )
...
fix: Opening balance in bank reconciliation tool (#38977 )
(cherry picked from commit bbee9b5637 )
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com >
2023-12-28 17:53:44 +05:30
Frappe PR Bot
c4794c95df
chore(release): Bumped to Version 15.8.2
...
## [15.8.2](https://github.com/frappe/erpnext/compare/v15.8.1...v15.8.2 ) (2023-12-28)
### Bug Fixes
* undefined error in consolidated financial report ([0a3e378 ](0a3e378f5e ))
2023-12-28 12:16:55 +00:00
ruthra kumar
12c5f0b6b5
Merge pull request #38996 from frappe/mergify/bp/version-15/pr-38995
...
fix: undefined error in consolidated financial report (backport #38995 )
2023-12-28 17:45:35 +05:30
ruthra kumar
0a3e378f5e
fix: undefined error in consolidated financial report
...
(cherry picked from commit 49f93f9fa1 )
2023-12-28 12:13:20 +00:00
ruthra kumar
1b399e83be
Merge pull request #38995 from ruthra-kumar/undefined_error_in_consolidated_report
...
fix: undefined error in consolidated financial report
2023-12-28 17:42:18 +05:30
ruthra kumar
49f93f9fa1
fix: undefined error in consolidated financial report
2023-12-28 17:36:00 +05:30
ruthra kumar
d2fe221bc7
Merge pull request #38990 from frappe/mergify/bp/version-15-hotfix/pr-38969
...
fix: incorrect net profit in Profit and Loss Statement (backport #38969 )
2023-12-28 17:09:43 +05:30
ruthra kumar
a3cecb892a
test: profit and loss report output
...
(cherry picked from commit 8555617295 )
2023-12-28 10:54:27 +00:00
ruthra kumar
7c7c3c932f
fix: incorrect total when Accumulating values
...
(cherry picked from commit d54f8318fb )
2023-12-28 10:54:27 +00:00
mergify[bot]
46035ed9ca
fix: remove bad defaults (backport #38986 ) ( #38988 )
...
fix: remove bad defaults (#38986 )
Child tables can't have a default.
(cherry picked from commit b71b0d5997 )
Co-authored-by: Ankush Menat <ankush@frappe.io >
2023-12-28 14:22:18 +05:30
Frappe PR Bot
7e7eb95934
chore(release): Bumped to Version 15.8.1
...
## [15.8.1](https://github.com/frappe/erpnext/compare/v15.8.0...v15.8.1 ) (2023-12-28)
### Bug Fixes
* not able to cancel sales invoice (backport [#38979 ](https://github.com/frappe/erpnext/issues/38979 )) (backport [#38980 ](https://github.com/frappe/erpnext/issues/38980 )) ([#38981 ](https://github.com/frappe/erpnext/issues/38981 )) ([83e62bb ](83e62bbaad ))
2023-12-28 05:55:23 +00:00
mergify[bot]
83e62bbaad
fix: not able to cancel sales invoice (backport #38979 ) (backport #38980 ) ( #38981 )
...
fix: not able to cancel sales invoice (backport #38979 ) (#38980 )
fix: not able to cancel sales invoice (#38979 )
(cherry picked from commit a117ef3cb8 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
(cherry picked from commit f8625f3eb7 )
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-28 11:24:16 +05:30
mergify[bot]
f8625f3eb7
fix: not able to cancel sales invoice (backport #38979 ) ( #38980 )
...
fix: not able to cancel sales invoice (#38979 )
(cherry picked from commit a117ef3cb8 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-28 11:21:51 +05:30
mergify[bot]
4e2304818b
feat: Merge taxes from mapped docs ( #38346 )
...
feat: Merge taxes from mapped docs (#38346 )
* feat: Merge taxes from mapped docs
* chore: ci failures
(cherry picked from commit 9b1c22250f )
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com >
2023-12-28 08:28:02 +05:30
mergify[bot]
3caabf23a5
fix : correct logic for overlap error (backport #38967 ) ( #38968 )
...
fix : correct logic for overlap error (#38967 )
fixing overlap error logic with taking care of sequential time job cards in overlap job card list
(cherry picked from commit fe77b9d633 )
Co-authored-by: VihangT <151990347+VihangT@users.noreply.github.com >
2023-12-27 20:40:03 +05:30
mergify[bot]
76c6b501f9
fix: use Stock Qty while getting POS Reserved Qty (backport #38962 ) ( #38965 )
...
fix: use `Stock Qty` while getting `POS Reserved Qty`
(cherry picked from commit 7223106417 )
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-12-27 15:31:58 +05:30
Frappe PR Bot
f3ab5a33c7
chore(release): Bumped to Version 15.8.0
...
# [15.8.0](https://github.com/frappe/erpnext/compare/v15.7.0...v15.8.0 ) (2023-12-27)
### Bug Fixes
* `Reserved Stock` report (backport [#38922 ](https://github.com/frappe/erpnext/issues/38922 )) ([#38924 ](https://github.com/frappe/erpnext/issues/38924 )) ([8f643f0 ](8f643f0df8 ))
* allow to set rate manually for service item in BOM (backport [#38880 ](https://github.com/frappe/erpnext/issues/38880 )) (backport [#38882 ](https://github.com/frappe/erpnext/issues/38882 )) ([#38885 ](https://github.com/frappe/erpnext/issues/38885 )) ([74606dc ](74606dc927 ))
* do not make serial batch bundle for zero qty (backport [#38949 ](https://github.com/frappe/erpnext/issues/38949 )) ([#38954 ](https://github.com/frappe/erpnext/issues/38954 )) ([a41cf62 ](a41cf62437 ))
* do not reset the basic rate for the material receipt stock entry (backport [#38896 ](https://github.com/frappe/erpnext/issues/38896 )) ([#38899 ](https://github.com/frappe/erpnext/issues/38899 )) ([f6eb2b5 ](f6eb2b521d ))
* incorrect price list in customer-wise item price report ([e0dbb57 ](e0dbb573b1 ))
* incorrect qty in serial batch bundle against pick list (backport [#38964 ](https://github.com/frappe/erpnext/issues/38964 )) ([#38966 ](https://github.com/frappe/erpnext/issues/38966 )) ([5874be0 ](5874be0f79 ))
* local reference error in BOM (backport [#38850 ](https://github.com/frappe/erpnext/issues/38850 )) ([#38877 ](https://github.com/frappe/erpnext/issues/38877 )) ([e3be9c1 ](e3be9c1da4 ))
* min order qty optional in production plan (backport [#38956 ](https://github.com/frappe/erpnext/issues/38956 )) ([#38958 ](https://github.com/frappe/erpnext/issues/38958 )) ([ab9fce3 ](ab9fce333d ))
* not able to import serial batch bundle using csv (backport [#38950 ](https://github.com/frappe/erpnext/issues/38950 )) ([#38955 ](https://github.com/frappe/erpnext/issues/38955 )) ([0e48ef7 ](0e48ef7ace ))
* reposting not fixing valuation rate for sales return using movin… (backport [#38895 ](https://github.com/frappe/erpnext/issues/38895 )) (backport [#38897 ](https://github.com/frappe/erpnext/issues/38897 )) ([#38901 ](https://github.com/frappe/erpnext/issues/38901 )) ([eabb956 ](eabb956aca ))
* reset the incoming rate on changing of the warehouse (backport [#38925 ](https://github.com/frappe/erpnext/issues/38925 )) ([#38926 ](https://github.com/frappe/erpnext/issues/38926 )) ([82960e3 ](82960e3312 ))
* **test:** expect account currency when party account is specified. ([2d9a0a8 ](2d9a0a8e2e ))
* typeerror on pos order summary to new order screen ([bf98a8f ](bf98a8f855 ))
* typerror on tree doctypes - Item Group, Customer Group, Supplier Group and Territory (backport [#38870 ](https://github.com/frappe/erpnext/issues/38870 )) ([#38871 ](https://github.com/frappe/erpnext/issues/38871 )) ([d75ac13 ](d75ac136d7 ))
* use party account currency when party account is specified ([32d3d4e ](32d3d4e571 ))
* **ux:** make PR and PI Item rate field readonly based on `Maintain Same Rate` (backport [#38942 ](https://github.com/frappe/erpnext/issues/38942 )) ([#38944 ](https://github.com/frappe/erpnext/issues/38944 )) ([f704ccb ](f704ccbb59 ))
### Features
* in_party_currency option for AR/AP reports ([a65bc77 ](a65bc77b02 ))
* provision to add items in Stock Reservation dialog (backport [#38558 ](https://github.com/frappe/erpnext/issues/38558 )) ([#38920 ](https://github.com/frappe/erpnext/issues/38920 )) ([8c2c90f ](8c2c90f77a ))
* total_asset_cost field (backport [#38879 ](https://github.com/frappe/erpnext/issues/38879 )) ([#38887 ](https://github.com/frappe/erpnext/issues/38887 )) ([58f1df5 ](58f1df5004 ))
### Performance Improvements
* Drop unused/duplicate/sub-optimal indexes (backport [#38884 ](https://github.com/frappe/erpnext/issues/38884 )) ([#38913 ](https://github.com/frappe/erpnext/issues/38913 )) ([308c6ff ](308c6ffb4f ))
* use estimated rows instead of actual rows (backport [#38830 ](https://github.com/frappe/erpnext/issues/38830 )) ([#38876 ](https://github.com/frappe/erpnext/issues/38876 )) ([648f275 ](648f275797 ))
2023-12-27 08:41:36 +00:00
rohitwaghchaure
e2bf03bdb2
Merge pull request #38952 from frappe/version-15-hotfix
...
chore: release v15
2023-12-27 14:10:09 +05:30
mergify[bot]
5874be0f79
fix: incorrect qty in serial batch bundle against pick list (backport #38964 ) ( #38966 )
...
fix: incorrect qty in serial batch bundle against pick list (#38964 )
(cherry picked from commit 47ee801d37 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-27 14:06:55 +05:30
mergify[bot]
ab9fce333d
fix: min order qty optional in production plan (backport #38956 ) ( #38958 )
...
fix: min order qty optional in production plan (#38956 )
* fix: min order qty optional in production plan
* fix: test cases
(cherry picked from commit b09c9354fb )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-26 21:55:23 +05:30
mergify[bot]
0e48ef7ace
fix: not able to import serial batch bundle using csv (backport #38950 ) ( #38955 )
...
* fix: not able to import serial batch bundle using csv (#38950 )
(cherry picked from commit d00f6672a8 )
# Conflicts:
# erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
* chore: fixed conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-26 16:29:34 +05:30
mergify[bot]
a41cf62437
fix: do not make serial batch bundle for zero qty (backport #38949 ) ( #38954 )
...
fix: do not make serial batch bundle for zero qty (#38949 )
(cherry picked from commit 06d6220a2a )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-26 15:39:00 +05:30
mergify[bot]
f704ccbb59
fix(ux): make PR and PI Item rate field readonly based on Maintain Same Rate (backport #38942 ) ( #38944 )
...
* fix(ux): make PI Item rate field editable
(cherry picked from commit eb5bb9f9a9 )
* fix(ux): make PI Item rate field readonly based on `Maintain Same Rate`
(cherry picked from commit cb9114442b )
* fix(ux): make PR Item rate field readonly based on `Maintain Same Rate`
(cherry picked from commit b1ba210332 )
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-12-26 14:45:05 +05:30
ruthra kumar
1ea8574be9
Merge pull request #38946 from frappe/mergify/bp/version-15-hotfix/pr-38891
...
fix: incorrect price list in customer-wise item price report (backport #38891 )
2023-12-26 12:16:55 +05:30
ruthra kumar
e0dbb573b1
fix: incorrect price list in customer-wise item price report
...
(cherry picked from commit 9a00edb031 )
2023-12-26 06:17:54 +00:00
mergify[bot]
82960e3312
fix: reset the incoming rate on changing of the warehouse (backport #38925 ) ( #38926 )
...
fix: reset the incoming rate on changing of the warehouse (#38925 )
(cherry picked from commit 161ae1edd1 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-22 17:55:58 +05:30
mergify[bot]
8f643f0df8
fix: Reserved Stock report (backport #38922 ) ( #38924 )
...
* chore: improve `Allowed Qty` error msg
(cherry picked from commit 1a1629196d )
* fix: `Reserved Stock` report
(cherry picked from commit a5d5223c0e )
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-12-22 16:45:40 +05:30
mergify[bot]
8c2c90f77a
feat: provision to add items in Stock Reservation dialog (backport #38558 ) ( #38920 )
...
* feat: provision to update items in Stock Reservation dialog
(cherry picked from commit 9471d8fff9 )
* fix(ux): show row index and field label while selecting the Sales Order Item
(cherry picked from commit 00261094c8 )
* feat: provision to add items in Stock Reservation dialog
(cherry picked from commit 8d5045ef4c )
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-12-22 15:50:07 +05:30
mergify[bot]
a8f3f2343d
chore: fixup broken JSON files (backport #38915 ) ( #38917 )
...
chore: fixup broken JSON files (#38915 )
(cherry picked from commit 2dc49c834a )
Co-authored-by: Ankush Menat <ankush@frappe.io >
2023-12-22 07:41:00 +05:30
mergify[bot]
308c6ffb4f
perf: Drop unused/duplicate/sub-optimal indexes (backport #38884 ) ( #38913 )
...
perf: Drop unused/duplicate/sub-optimal indexes (#38884 )
* ci: enable more checks
* perf: Drop unused/duplicate indexes
(cherry picked from commit 787333896c )
Co-authored-by: Ankush Menat <ankush@frappe.io >
2023-12-21 21:39:20 +05:30
mergify[bot]
a99470e017
chore: additional_asset_cost field (backport #38904 ) ( #38906 )
...
chore: additional_asset_cost field (#38904 )
(cherry picked from commit 283763dfb2 )
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com >
2023-12-21 16:55:41 +05:30
mergify[bot]
eabb956aca
fix: reposting not fixing valuation rate for sales return using movin… (backport #38895 ) (backport #38897 ) ( #38901 )
...
fix: reposting not fixing valuation rate for sales return using movin… (backport #38895 ) (#38897 )
* fix: reposting not fixing valuation rate for sales return using movin… (#38895 )
fix: reposting not fixing valuation rate for sales return using moving average method
(cherry picked from commit 3a668bbe96 )
# Conflicts:
# erpnext/stock/stock_ledger.py
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
(cherry picked from commit 07175367d8 )
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-21 15:44:50 +05:30
mergify[bot]
f6eb2b521d
fix: do not reset the basic rate for the material receipt stock entry (backport #38896 ) ( #38899 )
...
fix: do not reset the basic rate for the material receipt stock entry (#38896 )
(cherry picked from commit 98bfcc4c75 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-21 14:22:53 +05:30
ruthra kumar
135aced98e
Merge pull request #38894 from frappe/mergify/bp/version-15-hotfix/pr-38893
...
fix: typeerror on pos order summary to new order screen (backport #38893 )
2023-12-21 12:26:04 +05:30
ruthra kumar
bf98a8f855
fix: typeerror on pos order summary to new order screen
...
(cherry picked from commit 6a0a08b59c )
2023-12-21 06:53:22 +00:00
mergify[bot]
74606dc927
fix: allow to set rate manually for service item in BOM (backport #38880 ) (backport #38882 ) ( #38885 )
...
fix: allow to set rate manually for service item in BOM (backport #38880 ) (#38882 )
fix: allow to set rate manually for service item in BOM (#38880 )
(cherry picked from commit c2f692a4e4 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
(cherry picked from commit a6ab53236e )
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-21 10:44:20 +05:30
mergify[bot]
58f1df5004
feat: total_asset_cost field (backport #38879 ) ( #38887 )
...
* feat: total_asset_cost field (#38879 )
(cherry picked from commit d370c60a6c )
# Conflicts:
# erpnext/patches.txt
* chore: resolve conflicts
* chore: remove unnecessary patch
---------
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com >
2023-12-20 22:47:48 +05:30
mergify[bot]
e3be9c1da4
fix: local reference error in BOM (backport #38850 ) ( #38877 )
...
fix: local reference error in BOM (#38850 )
fix: local reference error
(cherry picked from commit ae353398d9 )
Co-authored-by: NIYAZ RAZAK <76736615+niyazrazak@users.noreply.github.com >
2023-12-20 16:34:27 +05:30
mergify[bot]
648f275797
perf: use estimated rows instead of actual rows (backport #38830 ) ( #38876 )
...
perf: use estimated rows instead of actual rows (#38830 )
(cherry picked from commit 9983283f95 )
Co-authored-by: Ankush Menat <ankush@frappe.io >
2023-12-20 13:58:38 +05:30
ruthra kumar
4626ab5e19
Merge pull request #38873 from frappe/mergify/bp/version-15-hotfix/pr-38838
...
fix: use party account currency when party account is specified (backport #38838 )
2023-12-20 13:09:15 +05:30
Devin Slauenwhite
2d9a0a8e2e
fix(test): expect account currency when party account is specified.
...
(cherry picked from commit a09241e3c7 )
2023-12-20 07:05:32 +00:00
Devin Slauenwhite
32d3d4e571
fix: use party account currency when party account is specified
...
(cherry picked from commit c7b961ffa2 )
2023-12-20 07:05:32 +00:00
mergify[bot]
d75ac136d7
fix: typerror on tree doctypes - Item Group, Customer Group, Supplier Group and Territory (backport #38870 ) ( #38871 )
...
fix: typerror on tree doctypes - Item Group, Customer Group, Supplier Group and Territory (#38870 )
* refactor: typerror on set_root_readonly
* refactor: remove 'cur_frm' usage in supplier_group
* refactor: remove 'cur_frm' usage in territory.js
* refactor: remove 'cur_frm' from sales_person.js
(cherry picked from commit 6d5bdc6c68 )
Co-authored-by: ruthra kumar <ruthra@erpnext.com >
2023-12-20 12:32:35 +05:30
ruthra kumar
88b3811c5d
Merge pull request #38839 from pps190/backport/version-15/37746
...
feat: in_party_currency option for AR/AP reports (backport #37746 )
2023-12-20 12:25:11 +05:30
Frappe PR Bot
2a5164d170
chore(release): Bumped to Version 15.7.0
...
# [15.7.0](https://github.com/frappe/erpnext/compare/v15.6.1...v15.7.0 ) (2023-12-20)
### Bug Fixes
* asset patch failure due to missing shift_based column (backport [#38776 ](https://github.com/frappe/erpnext/issues/38776 )) ([#38777 ](https://github.com/frappe/erpnext/issues/38777 )) ([6e92c78 ](6e92c78cbd ))
* barcode scanning for the stock entry (backport [#38716 ](https://github.com/frappe/erpnext/issues/38716 )) ([#38718 ](https://github.com/frappe/erpnext/issues/38718 )) ([1dcb065 ](1dcb065c64 ))
* **demo:** Demo setup for canadian COA ([7d84441 ](7d844411fb ))
* fetch exc rate of multi currency journals ([f55b561 ](f55b561ff9 ))
* fetch item_tax_template values if fields with fetch_from exisit ([fba28d6 ](fba28d6941 ))
* groups for current accounts in German CoAs ([58de991 ](58de9913b9 ))
* homepage not working (backport [#38755 ](https://github.com/frappe/erpnext/issues/38755 )) ([#38756 ](https://github.com/frappe/erpnext/issues/38756 )) ([ad3a5b5 ](ad3a5b58e4 ))
* if not budget then don't validate (backport [#38861 ](https://github.com/frappe/erpnext/issues/38861 )) ([#38865 ](https://github.com/frappe/erpnext/issues/38865 )) ([5ec75fb ](5ec75fb6df ))
* incoming rate for sales return with Moving Average valuation method (backport [#38849 ](https://github.com/frappe/erpnext/issues/38849 )) (backport [#38863 ](https://github.com/frappe/erpnext/issues/38863 )) ([#38866 ](https://github.com/frappe/erpnext/issues/38866 )) ([d65be69 ](d65be69c4c ))
* incorrect available qty for backdated stock reco with batch (backport [#37858 ](https://github.com/frappe/erpnext/issues/37858 )) ([#38811 ](https://github.com/frappe/erpnext/issues/38811 )) ([18bd330 ](18bd330a59 ))
* Init internal child table values ([7802f6c ](7802f6c528 ))
* item variant with manufacturer (backport [#38845 ](https://github.com/frappe/erpnext/issues/38845 )) (backport [#38847 ](https://github.com/frappe/erpnext/issues/38847 )) ([#38851 ](https://github.com/frappe/erpnext/issues/38851 )) ([7320440 ](7320440b61 ))
* not able to cancel SCR with Batch (backport [#38817 ](https://github.com/frappe/erpnext/issues/38817 )) (backport [#38821 ](https://github.com/frappe/erpnext/issues/38821 )) ([#38829 ](https://github.com/frappe/erpnext/issues/38829 )) ([4bd1a5f ](4bd1a5f955 ))
* not able to make inter-company po from so (backport [#38826 ](https://github.com/frappe/erpnext/issues/38826 )) (backport [#38828 ](https://github.com/frappe/erpnext/issues/38828 )) ([#38833 ](https://github.com/frappe/erpnext/issues/38833 )) ([02ceee6 ](02ceee6669 ))
* on closed unreserved the production plan qty (backport [#38848 ](https://github.com/frappe/erpnext/issues/38848 )) (backport [#38859 ](https://github.com/frappe/erpnext/issues/38859 )) ([#38862 ](https://github.com/frappe/erpnext/issues/38862 )) ([cbbc6af ](cbbc6af128 ))
* **pe:** show split alert only on splitting ([77dba48 ](77dba4834c ))
* Reset SLA on issue doesn't work (backport [#38789 ](https://github.com/frappe/erpnext/issues/38789 )) ([#38791 ](https://github.com/frappe/erpnext/issues/38791 )) ([2045306 ](2045306283 ))
* serial and batch bundle return not working (backport [#38754 ](https://github.com/frappe/erpnext/issues/38754 )) ([#38806 ](https://github.com/frappe/erpnext/issues/38806 )) ([8990c48 ](8990c48e7b ))
* set `fg-itm-qty` based on `qty` instead of the other way round in Subcontracting POs (backport [#38842 ](https://github.com/frappe/erpnext/issues/38842 )) ([#38855 ](https://github.com/frappe/erpnext/issues/38855 )) ([4e27174 ](4e27174c85 ))
* show bill_date and bill_no in Purchase Register ([4ed86db ](4ed86dbff2 ))
* skip jvs against bank accounts ([bf8a2d0 ](bf8a2d0e3a ))
* supplier removed on selection of item (backport [#38712 ](https://github.com/frappe/erpnext/issues/38712 )) ([#38713 ](https://github.com/frappe/erpnext/issues/38713 )) ([feb452b ](feb452b740 ))
* timezone aware SLA banner (backport [#38745 ](https://github.com/frappe/erpnext/issues/38745 )) ([#38747 ](https://github.com/frappe/erpnext/issues/38747 )) ([a551660 ](a551660d2a ))
* **ux:** don't override Item Name and Description in MR (backport [#38720 ](https://github.com/frappe/erpnext/issues/38720 )) ([#38763 ](https://github.com/frappe/erpnext/issues/38763 )) ([703be50 ](703be50bc7 ))
* validation error on reconciling PE to Journals as Invoice ([aa5e16e ](aa5e16e681 ))
* wrong currency in Stock Balance report (backport [#38778 ](https://github.com/frappe/erpnext/issues/38778 )) ([#38780 ](https://github.com/frappe/erpnext/issues/38780 )) ([7fc8150 ](7fc8150617 ))
* wrong paid and cn amount on pos invoice ([cff9e47 ](cff9e47162 ))
### Features
* RFQ print preview ([f30bede ](f30bede2e0 ))
* set lead name from email ([f770621 ](f7706211ea ))
### Performance Improvements
* index `return_against` on delivery note (backport [#38827 ](https://github.com/frappe/erpnext/issues/38827 )) ([#38832 ](https://github.com/frappe/erpnext/issues/38832 )) ([6ad75e7 ](6ad75e72e6 ))
2023-12-20 04:47:03 +00:00
Deepesh Garg
028228ee12
Merge pull request #38853 from frappe/version-15-hotfix
...
chore: release v15
2023-12-20 10:15:54 +05:30
mergify[bot]
4e27174c85
fix: set fg-itm-qty based on qty instead of the other way round in Subcontracting POs (backport #38842 ) ( #38855 )
...
fix: set `fg-itm-qty` based on `qty` instead of the other way round
(cherry picked from commit a99d0a65b0 )
Co-authored-by: Gughan Ravikumar <gughanrk@gmail.com >
2023-12-20 09:12:20 +05:30
mergify[bot]
d65be69c4c
fix: incoming rate for sales return with Moving Average valuation method (backport #38849 ) (backport #38863 ) ( #38866 )
...
fix: incoming rate for sales return with Moving Average valuation method (backport #38849 ) (#38863 )
* fix: incoming rate for sales return with Moving Average valuation method (#38849 )
(cherry picked from commit 7fdac62393 )
# Conflicts:
# erpnext/stock/doctype/delivery_note/test_delivery_note.py
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
(cherry picked from commit 4057682c87 )
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-19 19:13:08 +05:30
mergify[bot]
5ec75fb6df
fix: if not budget then don't validate (backport #38861 ) ( #38865 )
...
fix: if not budget then don't validate (#38861 )
(cherry picked from commit d375164100 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-19 18:30:36 +05:30
mergify[bot]
cbbc6af128
fix: on closed unreserved the production plan qty (backport #38848 ) (backport #38859 ) ( #38862 )
...
fix: on closed unreserved the production plan qty (backport #38848 ) (#38859 )
fix: on closed unreserved the production plan qty (#38848 )
(cherry picked from commit 2184e8ef58 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
(cherry picked from commit 5e68b7e3a6 )
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-19 18:18:40 +05:30
mergify[bot]
7320440b61
fix: item variant with manufacturer (backport #38845 ) (backport #38847 ) ( #38851 )
...
fix: item variant with manufacturer (backport #38845 ) (#38847 )
* fix: item variant with manufacturer (#38845 )
(cherry picked from commit e0c8ff10da )
* chore: fix test case
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
(cherry picked from commit 4aa960b744 )
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-19 15:17:54 +05:30
ruthra kumar
637343f751
Merge pull request #38844 from frappe/mergify/bp/version-15-hotfix/pr-38797
...
fix: wrong paid and cn amount on pos invoice (backport #38797 )
2023-12-19 11:33:23 +05:30
Dany Robert
ffb6d65910
test: partial payment for pos invoice
...
(cherry picked from commit 8772628912 )
2023-12-19 05:33:15 +00:00
Dany Robert
cff9e47162
fix: wrong paid and cn amount on pos invoice
...
(cherry picked from commit 5cb5e09dbb )
2023-12-19 05:33:15 +00:00
Richard Case
dc9b4de976
chore: update tests
2023-12-18 18:13:27 +00:00
Richard Case
a65bc77b02
feat: in_party_currency option for AR/AP reports
2023-12-18 18:13:15 +00:00
mergify[bot]
02ceee6669
fix: not able to make inter-company po from so (backport #38826 ) (backport #38828 ) ( #38833 )
...
fix: not able to make inter-company po from so (backport #38826 ) (#38828 )
fix: not able to make inter-company po from so (#38826 )
(cherry picked from commit 23042dfc3c )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
(cherry picked from commit 32a608f948 )
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-18 18:31:28 +05:30
mergify[bot]
4bd1a5f955
fix: not able to cancel SCR with Batch (backport #38817 ) (backport #38821 ) ( #38829 )
...
fix: not able to cancel SCR with Batch (backport #38817 ) (#38821 )
* fix: not able to cancel SCR with Batch (#38817 )
(cherry picked from commit fb5090fd3f )
# Conflicts:
# erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
* chore: fix test case
* chore: fix test case
* chore: fix test case
* chore: fix test case
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
(cherry picked from commit 71e833c3f2 )
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-18 18:13:15 +05:30
mergify[bot]
6ad75e72e6
perf: index return_against on delivery note (backport #38827 ) ( #38832 )
...
perf: index `return_against` on delivery note (#38827 )
There's a multi-column index but that's useful IFF all parts of column
are part of query.
return against on it's own is VERY unique because it's a primary key, we
don't need a multi-column index here.
(cherry picked from commit 8d79365e0d )
Co-authored-by: Ankush Menat <ankush@frappe.io >
2023-12-18 18:09:42 +05:30
ruthra kumar
c696370cff
Merge pull request #38823 from frappe/mergify/bp/version-15-hotfix/pr-38820
...
refactor: ignore ERR journals in Statment of Accounts (backport #38820 )
2023-12-18 16:24:48 +05:30
ruthra kumar
5a807af505
refactor: ignore ERR journals in Statment of Accounts
...
(cherry picked from commit 39ef75e2d0 )
2023-12-18 10:26:30 +00:00
Raffael Meyer
4fe7988249
Merge pull request #38814 from frappe/mergify/bp/version-15-hotfix/pr-38803
...
fix: groups for current accounts in German CoAs (backport #38803 )
2023-12-17 19:52:24 +01:00
barredterra
58de9913b9
fix: groups for current accounts in German CoAs
...
(cherry picked from commit 259f313af7 )
2023-12-17 18:24:07 +00:00
Deepesh Garg
b52ceceeb7
Merge pull request #38808 from vorasmit/fetch-item-taxes-v15
...
fix: fetch item_tax_template values if fields with fetch_from exisit (#38284 )
2023-12-17 18:51:05 +05:30
mergify[bot]
8990c48e7b
fix: serial and batch bundle return not working (backport #38754 ) ( #38806 )
...
fix: serial and batch bundle return not working (#38754 )
* fix: serial and batch bundle return not working
* test: added test case for delivery note return against denormalized serial no
(cherry picked from commit 0743289925 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-17 18:02:31 +05:30
mergify[bot]
18bd330a59
fix: incorrect available qty for backdated stock reco with batch (backport #37858 ) ( #38811 )
...
fix: incorrect available qty for backdated stock reco with batch (#37858 )
* fix: incorrect available qty for backdated stock reco with batch
* test: added test case
(cherry picked from commit d4c0dbfacc )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-17 17:41:51 +05:30
Deepesh Garg
b02604396d
Merge pull request #38810 from frappe/mergify/bp/version-15-hotfix/pr-38807
...
fix(demo): Demo setup for Canadian COA (#38807 )
2023-12-17 17:13:54 +05:30
Deepesh Garg
7d844411fb
fix(demo): Demo setup for canadian COA
...
(cherry picked from commit c9fd182268 )
2023-12-17 08:35:53 +00:00
Smit Vora
fba28d6941
fix: fetch item_tax_template values if fields with fetch_from exisit
2023-12-17 13:59:22 +05:30
Deepesh Garg
57f7933a4b
Merge pull request #38771 from frappe/mergify/bp/version-15-hotfix/pr-38767
...
fix: skip JVs against bank accounts in tax report (#38767 )
2023-12-16 22:28:55 +05:30
mergify[bot]
2045306283
fix: Reset SLA on issue doesn't work (backport #38789 ) ( #38791 )
...
fix: Reset SLA on issue doesn't work (#38789 )
This was broken since last refactor where it was spun off to work with
all types of doctypes but client side code was never adapted.
(cherry picked from commit fa1c7b663c )
Co-authored-by: Ankush Menat <ankush@frappe.io >
2023-12-15 22:02:33 +05:30
Raffael Meyer
4fb479e2f5
Merge pull request #38788 from barredterra/bp-38440
...
fix(pe): show split alert only on splitting (backport #38440 )
2023-12-15 16:26:33 +01:00
Dany Robert
77dba4834c
fix(pe): show split alert only on splitting
2023-12-15 16:08:48 +01:00
Raffael Meyer
a70be4299e
Merge pull request #38787 from frappe/mergify/bp/version-15-hotfix/pr-38742
...
fix(Purchase Register): show bill_date and bill_no (backport #38742 )
2023-12-15 15:39:45 +01:00
ljain112
4ed86dbff2
fix: show bill_date and bill_no in Purchase Register
...
(cherry picked from commit f53ba178a8 )
2023-12-15 14:25:03 +00:00
Deepesh Garg
63f6970b45
Merge pull request #38783 from frappe/mergify/bp/version-15-hotfix/pr-38691
...
fix: Init internal child table values (#38691 )
2023-12-15 18:48:24 +05:30
Deepesh Garg
7802f6c528
fix: Init internal child table values
...
(cherry picked from commit 2588970d55 )
2023-12-15 12:45:56 +00:00
mergify[bot]
7fc8150617
fix: wrong currency in Stock Balance report (backport #38778 ) ( #38780 )
...
fix: wrong currency in Stock Balance report
(cherry picked from commit 5a83a16e60 )
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-12-15 15:32:59 +05:30
mergify[bot]
6e92c78cbd
fix: asset patch failure due to missing shift_based column (backport #38776 ) ( #38777 )
...
fix: asset patch failure due to missing shift_based column (#38776 )
* fix: add missing daily_prorata_based in get_asset_finance_books_map
* fix: reload Asset Finance Book doctype
(cherry picked from commit 1704180f38 )
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com >
2023-12-15 14:47:24 +05:30
ruthra kumar
5beea361fe
Merge pull request #38775 from frappe/mergify/bp/version-15-hotfix/pr-38766
...
fix: validation error on reconciling PE to Journals as Invoice (backport #38766 )
2023-12-15 14:41:55 +05:30
ruthra kumar
aa5e16e681
fix: validation error on reconciling PE to Journals as Invoice
...
With the same exchange rate on Journal Entry and Payment Entry,
reconcilition should not post exc gain/loss journal and should not
throw validation error
(cherry picked from commit 5eeb650dfd )
2023-12-15 07:44:08 +00:00
ruthra kumar
27f454d07e
Merge pull request #38768 from frappe/mergify/bp/version-15/pr-37625
...
refactor: set exchange rate on foreign currency JE from Bank Reconciliation (backport #37625 )
2023-12-15 13:08:50 +05:30
Gursheen Anand
bf8a2d0e3a
fix: skip jvs against bank accounts
...
(cherry picked from commit f7b2380ec1 )
2023-12-15 07:29:30 +00:00
ruthra kumar
d890391531
refactor: handle bank transaction in foreign currency
...
(cherry picked from commit 74a0d6408a )
2023-12-15 07:06:48 +00:00
ruthra kumar
6e1d9a3dbc
refactor: exc rate on foreign currency JE from Bank Reconciliation
...
(cherry picked from commit 89f484282a )
2023-12-15 07:06:48 +00:00
mergify[bot]
703be50bc7
fix(ux): don't override Item Name and Description in MR (backport #38720 ) ( #38763 )
...
fix(ux): don't override Item Name and Description in MR
(cherry picked from commit 726ac6bda1 )
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-12-15 11:58:20 +05:30
ruthra kumar
013d0ff99c
Merge pull request #38764 from frappe/mergify/bp/version-15-hotfix/pr-37625
...
refactor: set exchange rate on foreign currency JE from Bank Reconciliation (backport #37625 )
2023-12-15 11:41:04 +05:30
ruthra kumar
b1b157aa19
refactor: handle bank transaction in foreign currency
...
(cherry picked from commit 74a0d6408a )
2023-12-15 05:51:44 +00:00
ruthra kumar
e7e5727015
refactor: exc rate on foreign currency JE from Bank Reconciliation
...
(cherry picked from commit 89f484282a )
2023-12-15 05:51:43 +00:00
mergify[bot]
ad3a5b58e4
fix: homepage not working (backport #38755 ) ( #38756 )
...
fix: homepage not working (#38755 )
(cherry picked from commit d6201ce5c7 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-14 23:02:25 +05:30
Raffael Meyer
f501c8b336
Merge pull request #38752 from frappe/mergify/bp/version-15-hotfix/pr-38505
2023-12-14 16:38:29 +01:00
barredterra
f7706211ea
feat: set lead name from email
...
(cherry picked from commit ceeb724acc )
2023-12-14 12:49:41 +00:00
mergify[bot]
a551660d2a
fix: timezone aware SLA banner (backport #38745 ) ( #38747 )
...
fix: timezone aware SLA banner (#38745 )
(cherry picked from commit eaf86a6461 )
Co-authored-by: Ankush Menat <ankush@frappe.io >
2023-12-14 15:59:21 +05:30
ruthra kumar
5cbe170117
Merge pull request #38737 from frappe/mergify/bp/version-15-hotfix/pr-38717
...
fix: fetch exc rate of multi currency journals on reconciliation (backport #38717 )
2023-12-14 09:59:47 +05:30
ruthra kumar
f55b561ff9
fix: fetch exc rate of multi currency journals
...
(cherry picked from commit 1b3ba25220 )
2023-12-14 04:06:48 +00:00
mergify[bot]
753c1aa406
Revert "fix(ux): don't update qty blindly" (backport #38728 ) (backport #38730 ) ( #38734 )
...
Revert "fix(ux): don't update qty blindly" (backport #38728 ) (#38730 )
Revert "fix(ux): don't update qty blindly" (#38728 )
(cherry picked from commit 6851c5042f )
Co-authored-by: Ankush Menat <ankush@frappe.io >
(cherry picked from commit 3fabca1051 )
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-14 00:30:18 +05:30
Frappe PR Bot
ff85f2a940
chore(release): Bumped to Version 15.6.1
...
## [15.6.1](https://github.com/frappe/erpnext/compare/v15.6.0...v15.6.1 ) (2023-12-13)
### Bug Fixes
* supplier removed on selection of item (backport [#38712 ](https://github.com/frappe/erpnext/issues/38712 )) (backport [#38713 ](https://github.com/frappe/erpnext/issues/38713 )) ([#38731 ](https://github.com/frappe/erpnext/issues/38731 )) ([04c605d ](04c605d76b ))
2023-12-13 18:49:38 +00:00
mergify[bot]
04c605d76b
fix: supplier removed on selection of item (backport #38712 ) (backport #38713 ) ( #38731 )
...
fix: supplier removed on selection of item (backport #38712 ) (#38713 )
fix: supplier removed on selection of item (#38712 )
(cherry picked from commit db24e24882 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
(cherry picked from commit feb452b740 )
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-14 00:17:57 +05:30
mergify[bot]
3fabca1051
Revert "fix(ux): don't update qty blindly" (backport #38728 ) ( #38730 )
...
Revert "fix(ux): don't update qty blindly" (#38728 )
(cherry picked from commit 6851c5042f )
Co-authored-by: Ankush Menat <ankush@frappe.io >
2023-12-13 23:16:15 +05:30
Raffael Meyer
32ec73dd96
Merge pull request #38727 from frappe/mergify/bp/version-15-hotfix/pr-38725
2023-12-13 17:48:11 +01:00
barredterra
f30bede2e0
feat: RFQ print preview
...
(cherry picked from commit 27f05145ae )
2023-12-13 16:32:30 +00:00
mergify[bot]
1dcb065c64
fix: barcode scanning for the stock entry (backport #38716 ) ( #38718 )
...
fix: barcode scanning for the stock entry (#38716 )
(cherry picked from commit 13cba5068b )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-13 18:32:48 +05:30
mergify[bot]
feb452b740
fix: supplier removed on selection of item (backport #38712 ) ( #38713 )
...
fix: supplier removed on selection of item (#38712 )
(cherry picked from commit db24e24882 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-13 14:39:00 +05:30
Frappe PR Bot
86b276a3ec
chore(release): Bumped to Version 15.6.0
...
# [15.6.0](https://github.com/frappe/erpnext/compare/v15.5.0...v15.6.0 ) (2023-12-12)
### Bug Fixes
* `split_invoices_based_on_payment_terms` (backport [#37859 ](https://github.com/frappe/erpnext/issues/37859 )) ([#38488 ](https://github.com/frappe/erpnext/issues/38488 )) ([4b76cc4 ](4b76cc46a1 ))
* 1st row depr. sch. value of asset put to less than 180 days acc. to I.T. S. 32 (backport [#38696 ](https://github.com/frappe/erpnext/issues/38696 )) ([#38703 ](https://github.com/frappe/erpnext/issues/38703 )) ([2bd9671 ](2bd96713db ))
* auto delete draft serial and batch bundle (backport [#38637 ](https://github.com/frappe/erpnext/issues/38637 )) ([#38654 ](https://github.com/frappe/erpnext/issues/38654 )) ([b0675f6 ](b0675f6490 ))
* close PO on SCO close (backport [#38667 ](https://github.com/frappe/erpnext/issues/38667 )) ([#38681 ](https://github.com/frappe/erpnext/issues/38681 )) ([4055543 ](4055543f5d ))
* format only if searched text contain link value text ([d79e6e3 ](d79e6e353e ))
* get customers for leaderboard ([9d5c79d ](9d5c79d6b2 ))
* get items for leaderboard ([7cb38a8 ](7cb38a8f22 ))
* get sales partner for leaderboard ([3845d42 ](3845d4294c ))
* get sales person for leaderboard ([2fcfebe ](2fcfebe1d3 ))
* get suppliers for leaderboard ([e205772 ](e205772482 ))
* ignore non-existing regional customizations (backport [#38621 ](https://github.com/frappe/erpnext/issues/38621 )) ([#38624 ](https://github.com/frappe/erpnext/issues/38624 )) ([c70e6f2 ](c70e6f23df ))
* limit end date to current date ([dbdb971 ](dbdb971e10 ))
* negative batch issue (backport [#38688 ](https://github.com/frappe/erpnext/issues/38688 )) ([#38694 ](https://github.com/frappe/erpnext/issues/38694 )) ([a75081b ](a75081b8c0 ))
* not able to make serial and batch using csv import (backport [#38659 ](https://github.com/frappe/erpnext/issues/38659 )) ([#38662 ](https://github.com/frappe/erpnext/issues/38662 )) ([dd07eca ](dd07ecad45 ))
* only highest eligible coupon applied ([#38416 ](https://github.com/frappe/erpnext/issues/38416 )) ([aa66ee6 ](aa66ee64ec ))
* serial and batch bundle permission (backport [#38618 ](https://github.com/frappe/erpnext/issues/38618 )) ([#38619 ](https://github.com/frappe/erpnext/issues/38619 )) ([ce2bd15 ](ce2bd15872 ))
* serial no filter in the Serial No Ledger report (backport [#38669 ](https://github.com/frappe/erpnext/issues/38669 )) ([#38682 ](https://github.com/frappe/erpnext/issues/38682 )) ([d188c8e ](d188c8ec0e ))
* Shipping Address Link Showing in Buying (backport [#38634 ](https://github.com/frappe/erpnext/issues/38634 )) ([#38646 ](https://github.com/frappe/erpnext/issues/38646 )) ([4150ed9 ](4150ed9b3b ))
* show stock qty in popup (backport [#38698 ](https://github.com/frappe/erpnext/issues/38698 )) ([#38699 ](https://github.com/frappe/erpnext/issues/38699 )) ([6e2cde4 ](6e2cde4a21 ))
* typeerror on new sites ([#38692 ](https://github.com/frappe/erpnext/issues/38692 )) ([9239e73 ](9239e735ad ))
* typo in unittest ([#38673 ](https://github.com/frappe/erpnext/issues/38673 )) ([14ee13c ](14ee13c77e ))
* **ux:** don't update qty blindly (backport [#38608 ](https://github.com/frappe/erpnext/issues/38608 )) ([#38639 ](https://github.com/frappe/erpnext/issues/38639 )) ([0b2e2a2 ](0b2e2a2ab5 ))
### Features
* add employee number to client user bootinfo (backport [#38477 ](https://github.com/frappe/erpnext/issues/38477 )) ([#38603 ](https://github.com/frappe/erpnext/issues/38603 )) ([c7dbcbc ](c7dbcbcd17 ))
2023-12-12 16:11:51 +00:00
Deepesh Garg
0d8a52f63b
Merge pull request #38690 from frappe/version-15-hotfix
...
chore: release v15
2023-12-12 21:40:42 +05:30
mergify[bot]
2bd96713db
fix: 1st row depr. sch. value of asset put to less than 180 days acc. to I.T. S. 32 (backport #38696 ) ( #38703 )
...
fix: 1st row depr. sch. value of asset put to less than 180 days acc. to I.T. S. 32 (#38696 )
fix: 1st row value of asset put to less than 180 days acc. to IT S. 32
(cherry picked from commit e7984b3ef9 )
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com >
2023-12-12 21:09:38 +05:30
Raffael Meyer
1d2edec550
Merge pull request #38675 from frappe/mergify/bp/version-15-hotfix/pr-38672
...
fix: get data for leaderboard (backport #38672 )
2023-12-12 13:44:04 +01:00
ruthra kumar
965126df83
Merge pull request #38678 from frappe/mergify/bp/version-15-hotfix/pr-38673
...
fix: typo in unittest (backport #38673 )
2023-12-12 17:35:22 +05:30
mergify[bot]
6e2cde4a21
fix: show stock qty in popup (backport #38698 ) ( #38699 )
...
fix: show stock qty in popup (#38698 )
(cherry picked from commit b562b4cf99 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-12 17:04:57 +05:30
mergify[bot]
a75081b8c0
fix: negative batch issue (backport #38688 ) ( #38694 )
...
fix: negative batch issue (#38688 )
(cherry picked from commit 69d7a640ee )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-12 16:41:26 +05:30
ruthra kumar
b68e1f6ea6
Merge pull request #38693 from frappe/mergify/bp/version-15-hotfix/pr-38692
...
fix: typeerror on new sites (backport #38692 )
2023-12-12 16:03:08 +05:30
ruthra kumar
9239e735ad
fix: typeerror on new sites ( #38692 )
...
(cherry picked from commit fa2d33cb50 )
2023-12-12 10:14:39 +00:00
ruthra kumar
576ff49943
Merge pull request #38687 from frappe/mergify/bp/version-15-hotfix/pr-38685
...
refactor: add `get_list` for virtual child doctypes (backport #38685 )
2023-12-12 15:24:37 +05:30
ruthra kumar
92b5c80a4a
refactor: add get_list for virtual child doctypes
...
(cherry picked from commit 15c90551b6 )
2023-12-12 09:12:39 +00:00
mergify[bot]
d188c8ec0e
fix: serial no filter in the Serial No Ledger report (backport #38669 ) ( #38682 )
...
fix: serial no filter in the Serial No Ledger report (#38669 )
(cherry picked from commit 780c4278e6 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-12 14:33:11 +05:30
mergify[bot]
4055543f5d
fix: close PO on SCO close (backport #38667 ) ( #38681 )
...
fix: close PO on SCO close
(cherry picked from commit b023e5d6b3 )
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-12-12 13:40:30 +05:30
ruthra kumar
fc79c6bf54
Merge pull request #38684 from frappe/mergify/bp/version-15-hotfix/pr-38679
...
refactor(test): repost utility deletion flag test (backport #38679 )
2023-12-12 13:33:24 +05:30
ruthra kumar
522113ba98
refactor(test): update repost settings before test case
...
(cherry picked from commit acb6e8e120 )
2023-12-12 07:16:51 +00:00
ruthra kumar
6469526c26
refactor: increase limit and remove explicit call to start_repost
...
(cherry picked from commit ccff588563 )
2023-12-12 07:16:50 +00:00
ruthra kumar
122e6902ed
refactor: remove explicit commit on repost
...
(cherry picked from commit a97b3db749 )
2023-12-12 07:16:50 +00:00
ruthra kumar
64d93cec66
refactor(test): repost utility deletion flag test
...
(cherry picked from commit cc15f695b4 )
2023-12-12 07:16:50 +00:00
Raffael Meyer
14ee13c77e
fix: typo in unittest ( #38673 )
...
(cherry picked from commit 6ad298adfc )
2023-12-12 04:26:54 +00:00
barredterra
b17178bba9
chore: deprecate unused method
...
(cherry picked from commit 956c3c50a0 )
2023-12-12 04:24:39 +00:00
barredterra
3845d4294c
fix: get sales partner for leaderboard
...
(cherry picked from commit 40c1acc961 )
2023-12-12 04:24:39 +00:00
barredterra
2fcfebe1d3
fix: get sales person for leaderboard
...
(cherry picked from commit 7babfd4ac4 )
2023-12-12 04:24:39 +00:00
barredterra
e205772482
fix: get suppliers for leaderboard
...
(cherry picked from commit 65df4b6aa8 )
2023-12-12 04:24:39 +00:00
barredterra
7cb38a8f22
fix: get items for leaderboard
...
(cherry picked from commit 2721ee3a8d )
2023-12-12 04:24:38 +00:00
barredterra
9d5c79d6b2
fix: get customers for leaderboard
...
(cherry picked from commit 137b5a6108 )
2023-12-12 04:24:38 +00:00
mergify[bot]
dd07ecad45
fix: not able to make serial and batch using csv import (backport #38659 ) ( #38662 )
...
fix: not able to make serial and batch using csv import (#38659 )
(cherry picked from commit 89a0e9c245 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-11 11:29:25 +05:30
mergify[bot]
b0675f6490
fix: auto delete draft serial and batch bundle (backport #38637 ) ( #38654 )
...
fix: auto delete draft serial and batch bundle (#38637 )
(cherry picked from commit 89326bd657 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-10 16:45:03 +05:30
mergify[bot]
4150ed9b3b
fix: Shipping Address Link Showing in Buying (backport #38634 ) ( #38646 )
...
fix(ux): `Shipping Address Link`
(cherry picked from commit ca0c3eb184 )
Co-authored-by: creative-paramu <pparameshwari@thirvusoft.in >
2023-12-08 19:04:24 +05:30
mergify[bot]
0b2e2a2ab5
fix(ux): don't update qty blindly (backport #38608 ) ( #38639 )
...
fix(ux): don't update qty blindly
(cherry picked from commit 0156339f34 )
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-12-08 17:59:32 +05:30
mergify[bot]
c70e6f23df
fix: ignore non-existing regional customizations (backport #38621 ) ( #38624 )
...
fix: ignore non-existing regional customizations (#38621 )
(cherry picked from commit 9611e9bd7f )
Co-authored-by: Ankush Menat <ankush@frappe.io >
2023-12-07 21:43:46 +05:30
Shariq Ansari
5cf0c896bb
Merge pull request #38627 from frappe/mergify/bp/version-15-hotfix/pr-38623
...
fix: format only if searched text contain link value text (backport #38623 )
2023-12-07 20:51:03 +05:30
Shariq Ansari
d79e6e353e
fix: format only if searched text contain link value text
...
(cherry picked from commit 08ed3cd313 )
2023-12-07 15:18:52 +00:00
mergify[bot]
ce2bd15872
fix: serial and batch bundle permission (backport #38618 ) ( #38619 )
...
fix: serial and batch bundle permission (#38618 )
(cherry picked from commit 231ab83562 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-07 18:36:31 +05:30
mergify[bot]
deef6ea66a
chore: minor code cleanup (backport #38615 ) ( #38616 )
...
chore: minor code cleanup (#38615 )
(cherry picked from commit f45dd740c5 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-07 15:36:21 +05:30
mergify[bot]
aa66ee64ec
fix: only highest eligible coupon applied ( #38416 )
...
fix: only highest eligible coupon applied (#38416 )
* fix: application of pricing rule when coupon is used
(cherry picked from commit d34787cf6d )
Co-authored-by: sandratridz <102575830+sandratridz@users.noreply.github.com >
2023-12-07 10:34:11 +05:30
Ankush Menat
eeb0567a73
chore: remove unused cache=True
...
(cherry picked from commit 6a47a2ceaf )
2023-12-06 20:54:43 +05:30
mergify[bot]
c7dbcbcd17
feat: add employee number to client user bootinfo (backport #38477 ) ( #38603 )
...
feat: add employee number to client user bootinfo (#38477 )
(cherry picked from commit 525f656cc1 )
Co-authored-by: Richard Case <110036763+casesolved-co-uk@users.noreply.github.com >
2023-12-06 20:52:50 +05:30
mergify[bot]
4b76cc46a1
fix: split_invoices_based_on_payment_terms (backport #37859 ) ( #38488 )
...
* refactor: `split_invoices_based_on_payment_terms`
- Invoices were in the wrong order due to the logic. The invoices with payment terms were added first and the rest after.
- Overly long function with unnecessary loops (reduced to one main loop) and complexity
- The split row as per payment terms was not ordered. So the second installment was allocated first
(cherry picked from commit 6bd56d2d5f )
* test: `get_outstanding_reference_documents` (triggered via UI)
(cherry picked from commit 162c0497d1 )
# Conflicts:
# erpnext/accounts/doctype/payment_entry/test_payment_entry.py
* fix: Alert message and make sure invoice due dates are different for effective test
- Make invoice due dates are different so that the invoice with the earliest due date is allocated first in the test
- Translate voucher type, simplify alert message. The invoice could be "split" into 1 row, no. of rows in the message seems unnecessary.
(cherry picked from commit 56ac3424d2 )
* style: Remove spaces introduced via merge conflict
(cherry picked from commit 4b4b176fcf )
# Conflicts:
# erpnext/accounts/doctype/payment_entry/test_payment_entry.py
* fix: Re-add no.of rows split in alert message
(cherry picked from commit 1fc5844025 )
* fix: Merge conflicts in tests
---------
Co-authored-by: marination <maricadsouza221197@gmail.com >
2023-12-06 18:01:42 +05:30
Gursheen Kaur Anand
bfe2b923e1
Merge pull request #38572 from frappe/mergify/bp/version-15-hotfix/pr-38556
...
fix(minor): financial statements period end date (backport #38556 )
2023-12-05 22:02:27 +05:30
Frappe PR Bot
6826a1e976
chore(release): Bumped to Version 15.5.0
...
# [15.5.0](https://github.com/frappe/erpnext/compare/v15.4.0...v15.5.0 ) (2023-12-05)
### Bug Fixes
* `AttributeError` while saving Purchase Invoice (backport [#38482 ](https://github.com/frappe/erpnext/issues/38482 )) ([#38490 ](https://github.com/frappe/erpnext/issues/38490 )) ([f6c48e8 ](f6c48e8ecf ))
* `OperationalError` while selecting Serial No in `Warranty Claim` (backport [#38394 ](https://github.com/frappe/erpnext/issues/38394 )) ([#38414 ](https://github.com/frappe/erpnext/issues/38414 )) ([80afeca ](80afeca229 ))
* Add missing french translations ([#38368 ](https://github.com/frappe/erpnext/issues/38368 )) ([b5c89ec ](b5c89ec3b4 ))
* better overlap logic for job card (backport [#38432 ](https://github.com/frappe/erpnext/issues/38432 )) ([#38522 ](https://github.com/frappe/erpnext/issues/38522 )) ([2a9e843 ](2a9e843610 ))
* consider the `Valuation Method` while picking incorrect SLE (backport [#38592 ](https://github.com/frappe/erpnext/issues/38592 )) ([#38595 ](https://github.com/frappe/erpnext/issues/38595 )) ([9d45bbd ](9d45bbd051 ))
* debit credit mismatch in multi-currecy asset purchase receipt ([#38342 ](https://github.com/frappe/erpnext/issues/38342 )) ([b9f26ae ](b9f26ae849 ))
* don't consider cancelled entries ([#38401 ](https://github.com/frappe/erpnext/issues/38401 )) ([0a29dbe ](0a29dbe09e ))
* don't show non-stock items in Stock Analytics report (backport [#38543 ](https://github.com/frappe/erpnext/issues/38543 )) ([#38545 ](https://github.com/frappe/erpnext/issues/38545 )) ([282a5b2 ](282a5b27ad ))
* don't update previous doc on rate change (backport [#38493 ](https://github.com/frappe/erpnext/issues/38493 )) ([#38524 ](https://github.com/frappe/erpnext/issues/38524 )) ([0aa96f7 ](0aa96f783d ))
* exclude `invoice_doctypes` from party advance ([927538f ](927538f776 ))
* exploded items in Subcontracting Receipt (backport [#38441 ](https://github.com/frappe/erpnext/issues/38441 )) ([#38445 ](https://github.com/frappe/erpnext/issues/38445 )) ([e066698 ](e06669847d ))
* german translations for Lost Quotations (backport [#38435 ](https://github.com/frappe/erpnext/issues/38435 )) ([#38516 ](https://github.com/frappe/erpnext/issues/38516 )) ([33c59a2 ](33c59a2bb1 ))
* get dynamic link with parenttype contact ([cb9589b ](cb9589b8ef ))
* incorrect customer outstanding amount ([#38475 ](https://github.com/frappe/erpnext/issues/38475 )) ([98fe89a ](98fe89a24d ))
* incorrect material request quantity in Production Plan (backport [#38566 ](https://github.com/frappe/erpnext/issues/38566 )) ([#38579 ](https://github.com/frappe/erpnext/issues/38579 )) ([145ed3a ](145ed3a3b1 ))
* incorrect ordered qty for Subcontracting Order ([#38415 ](https://github.com/frappe/erpnext/issues/38415 )) ([71fe2bc ](71fe2bcc28 ))
* incorrect requested quantity for the subcontracting order ([abe3e41 ](abe3e41a17 ))
* incorrectly treating normal payment as advance ([#38437 ](https://github.com/frappe/erpnext/issues/38437 )) ([246dd74 ](246dd74ba4 ))
* item group filter in sales person wise report ([602f6ca ](602f6ca545 ))
* make create button translatable ([#38165 ](https://github.com/frappe/erpnext/issues/38165 )) ([95f9cc9 ](95f9cc99b9 ))
* **regional:** use net figures for sales calc ([#38260 ](https://github.com/frappe/erpnext/issues/38260 )) ([4a243ce ](4a243ce5b7 ))
* remove hardcoded, implicit rounding loss allowance ([4baf796 ](4baf7960dd ))
* scan for serial or batch in bundle (backport [#38534 ](https://github.com/frappe/erpnext/issues/38534 )) ([#38552 ](https://github.com/frappe/erpnext/issues/38552 )) ([88d2a8d ](88d2a8d668 ))
* set cwip account before asset tests ([de7e1ab ](de7e1ab237 ))
* show item name as title instead of item group in BOM (backport [#38478 ](https://github.com/frappe/erpnext/issues/38478 )) ([#38481 ](https://github.com/frappe/erpnext/issues/38481 )) ([8e57862 ](8e57862a1c ))
* show party instead of party name where naming series not set ([f120dc5 ](f120dc56c2 ))
* sql error while filtering on finance book in GL ([3779943 ](3779943221 ))
* **test:** use correct account type for testing ([8b6eb35 ](8b6eb3599c ))
* unset discount amount based on coupon code ([0e50e77 ](0e50e77d8e ))
* use `docstatus` instead of `status` (backport [#38439 ](https://github.com/frappe/erpnext/issues/38439 )) ([#38443 ](https://github.com/frappe/erpnext/issues/38443 )) ([a50e872 ](a50e872820 ))
* use predefined onload property `load_after_mapping` ([#38209 ](https://github.com/frappe/erpnext/issues/38209 )) ([4a558b7 ](4a558b7efb ))
* **ux:** make valuation field read only when it can't be modified (backport [#38450 ](https://github.com/frappe/erpnext/issues/38450 )) ([#38464 ](https://github.com/frappe/erpnext/issues/38464 )) ([2d9ba88 ](2d9ba88870 ))
* validation error has not throw for the batch (backport [#38494 ](https://github.com/frappe/erpnext/issues/38494 )) ([#38502 ](https://github.com/frappe/erpnext/issues/38502 )) ([c797c53 ](c797c533ed ))
### Features
* `Company` filter in `Stock Ledger Variance` report (backport [#38553 ](https://github.com/frappe/erpnext/issues/38553 )) ([#38574 ](https://github.com/frappe/erpnext/issues/38574 )) ([02d7dd8 ](02d7dd8b15 ))
* add customer group filter in sales register ([#38365 ](https://github.com/frappe/erpnext/issues/38365 )) ([185b715 ](185b715d43 ))
* auto create PR on SCR submission (backport [#38290 ](https://github.com/frappe/erpnext/issues/38290 )) ([#38428 ](https://github.com/frappe/erpnext/issues/38428 )) ([7005d51 ](7005d51af3 ))
* enable automatic type annotations (backport [#38452 ](https://github.com/frappe/erpnext/issues/38452 )) ([#38454 ](https://github.com/frappe/erpnext/issues/38454 )) ([5e6a4d2 ](5e6a4d257e ))
* shift depreciation for assets (backport [#38327 ](https://github.com/frappe/erpnext/issues/38327 )) ([#38417 ](https://github.com/frappe/erpnext/issues/38417 )) ([12ad1ec ](12ad1ec71a ))
2023-12-05 13:51:15 +00:00
Deepesh Garg
8a9ed0d04f
Merge pull request #38590 from frappe/version-15-hotfix
...
chore: release v15
2023-12-05 19:19:52 +05:30
mergify[bot]
9d45bbd051
fix: consider the Valuation Method while picking incorrect SLE (backport #38592 ) ( #38595 )
...
* fix: incorrect SLE for `Moving Average` valuation method
(cherry picked from commit 8beec58670 )
* feat: add `Valuation Method` column in `Stock Ledger Variance` report
(cherry picked from commit 16c297c2ec )
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-12-05 18:13:43 +05:30
ruthra kumar
acf94dd4ad
Merge pull request #38586 from frappe/mergify/bp/version-15-hotfix/pr-38580
...
fix: sql error while filtering on finance book in GL (backport #38580 )
2023-12-05 15:06:42 +05:30
ruthra kumar
3779943221
fix: sql error while filtering on finance book in GL
...
(cherry picked from commit b1d9f3132d )
2023-12-05 09:11:40 +00:00
mergify[bot]
145ed3a3b1
fix: incorrect material request quantity in Production Plan (backport #38566 ) ( #38579 )
...
fix: incorrect material request quantity in Production Plan (#38566 )
(cherry picked from commit aaa9036eca )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-05 14:24:26 +05:30
ruthra kumar
7076f3d778
Merge pull request #38577 from frappe/mergify/bp/version-15-hotfix/pr-38570
...
refactor: ignore unreconcile doc on PI cancel/delete (backport #38570 )
2023-12-05 13:13:29 +05:30
mergify[bot]
02d7dd8b15
feat: Company filter in Stock Ledger Variance report (backport #38553 ) ( #38574 )
...
feat: `Company` filter in `Stock Ledger Variance` report
(cherry picked from commit fb3421fcce )
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-12-05 12:33:06 +05:30
ruthra kumar
ee87c2a211
refactor: ingore on JE cancel as well
...
(cherry picked from commit 1a5d56977e )
2023-12-05 06:34:14 +00:00
ruthra kumar
c83c97f466
refactor: ignore unreconcile doc on PI cancel/delete
...
(cherry picked from commit 4ca84eadb6 )
2023-12-05 06:34:14 +00:00
Gursheen Anand
dbdb971e10
fix: limit end date to current date
...
(cherry picked from commit ab6e92aae1 )
2023-12-05 05:54:49 +00:00
Shariq Ansari
39e04b119a
Merge pull request #38564 from frappe/mergify/bp/version-15-hotfix/pr-38562
...
fix: get dynamic link with parenttype contact (backport #38562 )
2023-12-04 19:22:37 +05:30
Shariq Ansari
cb9589b8ef
fix: get dynamic link with parenttype contact
...
(cherry picked from commit 3d7ad71b22 )
2023-12-04 13:51:36 +00:00
mergify[bot]
88d2a8d668
fix: scan for serial or batch in bundle (backport #38534 ) ( #38552 )
...
fix: scan for serial or batch in bundle (#38534 )
(cherry picked from commit c8693cdf37 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-04 15:24:28 +05:30
ruthra kumar
92c8eb17ca
Merge pull request #38550 from frappe/mergify/bp/version-15-hotfix/pr-38475
...
fix: incorrect customer outstanding amount (backport #38475 )
2023-12-04 13:57:00 +05:30
NIYAZ RAZAK
98fe89a24d
fix: incorrect customer outstanding amount ( #38475 )
...
* fix: incorrect customer outstanding amount
* chore: resolve linting error
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com >
---------
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com >
(cherry picked from commit 3df1d75bdd )
2023-12-04 08:11:06 +00:00
ruthra kumar
66e3dc7358
Merge pull request #38547 from frappe/mergify/bp/version-15-hotfix/pr-38283
...
chore: move reconciliation cleanup patch to pre-model sync (backport #38283 )
2023-12-04 13:40:48 +05:30
ruthra kumar
e405695838
chore: move reconciliation cleanup patch to pre-model
...
(cherry picked from commit f258ab5e98 )
2023-12-04 07:34:09 +00:00
ruthra kumar
d8f9e3a8b1
Merge pull request #38542 from frappe/mergify/bp/version-15-hotfix/pr-38148
...
refactor: convert Payment Reconciliation to virtual doctype (backport #38148 )
2023-12-04 12:37:06 +05:30
mergify[bot]
282a5b27ad
fix: don't show non-stock items in Stock Analytics report (backport #38543 ) ( #38545 )
...
* fix(ux): stock-item filter for Item Code field
(cherry picked from commit ccdcb7dfcc )
* fix: don't show non-stock items in Stock Analytics report
(cherry picked from commit 01aadbef85 )
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-12-04 12:18:58 +05:30
ruthra kumar
b8b8c02bf9
chore: resolve conflict
2023-12-04 12:16:41 +05:30
ruthra kumar
192343dec2
chore: clear singles table and reconciliation related tables
...
(cherry picked from commit f31002636b )
2023-12-04 06:31:08 +00:00
ruthra kumar
4123f4b0bd
chore: remove reconciliation defaults from patch
...
(cherry picked from commit b5dd0c8630 )
2023-12-04 06:31:08 +00:00
ruthra kumar
bcbf5da905
refactor: virtual doctype methods
...
(cherry picked from commit 9c7b19e0b7 )
2023-12-04 06:31:08 +00:00
ruthra kumar
f6d481de89
refactor: convert payment reconciliation tool to virtual doctype
...
(cherry picked from commit 3a51a3f37e )
# Conflicts:
# erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
2023-12-04 06:31:07 +00:00
ruthra kumar
0b64daf497
Merge pull request #38540 from frappe/mergify/bp/version-15-hotfix/pr-38220
...
fix: exclude `invoice_doctypes` from party advance (backport #38220 )
2023-12-04 11:19:03 +05:30
ruthra kumar
0a05154698
Merge pull request #38538 from frappe/mergify/bp/version-15-hotfix/pr-38437
...
fix: incorrectly treating normal payment as advance (backport #38437 )
2023-12-04 11:08:46 +05:30
Dany Robert
927538f776
fix: exclude invoice_doctypes from party advance
...
(cherry picked from commit f34ffc2062 )
2023-12-04 05:31:50 +00:00
ruthra kumar
246dd74ba4
fix: incorrectly treating normal payment as advance ( #38437 )
...
fix: treating normal payment as advance
(cherry picked from commit dd39da0b77 )
2023-12-04 04:39:16 +00:00
mergify[bot]
b5c89ec3b4
fix: Add missing french translations ( #38368 )
...
fix: Add missing french translations (#38368 )
fix: Add missing french translation
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com >
(cherry picked from commit a1e0197a8b )
Co-authored-by: noec764 <58433943+noec764@users.noreply.github.com >
2023-12-04 09:37:46 +05:30
mergify[bot]
4a558b7efb
fix: use predefined onload property load_after_mapping ( #38209 )
...
fix: use predefined onload property `load_after_mapping` (#38209 )
(cherry picked from commit b6a7549407 )
Co-authored-by: Sagar Vora <sagar@resilient.tech >
2023-12-04 09:36:52 +05:30
mergify[bot]
0aa96f783d
fix: don't update previous doc on rate change (backport #38493 ) ( #38524 )
...
* fix: don't update previous doc on rate change
(cherry picked from commit 68f5dd3e7b )
* fix: `linter`
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-12-03 23:20:53 +05:30
mergify[bot]
33c59a2bb1
fix: german translations for Lost Quotations (backport #38435 ) ( #38516 )
...
fix: german translations for Lost Quotations (#38435 )
(cherry picked from commit 5952cfa673 )
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com >
2023-12-03 23:19:32 +05:30
ruthra kumar
5b1e7666c2
Merge pull request #38528 from frappe/mergify/bp/version-15-hotfix/pr-38525
...
fix: multiple minor fixes in report and Exchange Rate Revaluation (backport #38525 )
2023-12-03 17:04:29 +05:30
ruthra kumar
4baf7960dd
fix: remove hardcoded, implicit rounding loss allowance
...
(cherry picked from commit 64266c4d38 )
2023-12-03 11:14:26 +00:00
ruthra kumar
602f6ca545
fix: item group filter in sales person wise report
...
(cherry picked from commit f4d418ea6d )
2023-12-03 11:14:26 +00:00
mergify[bot]
2a9e843610
fix: better overlap logic for job card (backport #38432 ) ( #38522 )
...
fix: better overlap logic for job card (#38432 )
(cherry picked from commit 74eab91042 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-03 09:49:48 +05:30
mergify[bot]
0a29dbe09e
fix: don't consider cancelled entries ( #38401 )
...
* fix: don't consider cancelled entries
(cherry picked from commit adfcdb3b65 )
* refactor: get outstanding journal entry using query builder
(cherry picked from commit ff27cccff4 )
---------
Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com >
2023-12-02 20:07:26 +05:30
mergify[bot]
185b715d43
feat: add customer group filter in sales register ( #38365 )
...
feat: add customer group filter in sales register
(cherry picked from commit 5a97fa6336 )
Co-authored-by: Nandhinidevi123 <nandhini.devi@thirvusoft.in >
2023-12-02 19:50:35 +05:30
mergify[bot]
c797c533ed
fix: validation error has not throw for the batch (backport #38494 ) ( #38502 )
...
fix: validation error has not throw for the batch (#38494 )
* fix: validation error has not throw for the batch
* chore: fix test cases
(cherry picked from commit 5e9016ffab )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-12-01 21:46:35 +05:30
mergify[bot]
7b363db582
chore: changed sort_order to DESC for customer (backport #38498 ) ( #38501 )
...
chore: changed sort_order to DESC for customer (#38498 )
(cherry picked from commit 6bc40373f2 )
Co-authored-by: Sherin KR <sherinkrply@gmail.com >
2023-12-01 19:09:31 +05:30
Gursheen Kaur Anand
afa6255eee
Merge pull request #38497 from frappe/mergify/bp/version-15-hotfix/pr-38144
...
fix(minor): show party instead of party name where naming series not set (backport #38144 )
2023-12-01 18:20:11 +05:30
Gursheen Anand
f120dc56c2
fix: show party instead of party name where naming series not set
...
(cherry picked from commit b27af6b5c8 )
2023-12-01 12:35:00 +00:00
mergify[bot]
f6c48e8ecf
fix: AttributeError while saving Purchase Invoice (backport #38482 ) ( #38490 )
...
fix: `AttributeError` while saving Purchase Invoice
(cherry picked from commit 60a81a563e )
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-12-01 14:10:31 +05:30
ruthra kumar
bf44e9ed64
Merge pull request #38484 from frappe/mergify/bp/version-15-hotfix/pr-38393
...
refactor: GL entries build logic for `Advance in Separate Party Account` option. (backport #38393 )
2023-12-01 13:26:11 +05:30
mergify[bot]
9cdbd33e40
chore: add translate function to email subject in digest frecuency (backport #38474 ) ( #38487 )
...
chore: add translate function to email subject in digest frecuency (#38474 )
chore: add translate function to email subject in digest frecuency
(cherry picked from commit b24e28953b )
Co-authored-by: Ernesto Ruiz <eruiz@wbapps.com >
2023-12-01 12:43:37 +05:30
ruthra kumar
4a4f4ad323
refactor: handle forex payment advance entries
...
(cherry picked from commit 961bdf0d24 )
2023-12-01 07:07:56 +00:00
ruthra kumar
5d9f71af95
refactor(test): filter on document names
...
(cherry picked from commit 080aa30407 )
2023-12-01 07:07:56 +00:00
ruthra kumar
8b6eb3599c
fix(test): use correct account type for testing
...
(cherry picked from commit eecf9cd1d8 )
2023-12-01 07:07:56 +00:00
ruthra kumar
25b49ef0de
test: ledger pre and post reconciliation on advance as liability
...
(cherry picked from commit 0255e09285 )
2023-12-01 07:07:56 +00:00
ruthra kumar
c67d0eb718
refactor(test): advance allocation on purchase invoice
...
(cherry picked from commit 2add802d0d )
2023-12-01 07:07:56 +00:00
ruthra kumar
86b2de4013
refactor: redefine dr_or_cr for unallocated amount
...
(cherry picked from commit 3e6306348a )
2023-12-01 07:07:55 +00:00
ruthra kumar
8ed2ea29ac
refactor: 'partial' flag to only cancel unlinked ledger entries
...
(cherry picked from commit 2633d7dca3 )
2023-12-01 07:07:55 +00:00
ruthra kumar
65b4dbab2a
refactor: return the newly added reference upon reconciliation
...
(cherry picked from commit ecb533c4d1 )
2023-12-01 07:07:55 +00:00
ruthra kumar
a1bdd69ffd
refactor: 'make_advance_gl_entries' method
...
make_advance_gl_entries -> add_advance_gl_entries -> add_advance_gl_for_reference
'make_advance_gl_entries' - main method thats builds and post GL
entries for all or one specific reference based on parameters
'add_advance_gl_entries' - build GL map for all or one specific
reference. Return an array of dict.
'add_advance_gl_for_reference' - utility function to build gl
entries. returns dict.
(cherry picked from commit 5fc19dab54 )
2023-12-01 07:07:55 +00:00
ruthra kumar
58d04e1f42
refactor: use different GL build logic for advance as liability
...
(cherry picked from commit 58114e7b24 )
2023-12-01 07:07:55 +00:00
ruthra kumar
aaef9d68c0
refactor: post to GL and Payment Ledger on advance as liability
...
(cherry picked from commit 78ab11f991 )
2023-12-01 07:07:54 +00:00
ruthra kumar
bb8ac94adc
test: assert ledger entries on partial reconciliation
...
with `Advance as Liability`, partial reconciliation should not post
duplicate ledger entries for same reference
(cherry picked from commit 3263f2023c )
2023-12-01 07:07:54 +00:00
mergify[bot]
8819d6c173
add supplier group filter in purchase register (backport #38421 ) ( #38483 )
...
add supplier group filter in purchase register (#38421 )
* add supplier group field in purchase register
* Update purchase_register.js
(cherry picked from commit e2a519464b )
Co-authored-by: NandhiniDevi <95607404+Nandhinidevi123@users.noreply.github.com >
2023-12-01 11:51:09 +05:30
mergify[bot]
8e57862a1c
fix: show item name as title instead of item group in BOM (backport #38478 ) ( #38481 )
...
fix: show item name as title instead of item group in BOM (#38478 )
Item fields in BOM used to show Item Group when Items were set to show title as link fields. Now they show Item Name instead
(cherry picked from commit 3a66aefd2c )
Co-authored-by: Gughan Ravikumar <gughanrk@gmail.com >
2023-12-01 11:32:28 +05:30
rohitwaghchaure
b9a42a3b1b
Merge pull request #38472 from frappe/mergify/bp/version-15-hotfix/pr-38455
...
fix: incorrect requested quantity for the subcontracting order (backport #38455 )
2023-11-30 19:25:14 +05:30
Rohit Waghchaure
abe3e41a17
fix: incorrect requested quantity for the subcontracting order
...
(cherry picked from commit 691e3bb24f )
2023-11-30 13:39:06 +00:00
mergify[bot]
2d9ba88870
fix(ux): make valuation field read only when it can't be modified (backport #38450 ) ( #38464 )
...
* fix(ux): make `basic_rate` field read-only based on purpose
(cherry picked from commit abc7d30024 )
* fix(ux): make PR `rate` field read-only having PO ref
(cherry picked from commit ae294ee470 )
* fix(ux): make PI `rate` field read-only having PR ref
(cherry picked from commit 3d4156cc7d )
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-11-30 17:30:35 +05:30
ruthra kumar
03013a8433
Merge pull request #38461 from frappe/mergify/bp/version-15-hotfix/pr-38457
...
refactor: use flt on outstanding on AR/AP summary report (backport #38457 )
2023-11-30 16:42:58 +05:30
ruthra kumar
f44bb0df50
refactor: use flt on outstanding on AR/AP summary report
...
(cherry picked from commit e4bdd3a28d )
2023-11-30 10:55:51 +00:00
mergify[bot]
5e6a4d257e
feat: enable automatic type annotations (backport #38452 ) ( #38454 )
...
feat: enable automatic type annotations (#38452 )
(cherry picked from commit 63313eef6f )
Co-authored-by: Ankush Menat <ankush@frappe.io >
2023-11-30 14:43:16 +05:30
mergify[bot]
7f4d2b707a
refactor: Simpler log settings setup (backport #38449 ) ( #38451 )
...
refactor: Simpler log settings setup (#38449 )
Depends on https://github.com/frappe/frappe/pull/23507
(cherry picked from commit 1da9087cc4 )
Co-authored-by: Ankush Menat <ankush@frappe.io >
2023-11-30 13:30:15 +05:30
ruthra kumar
05da5bfc9a
Merge pull request #38448 from frappe/mergify/bp/version-15-hotfix/pr-38446
...
refactor: pass on filter to up front outstanding query as well (backport #38446 )
2023-11-30 13:18:52 +05:30
ruthra kumar
7a1744691f
refactor: pass on filter to upfront outstanding query as well
...
(cherry picked from commit cfd3230c75 )
2023-11-30 07:26:32 +00:00
mergify[bot]
e06669847d
fix: exploded items in Subcontracting Receipt (backport #38441 ) ( #38445 )
...
fix: exploded items in Subcontracting Receipt
(cherry picked from commit 62b4a263f8 )
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-11-30 12:16:07 +05:30
mergify[bot]
a50e872820
fix: use docstatus instead of status (backport #38439 ) ( #38443 )
...
fix: use `docstatus` instead of `status`
(cherry picked from commit 1423b38d50 )
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-11-30 12:12:02 +05:30
mergify[bot]
7005d51af3
feat: auto create PR on SCR submission (backport #38290 ) ( #38428 )
...
* feat: add field `Action on Purchase Order Submission`
(cherry picked from commit 628ea42b63 )
# Conflicts:
# erpnext/buying/doctype/buying_settings/buying_settings.json
* feat: auto create SCO on PO submission
(cherry picked from commit 9ec6f1e1d6 )
# Conflicts:
# erpnext/buying/doctype/buying_settings/buying_settings.json
* feat: add field `Action on Subcontracting Receipt Submission`
(cherry picked from commit 762906f240 )
# Conflicts:
# erpnext/buying/doctype/buying_settings/buying_settings.json
* chore: notify user on SCO creation
(cherry picked from commit 745e3bfb73 )
* feat: add field `Purchase Order Item` in SCO Service Item
(cherry picked from commit 45d5cff47d )
* fix: hold PO item ref in SCO Service Item
(cherry picked from commit 7e4dd33ab0 )
* feat: add field `Purchase Order Item` in SCO Item
(cherry picked from commit a2ede7d6d5 )
* fix: maintain PO and PO Item ref in SCR Item
(cherry picked from commit e1cea25781 )
* feat: auto create PR on SCR submission
(cherry picked from commit 040cc8d22f )
* feat: add `Purchase Order` link in SCR connections
(cherry picked from commit ca8a5b45ba )
* feat: add `Subcontracting Receipt` link in PO connections
(cherry picked from commit 98cba5ed30 )
* fix: dont show `View` button on cancelled SCR
(cherry picked from commit dd80d3b9b9 )
* fix: use checkbox instead of select field
(cherry picked from commit d366a91d9e )
# Conflicts:
# erpnext/buying/doctype/buying_settings/buying_settings.json
* feat: Subcontracting Receipt ref in Purchase Receipt
(cherry picked from commit d891bd7fac )
* feat: SCR Item ref in PR Item
(cherry picked from commit 37b3ac7952 )
* feat: provision to create PR from SCR
(cherry picked from commit 8052103197 )
* chore: PR ref in SCR connections
(cherry picked from commit 096a2c8cd0 )
* fix: map warehouses in return SCR
(cherry picked from commit 874766a82f )
* fix(ux): hide `Create Purchase Receipt` button for Subcontract Return
(cherry picked from commit 7145b040f1 )
* chore: `linter`
(cherry picked from commit 857f2b5a01 )
* test: auto create SCO on PO submit
(cherry picked from commit 68585f6f2b )
* test: auto create PR on SCR submit
(cherry picked from commit 7b0cd03f88 )
* fix(test): `test_auto_create_purchase_receipt`
(cherry picked from commit 3da0aa6a0b )
* chore: `conflicts`
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-11-30 12:11:05 +05:30
Deepesh Garg
277e81c68e
Merge pull request #38431 from frappe/mergify/bp/version-15-hotfix/pr-38429
...
fix(minor): set capital WIP account before asset tests (#38429 )
2023-11-30 08:15:11 +05:30
Gursheen Anand
de7e1ab237
fix: set cwip account before asset tests
...
(cherry picked from commit ef8e4191cd )
2023-11-29 13:24:56 +00:00
Deepesh Garg
f1456d072c
Merge pull request #38423 from frappe/mergify/bp/version-15-hotfix/pr-38250
...
fix: unset discount amount based on coupon code (#38250 )
2023-11-29 18:21:30 +05:30
Gursheen Anand
0e50e77d8e
fix: unset discount amount based on coupon code
...
(cherry picked from commit 6518582ed3 )
2023-11-29 10:25:19 +00:00
rohitwaghchaure
d0f1dec573
Merge pull request #38411 from frappe/mergify/bp/version-15-hotfix/pr-38165
...
fix: make create button translatable (backport #38165 )
2023-11-29 13:05:03 +05:30
rohitwaghchaure
4bb1cb50ba
Merge pull request #38419 from frappe/mergify/bp/version-15-hotfix/pr-38415
...
fix: incorrect ordered qty for Subcontracting Order (backport #38415 )
2023-11-29 13:02:53 +05:30
rohitwaghchaure
71fe2bcc28
fix: incorrect ordered qty for Subcontracting Order ( #38415 )
...
(cherry picked from commit fddf341f44 )
2023-11-29 06:52:36 +00:00
mergify[bot]
12ad1ec71a
feat: shift depreciation for assets (backport #38327 ) ( #38417 )
...
feat: shift depreciation for assets (#38327 )
* feat: shift depreciation for assets
* chore: create new asset depr schedule on shift change
* refactor: move create_depr_schedule to after_insert
* fix: args in get_depreciation_amount test
* refactor: rename shift adjustment to shift allocation
* chore: asset shift factor doctype and auto allocate shift diff
* chore: use check instead of depr type, and add tests
* chore: make linter happy
* chore: give permissions to accounts users
(cherry picked from commit fe5fc5bd3a )
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com >
2023-11-29 12:15:53 +05:30
mergify[bot]
80afeca229
fix: OperationalError while selecting Serial No in Warranty Claim (backport #38394 ) ( #38414 )
...
* refactor: use arrow function
(cherry picked from commit 1763824e5f )
* refactor: use DocType `Fetch From` instead of `frm.add_fetch`
(cherry picked from commit 01044ca8e9 )
* refactor: use `frm.set_query` to add filters
(cherry picked from commit 640dfab827 )
* refactor: don't use `cur_frm`
(cherry picked from commit 9fadf5f426 )
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-11-29 10:40:41 +05:30
Patrick Eissler
95f9cc99b9
fix: make create button translatable ( #38165 )
...
* fix: make all create buttons translatable
* style: use double quotes
---------
Co-authored-by: PatrickDenis-stack <77415730+PatrickDenis-stack@users.noreply.github.com >
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com >
(cherry picked from commit 8e4b591ea2 )
2023-11-29 04:54:25 +00:00
mergify[bot]
4a243ce5b7
fix(regional): use net figures for sales calc ( #38260 )
...
fix(regional): use net figures for sales calc (#38260 )
(cherry picked from commit 663bb8726c )
Co-authored-by: Dany Robert <danyrt@wahni.com >
2023-11-29 09:08:50 +05:30
mergify[bot]
b9f26ae849
fix: debit credit mismatch in multi-currecy asset purchase receipt ( #38342 )
...
fix: debit credit mismatch in multi-currecy asset purchase receipt (#38342 )
* fix: Debit credit mimatch in multicurrecy asset purchase receipt
* test: multi currency purchase receipt
* chore: update init files
* test: roolback
(cherry picked from commit add238c892 )
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com >
2023-11-29 09:06:34 +05:30
Frappe PR Bot
d4a3d6bbe0
chore(release): Bumped to Version 15.4.0
...
# [15.4.0](https://github.com/frappe/erpnext/compare/v15.3.0...v15.4.0 ) (2023-11-28)
### Bug Fixes
* allow on submit for child table fields ([ac7615a ](ac7615ac01 ))
* annual income and expenses in digest ([ca2ad17 ](ca2ad175d3 ))
* check reposting settings before allowing editable si ([25bf475 ](25bf475d5a ))
* condition in other bundle utils ([e4d9ef1 ](e4d9ef1293 ))
* create contact if existing customer doesn't have contact ([b1b065d ](b1b065daf1 ))
* display all item rate stop messages (backport [#38289 ](https://github.com/frappe/erpnext/issues/38289 )) ([#38307 ](https://github.com/frappe/erpnext/issues/38307 )) ([99c1fbf ](99c1fbf9fc ))
* do not set repost flag without validating voucher ([6a3c3b4 ](6a3c3b4cac ))
* don't depreciate assets with no schedule on scrapping (backport [#38276 ](https://github.com/frappe/erpnext/issues/38276 )) ([#38293 ](https://github.com/frappe/erpnext/issues/38293 )) ([18613c5 ](18613c595f ))
* filter bundle items based on disabled check ([fb517e8 ](fb517e823f ))
* fiscal year using future date ([b9a1fac ](b9a1fac7d8 ))
* has_product_bundle util to only check for enabled bundles ([5c12872 ](5c12872f70 ))
* job card overlap validation (backport [#38345 ](https://github.com/frappe/erpnext/issues/38345 )) ([#38348 ](https://github.com/frappe/erpnext/issues/38348 )) ([d6fe7eb ](d6fe7eb10c ))
* make parameters of `create_subscription_process` optional (and other minor fixes) ([#38360 ](https://github.com/frappe/erpnext/issues/38360 )) ([721b429 ](721b429d93 ))
* Negative Qty and Rates in SO/PO (backport [#38252 ](https://github.com/frappe/erpnext/issues/38252 )) ([#38357 ](https://github.com/frappe/erpnext/issues/38357 )) ([14174df ](14174df862 ))
* no fstring in translation (backport [#38381 ](https://github.com/frappe/erpnext/issues/38381 )) ([#38387 ](https://github.com/frappe/erpnext/issues/38387 )) ([c101855 ](c1018555a0 ))
* patch - Duplicate entry quality inspection parameter (backport [#38262 ](https://github.com/frappe/erpnext/issues/38262 )) ([#38264 ](https://github.com/frappe/erpnext/issues/38264 )) ([4c9890a ](4c9890a24e ))
* Payment Reco Issue and chart of account importer ([4699887 ](4699887f1c ))
* serial no status (backport [#38391 ](https://github.com/frappe/erpnext/issues/38391 )) ([#38397 ](https://github.com/frappe/erpnext/issues/38397 )) ([b65c225 ](b65c22579d ))
* Server Error while creating Product Bundle (backport [#38377 ](https://github.com/frappe/erpnext/issues/38377 )) ([#38380 ](https://github.com/frappe/erpnext/issues/38380 )) ([922aef6 ](922aef665b ))
* skip disabled bundles for non-report utils ([3d46b32 ](3d46b323b3 ))
* skip fixed assets in parent ([314a91a ](314a91ac4d ))
* Supplier `Primary Contact` (backport [#38268 ](https://github.com/frappe/erpnext/issues/38268 )) ([#38286 ](https://github.com/frappe/erpnext/issues/38286 )) ([37d1f1a ](37d1f1ac67 ))
* **ux:** Sales Order Stock Reservation Dialog (backport [#38261 ](https://github.com/frappe/erpnext/issues/38261 )) ([#38344 ](https://github.com/frappe/erpnext/issues/38344 )) ([3cbe599 ](3cbe59902a ))
* validation for existing bundles ([c0de9c0 ](c0de9c0cef ))
### Features
* add Bank Transaction to connections in Journal and Payment Entry (backport [#38297 ](https://github.com/frappe/erpnext/issues/38297 )) ([#38301 ](https://github.com/frappe/erpnext/issues/38301 )) ([72647b8 ](72647b8624 ))
* add disabled field in product bundle ([fcd53be ](fcd53be188 ))
* new Report "Lost Quotations" ([#38309 ](https://github.com/frappe/erpnext/issues/38309 )) ([ea2c348 ](ea2c3487a3 ))
### Performance Improvements
* optimize total_purchase_cost update ([deed9f5 ](deed9f5840 ))
2023-11-28 16:24:28 +00:00
rohitwaghchaure
4bfdab93ad
Merge pull request #38383 from frappe/version-15-hotfix
...
chore: release v15
2023-11-28 21:53:16 +05:30
mergify[bot]
c1018555a0
fix: no fstring in translation (backport #38381 ) ( #38387 )
...
fix: no fstring in translation (#38381 )
(cherry picked from commit 8f00481c5f )
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com >
2023-11-28 21:36:05 +05:30
Shariq Ansari
9f873749e2
Merge pull request #38400 from frappe/mergify/bp/version-15-hotfix/pr-38398
...
fix(CRM): create contact if existing customer doesn't have contact (backport #38398 )
2023-11-28 20:45:34 +05:30
Shariq Ansari
b1b065daf1
fix: create contact if existing customer doesn't have contact
...
(cherry picked from commit 23b0b8ba36 )
2023-11-28 14:20:10 +00:00
Gursheen Kaur Anand
33b3355cb3
Merge pull request #38396 from frappe/mergify/bp/version-15-hotfix/pr-38392
...
fix: imports for renamed report (backport #38392 )
2023-11-28 19:21:37 +05:30
mergify[bot]
b65c22579d
fix: serial no status (backport #38391 ) ( #38397 )
...
fix: serial no status (#38391 )
(cherry picked from commit 592fc81260 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-11-28 18:31:23 +05:30
Gursheen Anand
573c4d2bfc
chore: fix imports for renamed report
...
(cherry picked from commit aee2e12f39 )
2023-11-28 12:53:53 +00:00
mergify[bot]
922aef665b
fix: Server Error while creating Product Bundle (backport #38377 ) ( #38380 )
...
* fix: product bundle search input
(cherry picked from commit 729fc738af )
* fix: don't select all fields
(cherry picked from commit 8c3713b649 )
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-11-28 14:54:05 +05:30
mergify[bot]
a6f3a103db
chore: fix flaky test case (backport #38369 ) ( #38373 )
...
chore: fix flaky test case (#38369 )
(cherry picked from commit ad3634be7c )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-11-28 08:36:06 +05:30
Sagar Vora
8c906b422f
Merge pull request #38366 from frappe/mergify/bp/version-15-hotfix/pr-38360
...
fix: make parameters of `create_subscription_process` optional (and other minor fixes) (backport #38360 )
2023-11-27 21:06:36 +05:30
Sagar Vora
721b429d93
fix: make parameters of create_subscription_process optional (and other minor fixes) ( #38360 )
...
(cherry picked from commit 5a53a4b044 )
2023-11-27 14:53:39 +00:00
ruthra kumar
7385db0cce
Merge pull request #38359 from frappe/mergify/bp/version-15-hotfix/pr-38354
...
refactor: handle rounding loss on AR/AP reports (backport #38354 )
2023-11-27 12:16:13 +05:30
ruthra kumar
8564d58afe
refactor: handle rounding loss on AR/AP reports
...
(cherry picked from commit 592ce45da7 )
2023-11-27 06:22:52 +00:00
mergify[bot]
4699887f1c
fix: Payment Reco Issue and chart of account importer
...
fix: Payment Reco Issue and chart of account importer
2023-11-27 10:31:12 +05:30
mergify[bot]
14174df862
fix: Negative Qty and Rates in SO/PO (backport #38252 ) ( #38357 )
...
fix: Negative Qty and Rates in SO/PO (#38252 )
* fix: Don't allow negative qty in SO/PO
* fix: Type casting for safe comparisons
* fix: Grammar in error message
* fix: Negative rates should be allowed via Update Items in SO/PO
* fix: Use `non_negative` property in docfield & emove code validation
(cherry picked from commit b9f5a1c85d )
Co-authored-by: Marica <maricadsouza221197@gmail.com >
2023-11-27 09:30:16 +05:30
ruthra kumar
5d993d4bc7
Merge pull request #38356 from frappe/mergify/bp/version-15-hotfix/pr-38081
...
fix: check reposting ledger settings before setting repost flag (backport #38081 )
2023-11-27 09:29:22 +05:30
ruthra kumar
378dc50aa4
chore: resolve conflict
2023-11-27 09:09:04 +05:30
Gursheen Anand
25bf475d5a
fix: check reposting settings before allowing editable si
...
(cherry picked from commit 894ae1fe0f )
2023-11-27 03:35:39 +00:00
Gursheen Anand
ac7615ac01
fix: allow on submit for child table fields
...
(cherry picked from commit 5fae2f6d57 )
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
2023-11-27 03:35:39 +00:00
Gursheen Anand
6a3c3b4cac
fix: do not set repost flag without validating voucher
...
(cherry picked from commit ad5edbb1de )
2023-11-27 03:35:38 +00:00
Gursheen Anand
85bd649c64
refactor: validate reposting settings for editables inv
...
(cherry picked from commit 780b827adc )
2023-11-27 03:35:38 +00:00
mergify[bot]
3cbe59902a
fix(ux): Sales Order Stock Reservation Dialog (backport #38261 ) ( #38344 )
...
* fix(ux): no need to select rows to reserve the stock
(cherry picked from commit 9c889b37fb )
* fix: use field `sales_order_item` instead `name`
(cherry picked from commit 73586fd9b2 )
* fix(ux): no need to select rows to unreserve the stock
(cherry picked from commit 2a41da94d4 )
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-11-26 22:25:51 +05:30
mergify[bot]
cda5ff40f1
refactor: bank transaction ( #38182 )
...
refactor: bank transaction (#38182 )
(cherry picked from commit 5426b93387 )
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com >
2023-11-26 18:57:01 +05:30
mergify[bot]
d6fe7eb10c
fix: job card overlap validation (backport #38345 ) ( #38348 )
...
fix: job card overlap validation (#38345 )
(cherry picked from commit d8245cef72 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-11-26 16:28:51 +05:30
Deepesh Garg
e0f9c64290
Merge pull request #38332 from frappe/mergify/bp/version-15-hotfix/pr-38309
...
feat: new Report "Lost Quotations" (#38309 )
2023-11-25 17:36:50 +05:30
Raffael Meyer
ea2c3487a3
feat: new Report "Lost Quotations" ( #38309 )
...
(cherry picked from commit 477d9fa87e )
2023-11-24 21:28:38 +00:00
Deepesh Garg
64d9c5d61c
Merge pull request #38316 from frappe/mergify/bp/version-15-hotfix/pr-38269
...
fix: skip fixed assets in product bundle (backport #38269 )
2023-11-24 16:30:29 +05:30
Deepesh Garg
18f9650188
Merge pull request #38325 from frappe/mergify/bp/version-15-hotfix/pr-38273
...
fix: annual income and expenses in email digest (#38273 )
2023-11-24 16:29:43 +05:30
Gursheen Anand
b9a1fac7d8
fix: fiscal year using future date
...
(cherry picked from commit 728cc9f725 )
2023-11-24 09:51:31 +00:00
Gursheen Anand
ca2ad175d3
fix: annual income and expenses in digest
...
(cherry picked from commit 52305e3000 )
2023-11-24 09:51:30 +00:00
ruthra kumar
2d6b2f7ae3
Merge pull request #38319 from frappe/mergify/bp/version-15-hotfix/pr-38298
...
perf: optimize update_purchase_cost method (backport #38298 )
2023-11-24 12:21:26 +05:30
ruthra kumar
7fc4e211bc
refactor: update project costing based on frequency
...
(cherry picked from commit dd016e6ced )
2023-11-24 06:20:11 +00:00
ruthra kumar
c06388fe48
refactor: make update_project_cost optional through Buying Settings
...
(cherry picked from commit 0fe6dcd742 )
2023-11-24 06:20:11 +00:00
ruthra kumar
28e695baf8
refactor: provide UI button to recalculate when needed
...
(cherry picked from commit bcbe6c4a53 )
2023-11-24 06:20:10 +00:00
ruthra kumar
deed9f5840
perf: optimize total_purchase_cost update
...
(cherry picked from commit aa17110bde )
2023-11-24 06:20:10 +00:00
ruthra kumar
220a0f4b11
Merge pull request #38312 from frappe/mergify/bp/version-15-hotfix/pr-38296
...
chore: index to speed up basic submit/cancel functions on purchase invoice (backport #38296 )
2023-11-24 10:04:43 +05:30
Gursheen Anand
d076aca998
chore: linting issues
...
(cherry picked from commit 1657337887 )
2023-11-24 04:30:39 +00:00
Gursheen Anand
3d46b323b3
fix: skip disabled bundles for non-report utils
...
(cherry picked from commit 362f377f61 )
2023-11-24 04:30:38 +00:00
Gursheen Anand
e4d9ef1293
fix: condition in other bundle utils
...
(cherry picked from commit 8bdb61cb87 )
2023-11-24 04:30:38 +00:00
Gursheen Anand
c0de9c0cef
fix: validation for existing bundles
...
(cherry picked from commit 67f43d37df )
2023-11-24 04:30:38 +00:00
Gursheen Anand
5c12872f70
fix: has_product_bundle util to only check for enabled bundles
...
(cherry picked from commit 3543f86c63 )
2023-11-24 04:30:38 +00:00
Gursheen Anand
fb517e823f
fix: filter bundle items based on disabled check
...
(cherry picked from commit 874774fe6c )
2023-11-24 04:30:38 +00:00
Gursheen Anand
fcd53be188
feat: add disabled field in product bundle
...
(cherry picked from commit ee76af7681 )
2023-11-24 04:30:38 +00:00
Gursheen Anand
314a91ac4d
fix: skip fixed assets in parent
...
(cherry picked from commit f9713eeb56 )
2023-11-24 04:30:37 +00:00
ruthra kumar
7282dd1a85
chore: speed up Purchase Invoice cancellation
...
(cherry picked from commit 1efff268b0 )
2023-11-24 04:16:22 +00:00
ruthra kumar
3720b7171b
chore: index to speed up queries on JE child table reference
...
(cherry picked from commit 24fcd67f8b )
2023-11-24 04:16:22 +00:00
mergify[bot]
99c1fbf9fc
fix: display all item rate stop messages (backport #38289 ) ( #38307 )
...
fix: display all item rate stop messages (#38289 )
(cherry picked from commit 3f6d805033 )
Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com >
2023-11-23 23:39:53 +05:30
mergify[bot]
30c349b010
add flt() for None type error (backport #38299 ) ( #38306 )
...
add flt() for None type error (#38299 )
(cherry picked from commit 64b44a360a )
Co-authored-by: NandhiniDevi <95607404+Nandhinidevi123@users.noreply.github.com >
2023-11-23 22:42:37 +05:30
mergify[bot]
4c9890a24e
fix: patch - Duplicate entry quality inspection parameter (backport #38262 ) ( #38264 )
...
fix: patch - Duplicate entry quality inspection parameter (#38262 )
(cherry picked from commit 0ca7527f7a )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-11-23 22:39:26 +05:30
mergify[bot]
72647b8624
feat: add Bank Transaction to connections in Journal and Payment Entry (backport #38297 ) ( #38301 )
...
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com >
2023-11-23 15:09:23 +01:00
mergify[bot]
18613c595f
fix: don't depreciate assets with no schedule on scrapping (backport #38276 ) ( #38293 )
...
fix: don't depreciate assets with no schedule on scrapping (#38276 )
fix: don't depreciate non-depreciable assets on scrapping
(cherry picked from commit 816b1b6bd5 )
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com >
2023-11-23 14:05:08 +05:30
mergify[bot]
37d1f1ac67
fix: Supplier Primary Contact (backport #38268 ) ( #38286 )
...
fix: Supplier `Primary Contact`
(cherry picked from commit 627165dc7c )
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-11-23 11:13:32 +05:30
ruthra kumar
fb4235c528
Merge pull request #38282 from frappe/mergify/bp/version-15-hotfix/pr-38258
...
refactor: rename 'Unreconcile Payments' doctype to singular 'Unreconcile Payment' (backport #38258 )
2023-11-23 11:09:33 +05:30
ruthra kumar
100ce27a60
chore: update new unreconcile doctype name in JS and PY files
...
(cherry picked from commit 74f9e34182 )
2023-11-23 05:09:24 +00:00
ruthra kumar
df70e048cf
chore: rename 'unreconcile payments' to 'unreconcile payment'
...
(cherry picked from commit 9006c9b747 )
2023-11-23 05:09:23 +00:00
ruthra kumar
0c3c36f658
Merge pull request #38280 from frappe/mergify/bp/version-15-hotfix/pr-38257
...
refactor: optmize outstanding amount query (backport #38257 )
2023-11-23 10:36:53 +05:30
ruthra kumar
d01a480149
refactor: optimize outstanding vouchers query
...
(cherry picked from commit 8b04c1d4f6 )
2023-11-23 10:14:25 +05:30
Frappe PR Bot
33869a231c
chore(release): Bumped to Version 15.3.0
...
# [15.3.0](https://github.com/frappe/erpnext/compare/v15.2.0...v15.3.0 ) (2023-11-21)
### Bug Fixes
* attributes were mandatory for manufacturers ([00b9c23 ](00b9c2326c ))
* issue occured when creating supplier with contact details ([aaccfeb ](aaccfeb918 ))
* overallocation on Payment with PO/SO ([337707b ](337707b9cc ))
* pass check permission in render_address ([a420e13 ](a420e13765 ))
* payment entry rounding error ([384d6b5 ](384d6b516c ))
* set asset's valuation_rate according to asset quantity (backport [#38254 ](https://github.com/frappe/erpnext/issues/38254 )) ([#38256 ](https://github.com/frappe/erpnext/issues/38256 )) ([c60aaa7 ](c60aaa799a ))
* set default asset quantity as 1 [dev] (backport [#38223 ](https://github.com/frappe/erpnext/issues/38223 )) ([#38226 ](https://github.com/frappe/erpnext/issues/38226 )) ([99bf63e ](99bf63ec0f ))
* Suppier name was not taken when creating address from supplier ([2b94489 ](2b9448962f ))
* Supplier Quotation fields ([#37963 ](https://github.com/frappe/erpnext/issues/37963 )) ([aef955c ](aef955c920 ))
* test case for rounded total with cash disc ([eab18e6 ](eab18e6f71 ))
* **Timesheet:** reset billing hours equal to hours if they exceed actual hours (backport [#38134 ](https://github.com/frappe/erpnext/issues/38134 )) ([#38153 ](https://github.com/frappe/erpnext/issues/38153 )) ([5b7b431 ](5b7b431dc9 ))
* **Timesheet:** warn user if billing hours > actual hours instead of resetting (backport [#38239 ](https://github.com/frappe/erpnext/issues/38239 )) ([#38241 ](https://github.com/frappe/erpnext/issues/38241 )) ([1f2f5d8 ](1f2f5d8cf6 ))
* TypeError in Subcontracting Receipt (backport [#38200 ](https://github.com/frappe/erpnext/issues/38200 )) ([#38208 ](https://github.com/frappe/erpnext/issues/38208 )) ([3f57a7e ](3f57a7e9f0 ))
* update modified timestamp ([a492e57 ](a492e574de ))
* **ux:** `Task` creation from `Timesheet` (backport [#38207 ](https://github.com/frappe/erpnext/issues/38207 )) ([#38211 ](https://github.com/frappe/erpnext/issues/38211 )) ([e272041 ](e272041872 ))
* valuation rate for FG item for subcontracting receipt (backport [#38244 ](https://github.com/frappe/erpnext/issues/38244 )) ([#38245 ](https://github.com/frappe/erpnext/issues/38245 )) ([ed7b845 ](ed7b845a55 ))
* valuation rate in report Item Prices ([#38161 ](https://github.com/frappe/erpnext/issues/38161 )) ([f71234e ](f71234e3af ))
* wrong round off and rounded total ([70eccf7 ](70eccf7da0 ))
### Features
* add `Supplier Delivery Note` field in SCR (backport [#38127 ](https://github.com/frappe/erpnext/issues/38127 )) ([#38156 ](https://github.com/frappe/erpnext/issues/38156 )) ([b89a4a7 ](b89a4a7218 ))
* Add accounting dimensions to Supplier Quotation ([7d4ac7e ](7d4ac7e7ff ))
2023-11-21 18:57:56 +00:00
Deepesh Garg
de783da2b6
Merge pull request #38248 from frappe/version-15-hotfix
...
chore: release v15
2023-11-22 00:26:18 +05:30
mergify[bot]
c60aaa799a
fix: set asset's valuation_rate according to asset quantity (backport #38254 ) ( #38256 )
...
fix: set asset's valuation_rate according to asset quantity (#38254 )
(cherry picked from commit e2bb4e2baa )
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com >
2023-11-21 22:57:34 +05:30
ruthra kumar
07c0ed127a
Merge pull request #38236 from frappe/mergify/bp/version-15-hotfix/pr-38234
...
test: prevent rounding loss based validation error (backport #38234 )
2023-11-21 15:00:40 +05:30
mergify[bot]
ed7b845a55
fix: valuation rate for FG item for subcontracting receipt (backport #38244 ) ( #38245 )
...
fix: valuation rate for FG item for subcontracting receipt (#38244 )
(cherry picked from commit 5c308a4f9a )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-11-21 14:53:03 +05:30
ruthra kumar
c84c97577f
Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-38234
2023-11-21 13:43:58 +05:30
mergify[bot]
1f2f5d8cf6
fix(Timesheet): warn user if billing hours > actual hours instead of resetting (backport #38239 ) ( #38241 )
...
fix(Timesheet): warn user if billing hours > actual hours instead of resetting (#38239 )
* revert: "fix(Timesheet): reset billing hours equal to hours if they exceed actual hours"
This reverts commit 0ec8034507 .
* fix: warn user if billing hours > actual hours
(cherry picked from commit ac91030b31 )
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com >
2023-11-21 13:41:50 +05:30
ruthra kumar
bb77546849
Merge pull request #38237 from frappe/mergify/bp/version-15-hotfix/pr-37586
...
fix: overallocation on purchase order to multiple invoices (backport #37586 )
2023-11-21 13:26:39 +05:30
ruthra kumar
2bec89a5bf
chore: fix flakiness test_sales_order_partial_advance_payment
...
(cherry picked from commit 4dff2c7a0d )
2023-11-21 07:03:07 +00:00
ruthra kumar
034375b4f5
refactor(test): make use of utility methods
...
(cherry picked from commit 547993f801 )
2023-11-21 07:03:06 +00:00
ruthra kumar
9600a2cdb7
test: overalloction on reconciliation when PO is involved
...
(cherry picked from commit 946228d783 )
2023-11-21 07:03:06 +00:00
ruthra kumar
337707b9cc
fix: overallocation on Payment with PO/SO
...
(cherry picked from commit 23df4205f8 )
2023-11-21 07:03:05 +00:00
ruthra kumar
15f40a7af6
test: prevent rounding loss based validation error
...
(cherry picked from commit 56e991b7f4 )
2023-11-21 12:16:36 +05:30
mergify[bot]
99bf63ec0f
fix: set default asset quantity as 1 [dev] (backport #38223 ) ( #38226 )
...
fix: set default asset quantity as 1 [dev] (#38223 )
* fix: make default asset quantity as 1
* fix: get rate_of_depreciation from asset category for asset auto-creation
* chore: create asset depr schedules on PR submit, not asset submit
* fix: set default asset quantity as 1
* chore: move patch from v15 to v14
(cherry picked from commit 9903049c7a )
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com >
2023-11-20 22:49:38 +05:30
ruthra kumar
491e9b4fd5
Merge pull request #38214 from frappe/mergify/bp/version-15-hotfix/pr-38210
...
refactor: extend billed amount update flag to POS Invoice as well (backport #38210 )
2023-11-20 15:02:24 +05:30
ruthra kumar
f88ec533e6
Merge pull request #38216 from frappe/mergify/bp/version-15-hotfix/pr-38212
...
refactor: update scheduled job for bulk transaction (backport #38212 )
2023-11-20 14:49:33 +05:30
ruthra kumar
afaf6afd27
refactor: update scheduled job for bulk transaction
...
(cherry picked from commit fb06ad7330 )
2023-11-20 08:51:31 +00:00
ruthra kumar
1ed65524e5
refactor: add flag to POS Invoice
...
(cherry picked from commit 83a13e22b7 )
2023-11-20 08:36:51 +00:00
ruthra kumar
5da9a22e4c
refactor: set default for 'update_billed_amount_in_delivery_note'
...
(cherry picked from commit ee0c64215d )
2023-11-20 08:36:50 +00:00
mergify[bot]
e272041872
fix(ux): Task creation from Timesheet (backport #38207 ) ( #38211 )
...
* fix(ux): enable `Quick Entry` for `Task`
(cherry picked from commit 331ad62f3c )
* fix: add route options for new `Task`
(cherry picked from commit 2f3fc12c08 )
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-11-20 12:44:26 +05:30
mergify[bot]
3f57a7e9f0
fix: TypeError in Subcontracting Receipt (backport #38200 ) ( #38208 )
...
fix: TypeError in Subcontracting Receipt
(cherry picked from commit f6e93f084a )
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-11-20 12:40:41 +05:30
ruthra kumar
2186e1cce4
Merge pull request #38197 from frappe/mergify/bp/version-15-hotfix/pr-38159
...
refactor: provision to truncate `remarks` in General Ledger and Accounts Receivable/Payable reports (backport #38159 )
2023-11-20 12:31:44 +05:30
Sagar Vora
7622a2791e
Merge pull request #38199 from frappe/mergify/bp/version-15-hotfix/pr-37963
...
fix: Supplier Quotation fields (backport #37963 )
2023-11-20 11:47:01 +05:30
Sagar Vora
88b62a0a61
chore: resolve conflicts
2023-11-20 11:42:57 +05:30
Vishakh Desai
aef955c920
fix: Supplier Quotation fields ( #37963 )
...
(cherry picked from commit c2bda2c705 )
# Conflicts:
# erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
2023-11-20 04:42:48 +00:00
ruthra kumar
c2cb86b40a
refactor: add substring logic in ar/ap report
...
(cherry picked from commit a9bf906545 )
2023-11-20 04:38:26 +00:00
ruthra kumar
9ee8a78083
refactor: provision to set remarks length in accounts settings
...
(cherry picked from commit 97090ff367 )
2023-11-20 04:38:26 +00:00
Deepesh Garg
0f227aa883
Merge pull request #38191 from frappe/mergify/bp/version-15-hotfix/pr-38171
...
fix: wrong round off and rounded total (#38171 )
2023-11-19 19:44:23 +05:30
Deepesh Garg
fc1ee1b3ed
Merge pull request #38174 from frappe/mergify/bp/version-15-hotfix/pr-38147
...
fix: issue occured when creating supplier with contact details (#38147 )
2023-11-19 19:21:36 +05:30
Deepesh Garg
cf7d0ab8a5
Merge pull request #38176 from frappe/mergify/bp/version-15-hotfix/pr-38163
...
fix: attributes were mandatory for manufacturers (#38163 )
2023-11-19 19:20:56 +05:30
Deepesh Garg
c29bc8c97f
chore: linting issues
2023-11-19 19:20:06 +05:30
Dany Robert
eab18e6f71
fix: test case for rounded total with cash disc
...
(cherry picked from commit cc60c328fe )
2023-11-19 13:49:19 +00:00
Dany Robert
70eccf7da0
fix: wrong round off and rounded total
...
(cherry picked from commit 3a487bd33a )
2023-11-19 13:49:19 +00:00
Deepesh Garg
d0ae566e38
Merge pull request #38189 from frappe/mergify/bp/version-15-hotfix/pr-38177
...
fix: payment entry rounding error (#38177 )
2023-11-19 19:10:59 +05:30
Devin Slauenwhite
384d6b516c
fix: payment entry rounding error
...
(cherry picked from commit 3d1e3a9cde )
2023-11-19 13:17:51 +00:00
Deepesh Garg
13d965276f
Merge pull request #38180 from frappe/mergify/bp/version-15-hotfix/pr-38161
...
fix: valuation rate in report Item Prices (#38161 )
2023-11-19 18:44:50 +05:30
Deepesh Garg
7be7c6a479
Merge pull request #38173 from frappe/mergify/bp/version-15-hotfix/pr-38142
...
feat: Add accounting dimensions to Supplier Quotation (#38142 )
2023-11-19 17:08:04 +05:30
Patrick Eissler
f71234e3af
fix: valuation rate in report Item Prices ( #38161 )
...
Co-authored-by: PatrickDenis-stack <77415730+PatrickDenis-stack@users.noreply.github.com >
(cherry picked from commit 32f622ef80 )
2023-11-18 14:55:16 +00:00
barredterra
a492e574de
fix: update modified timestamp
...
Was missing in 434c2a1815
2023-11-18 15:44:59 +01:00
PatrickDenis-stack
00b9c2326c
fix: attributes were mandatory for manufacturers
...
(cherry picked from commit 434c2a1815 )
2023-11-18 14:39:01 +00:00
Deepesh Garg
3172448c31
chore: Resolve conflicts
2023-11-18 19:58:10 +05:30
Kunhi
2b9448962f
fix: Suppier name was not taken when creating address from supplier
...
(cherry picked from commit 545ef3c234 )
2023-11-18 14:18:32 +00:00
kunhi
aaccfeb918
fix: issue occured when creating supplier with contact details
...
(cherry picked from commit 7842c9fba8 )
2023-11-18 14:18:31 +00:00
Deepesh Garg
7d4ac7e7ff
feat: Add accounting dimensions to Supplier Quotation
...
(cherry picked from commit 089da459f7 )
# Conflicts:
# erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
2023-11-18 14:11:38 +00:00
Sagar Vora
d89a9a5bfd
Merge pull request #38169 from frappe/mergify/bp/version-15-hotfix/pr-38167
...
fix: pass check permission in `render_address` (backport #38167 )
2023-11-18 17:39:49 +05:30
Vishakh Desai
a420e13765
fix: pass check permission in render_address
...
(cherry picked from commit 45299fe4b3 )
2023-11-18 12:08:58 +00:00
mergify[bot]
b89a4a7218
feat: add Supplier Delivery Note field in SCR (backport #38127 ) ( #38156 )
...
feat: add `Supplier Delivery Note` field in SCR
(cherry picked from commit da80e4dbce )
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-11-17 22:07:53 +05:30
mergify[bot]
5b7b431dc9
fix(Timesheet): reset billing hours equal to hours if they exceed actual hours (backport #38134 ) ( #38153 )
...
fix(Timesheet): reset billing hours equal to hours if they exceed actual hours (#38134 )
(cherry picked from commit 20c6e9fca2 )
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com >
2023-11-17 18:25:37 +05:30
Frappe PR Bot
5336cf08fa
chore(release): Bumped to Version 15.2.0
...
# [15.2.0](https://github.com/frappe/erpnext/compare/v15.1.0...v15.2.0 ) (2023-11-17)
### Bug Fixes
* add revaluation journal filter in Payable report ([c967468 ](c9674683d1 ))
* allow regional gl in payment entry for gl preview ([#38136 ](https://github.com/frappe/erpnext/issues/38136 )) ([20e15eb ](20e15ebd22 ))
* bom creator not able to amend / duplicate (backport [#38128 ](https://github.com/frappe/erpnext/issues/38128 )) ([#38129 ](https://github.com/frappe/erpnext/issues/38129 )) ([ed9cd7c ](ed9cd7c92b ))
* **dn:** regression from bulk transaction fix ([ea43862 ](ea43862fcd ))
* GL Entries for receiving non CWIP assets using Purchase Receipt ([#38123 ](https://github.com/frappe/erpnext/issues/38123 )) ([d512371 ](d51237195a ))
* handle partial return against invoices ([ac61abb ](ac61abb2e4 ))
* remove ESS role when not mapped to employee (backport [#37867 ](https://github.com/frappe/erpnext/issues/37867 )) ([#38133 ](https://github.com/frappe/erpnext/issues/38133 )) ([8276614 ](8276614c14 ))
* reset dr_or_cr for every reference ([22b39ac ](22b39ac4b4 ))
* test total unallocated amount in payment ([cb4bb5b ](cb4bb5b4ee ))
* valuation rate for the subcontracting receipt supplied items with Serial and Batch Bundle (backport [#38094 ](https://github.com/frappe/erpnext/issues/38094 )) ([#38097 ](https://github.com/frappe/erpnext/issues/38097 )) ([28e6e5d ](28e6e5d910 ))
### Features
* virtual parent doctype ([e68d2e1 ](e68d2e138a ))
2023-11-17 07:43:26 +00:00
Deepesh Garg
cb725dcf9f
Merge pull request #38145 from frappe/version-15-hotfix
...
chore: v15 Release
2023-11-17 13:12:09 +05:30
mergify[bot]
20e15ebd22
fix: allow regional gl in payment entry for gl preview ( #38136 )
...
fix: allow regional gl in payment entry for gl preview (#38136 )
(cherry picked from commit 7e43d7b131 )
Co-authored-by: Smit Vora <smitvora203@gmail.com >
2023-11-17 12:40:18 +05:30
ruthra kumar
a699f8b9de
Merge pull request #38139 from frappe/mergify/bp/version-15-hotfix/pr-38119
...
fix: add revaluation journal filter in Payable report (backport #38119 )
2023-11-17 10:04:23 +05:30
ruthra kumar
c9674683d1
fix: add revaluation journal filter in Payable report
...
(cherry picked from commit 134201794a )
2023-11-17 10:01:35 +05:30
mergify[bot]
8276614c14
fix: remove ESS role when not mapped to employee (backport #37867 ) ( #38133 )
...
fix: remove ESS role when not mapped to employee (#37867 )
* fix: remove ESS role when not mapped to employee
* fix: emp role removal on unlinking
* fix: test case for user employee role mapping
* fix: mapped employee and user on creation
(cherry picked from commit 56b8d1b927 )
Co-authored-by: Dany Robert <danyrt@wahni.com >
2023-11-16 20:27:35 +05:30
mergify[bot]
ed9cd7c92b
fix: bom creator not able to amend / duplicate (backport #38128 ) ( #38129 )
...
fix: bom creator not able to amend / duplicate (#38128 )
fix: bom creator not able to amend
(cherry picked from commit 2df767f596 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-11-16 18:53:08 +05:30
Deepesh Garg
d51237195a
fix: GL Entries for receiving non CWIP assets using Purchase Receipt ( #38123 )
...
* fix: GL Entries for receiving non CWIP assets using Purchase Receipt
* test: Update tests
2023-11-16 13:38:10 +05:30
Deepesh Garg
32039d4de1
Merge pull request #38126 from frappe/mergify/bp/version-15-hotfix/pr-38090
...
fix(dn): regression from bulk transaction fix (#38090 )
2023-11-16 13:00:44 +05:30
David Arnold
ea43862fcd
fix(dn): regression from bulk transaction fix
...
(cherry picked from commit 426c245032 )
2023-11-16 07:13:47 +00:00
Frappe PR Bot
54a6fbaeba
chore(release): Bumped to Version 15.1.0
...
# [15.1.0](https://github.com/frappe/erpnext/compare/v15.0.0...v15.1.0 ) (2023-11-16)
### Bug Fixes
* `PermissionError` while creating DN from SO (backport [#37758 ](https://github.com/frappe/erpnext/issues/37758 )) ([#37768 ](https://github.com/frappe/erpnext/issues/37768 )) ([e742310 ](e7423109b6 ))
* `TypeError` in PR for non-stock item (backport [#37819 ](https://github.com/frappe/erpnext/issues/37819 )) ([#37842 ](https://github.com/frappe/erpnext/issues/37842 )) ([847dd9e ](847dd9e671 ))
* add translation wrapper (backport [#37911 ](https://github.com/frappe/erpnext/issues/37911 )) ([#37947 ](https://github.com/frappe/erpnext/issues/37947 )) ([915ca47 ](915ca47515 ))
* asset depreciation ledger (backport [#37991 ](https://github.com/frappe/erpnext/issues/37991 )) ([#37993 ](https://github.com/frappe/erpnext/issues/37993 )) ([b3562bd ](b3562bdb87 ))
* avoid name clash in delivery stop (backport [#37306 ](https://github.com/frappe/erpnext/issues/37306 )) ([#37702 ](https://github.com/frappe/erpnext/issues/37702 )) ([bfd240a ](bfd240a19d ))
* close `Credit Limit Crossed` dialog (backport [#38052 ](https://github.com/frappe/erpnext/issues/38052 )) ([#38059 ](https://github.com/frappe/erpnext/issues/38059 )) ([cff56d4 ](cff56d4e50 ))
* COA Importer app related issues ([#37238 ](https://github.com/frappe/erpnext/issues/37238 )) ([d5bf7a0 ](d5bf7a039d ))
* consider reserved stock while cancelling a stock transaction (backport [#37754 ](https://github.com/frappe/erpnext/issues/37754 )) ([#37906 ](https://github.com/frappe/erpnext/issues/37906 )) ([e0b0b6b ](e0b0b6bb7d ))
* credit note receive payment entry ([9781f9b ](9781f9b7b1 ))
* **customer:** contact creation for companies ([#38055 ](https://github.com/frappe/erpnext/issues/38055 )) ([fc09d75 ](fc09d757f0 ))
* **customer:** quick form and integration fixes ([#37386 ](https://github.com/frappe/erpnext/issues/37386 )) ([02e2258 ](02e225845e ))
* **defaults:** apply discount and provisonal defaults from item group and brand if available (backport [#37466 ](https://github.com/frappe/erpnext/issues/37466 )) ([#37704 ](https://github.com/frappe/erpnext/issues/37704 )) ([f382b1c ](f382b1cf61 ))
* deprecate unused create_contact ([6f2b34e ](6f2b34e7d5 ))
* don't reset rate if greater than zero in standalone debit note (backport [#37935 ](https://github.com/frappe/erpnext/issues/37935 )) ([#37941 ](https://github.com/frappe/erpnext/issues/37941 )) ([e156564 ](e156564ea4 ))
* force delete removed report (backport [#37668 ](https://github.com/frappe/erpnext/issues/37668 )) ([#37670 ](https://github.com/frappe/erpnext/issues/37670 )) ([a871d95 ](a871d955d4 ))
* handle gle for standalone credit and debit notes ([6e463b1 ](6e463b1953 ))
* Identical items are added line by line instead of grouped together in POS ([#37986 ](https://github.com/frappe/erpnext/issues/37986 )) ([011cf3d ](011cf3d73e ))
* ignore Stock Reservation for future dated PR (backport [#37979 ](https://github.com/frappe/erpnext/issues/37979 )) ([#37990 ](https://github.com/frappe/erpnext/issues/37990 )) ([d74f0ef ](d74f0ef586 ))
* In-Transit Warehouse company filter (backport [#37796 ](https://github.com/frappe/erpnext/issues/37796 )) ([#37798 ](https://github.com/frappe/erpnext/issues/37798 )) ([254ec2c ](254ec2cfd1 ))
* incorrect material request quantity in production plan (backport [#37785 ](https://github.com/frappe/erpnext/issues/37785 )) ([#37790 ](https://github.com/frappe/erpnext/issues/37790 )) ([8b3c4a9 ](8b3c4a948c ))
* indentation issue in the Production Plan Summary report (backport [#38019 ](https://github.com/frappe/erpnext/issues/38019 )) ([#38069 ](https://github.com/frappe/erpnext/issues/38069 )) ([6d325a4 ](6d325a40a1 ))
* indexing on Delivery Note Item (backport [#37766 ](https://github.com/frappe/erpnext/issues/37766 )) ([#37778 ](https://github.com/frappe/erpnext/issues/37778 )) ([98a7c17 ](98a7c170a0 ))
* link between parent and child procedure (backport [#37903 ](https://github.com/frappe/erpnext/issues/37903 )) ([#37944 ](https://github.com/frappe/erpnext/issues/37944 )) ([a065f22 ](a065f22a4c ))
* list index out of range (backport [#37890 ](https://github.com/frappe/erpnext/issues/37890 )) ([#37920 ](https://github.com/frappe/erpnext/issues/37920 )) ([e71ef10 ](e71ef10ca9 ))
* make `Material Request Item` required if `Material Request` is set in PO (backport [#37928 ](https://github.com/frappe/erpnext/issues/37928 )) ([#37937 ](https://github.com/frappe/erpnext/issues/37937 )) ([7ad0817 ](7ad08179f2 ))
* make adjustment entry using stock reconciliation (backport [#37995 ](https://github.com/frappe/erpnext/issues/37995 )) ([#38009 ](https://github.com/frappe/erpnext/issues/38009 )) ([b23fa1f ](b23fa1f5dd ))
* make changes that enable gantt view for job cards (backport [#37661 ](https://github.com/frappe/erpnext/issues/37661 )) ([#37757 ](https://github.com/frappe/erpnext/issues/37757 )) ([f132552 ](f132552968 ))
* make item field read-only in batch (backport [#38010 ](https://github.com/frappe/erpnext/issues/38010 )) ([#38034 ](https://github.com/frappe/erpnext/issues/38034 )) ([99b7cdb ](99b7cdb5be ))
* make project page translatable (backport [#37743 ](https://github.com/frappe/erpnext/issues/37743 )) ([#37801 ](https://github.com/frappe/erpnext/issues/37801 )) ([59e67cd ](59e67cd384 ))
* Mark Status field in Payment Entry 'no_copy'. ([#38000 ](https://github.com/frappe/erpnext/issues/38000 )) ([3c0f8b1 ](3c0f8b15a0 ))
* minor change added to test_case ([b1714ec ](b1714ec21d ))
* minor issue ([24be044 ](24be04427c ))
* **minor:** set tax values for item variants (backport [#37674 ](https://github.com/frappe/erpnext/issues/37674 )) ([#37739 ](https://github.com/frappe/erpnext/issues/37739 )) ([5c46d74 ](5c46d7452e ))
* new logic for handling revaluation journals ([fb71a6e ](fb71a6e787 ))
* Not able to save subcontracting receipt ([#38085 ](https://github.com/frappe/erpnext/issues/38085 )) ([a874997 ](a8749977e1 ))
* **packed_item:** ensure proper names for ref integrity (backport [#37597 ](https://github.com/frappe/erpnext/issues/37597 )) ([#37794 ](https://github.com/frappe/erpnext/issues/37794 )) ([9aa29f5 ](9aa29f55d9 ))
* permission error while creating Supplier Quotation from Portal (backport [#37864 ](https://github.com/frappe/erpnext/issues/37864 )) ([#37871 ](https://github.com/frappe/erpnext/issues/37871 )) ([be8399f ](be8399f52e ))
* **plaid:** Do not sync pending transactions ([2149de4 ](2149de44b1 ))
* POS change amount gl entry with no amount ([#37799 ](https://github.com/frappe/erpnext/issues/37799 )) ([fd7a768 ](fd7a768535 ))
* Quality Inspection Parameter migration - DuplicateEntryError due to case sensitivity (backport [#37499 ](https://github.com/frappe/erpnext/issues/37499 )) ([#37917 ](https://github.com/frappe/erpnext/issues/37917 )) ([7d0f1f4 ](7d0f1f4235 ))
* remove from or target warehouse for non internal transfer entries (backport [#37612 ](https://github.com/frappe/erpnext/issues/37612 )) ([#37627 ](https://github.com/frappe/erpnext/issues/37627 )) ([3155790 ](31557902b8 ))
* remove validation for negative outstanding invoices ([8602a3e ](8602a3eab1 ))
* remove voucher type and no for Item and Warehouse based reposting ([b96be67 ](b96be67a1f ))
* sales order not assigned to territory orders (backport [#37905 ](https://github.com/frappe/erpnext/issues/37905 )) ([#38025 ](https://github.com/frappe/erpnext/issues/38025 )) ([40cc3a7 ](40cc3a7610 ))
* skip check for removed validation ([22e58e0 ](22e58e0ee0 ))
* sort by section code ([06bb1a3 ](06bb1a3208 ))
* standard submit perm in repost ledger for editable invoices (backport [#37826 ](https://github.com/frappe/erpnext/issues/37826 )) ([#37855 ](https://github.com/frappe/erpnext/issues/37855 )) ([71361f7 ](71361f7673 ))
* status for over delivery or billing ([95d6742 ](95d6742587 ))
* test for invoice returns ([a89af58 ](a89af589e8 ))
* type error on new payment entry ([5937135 ](59371358ae ))
* typo in AR report ([fc3d303 ](fc3d303b82 ))
* typo in function name and msg (backport [#37722 ](https://github.com/frappe/erpnext/issues/37722 )) ([#37741 ](https://github.com/frappe/erpnext/issues/37741 )) ([4819fde ](4819fde8c5 ))
* unsupported operand type(s) for serial and batch bundle in POS Invoice (backport [#37721 ](https://github.com/frappe/erpnext/issues/37721 )) ([#37731 ](https://github.com/frappe/erpnext/issues/37731 )) ([b03c65f ](b03c65f21d ))
* use get_all instead of get_list ([2a5b3bd ](2a5b3bdfd9 ))
* validate so item with qtn ([71538cf ](71538cfab1 ))
* valuation rate for the subcontracting receipt supplied items with Serial and Batch Bundle (backport [#38094 ](https://github.com/frappe/erpnext/issues/38094 )) (backport [#38097 ](https://github.com/frappe/erpnext/issues/38097 )) ([#38101 ](https://github.com/frappe/erpnext/issues/38101 )) ([880cea5 ](880cea5b36 ))
### Features
* **accounts_receivable:** test_case added for multi-select customer group ([848efe8 ](848efe8047 ))
* add cols for supplier inv details ([e51e5b3 ](e51e5b36e2 ))
* allow return of components for SCO that don't have SCR created (backport [#37686 ](https://github.com/frappe/erpnext/issues/37686 )) ([#37693 ](https://github.com/frappe/erpnext/issues/37693 )) ([4044325 ](40443258cf ))
* auto reserve stock for Sales Order on purchase (backport [#37603 ](https://github.com/frappe/erpnext/issues/37603 )) ([#37648 ](https://github.com/frappe/erpnext/issues/37648 )) ([da5bf50 ](da5bf501eb ))
* **delivery:** link to delivery notes list view from delivery trip (backport [#37604 ](https://github.com/frappe/erpnext/issues/37604 )) ([#37696 ](https://github.com/frappe/erpnext/issues/37696 )) ([08ea62f ](08ea62f4e4 ))
* multi-select customer group in AR Report ([fff294f ](fff294fb37 ))
* proprietorship & partnership options in entity type ([6df125a ](6df125a05f ))
* reserved production plan sub assembly items (backport [#37884 ](https://github.com/frappe/erpnext/issues/37884 )) ([#37927 ](https://github.com/frappe/erpnext/issues/37927 )) ([df90fd7 ](df90fd7b35 ))
* settings page for repost ([c047fd7 ](c047fd7ac5 ))
* **Stock Balance:** add filters from route (backport [#37836 ](https://github.com/frappe/erpnext/issues/37836 )) ([#37840 ](https://github.com/frappe/erpnext/issues/37840 )) ([fad8228 ](fad8228a67 ))
### Performance Improvements
* Add index to supplier invoice field (backport [#37861 ](https://github.com/frappe/erpnext/issues/37861 )) ([#37863 ](https://github.com/frappe/erpnext/issues/37863 )) ([b1982a6 ](b1982a6961 ))
* index return against for purchase invoice (backport [#37881 ](https://github.com/frappe/erpnext/issues/37881 )) ([#37883 ](https://github.com/frappe/erpnext/issues/37883 )) ([febd20a ](febd20acbc ))
2023-11-16 06:51:17 +00:00
Ankush Menat
3ce734e372
ci: change release branch
...
(cherry picked from commit d0a74419b3 )
2023-11-16 12:19:39 +05:30
Ankush Menat
d0a74419b3
ci: change release branch
2023-11-16 12:18:47 +05:30
Deepesh Garg
57dea69185
Merge pull request #38120 from frappe/mergify/bp/version-15-hotfix/pr-38071
...
fix: handle partial return against invoices in payment entries (#38071 )
2023-11-16 10:53:56 +05:30
Gursheen Anand
cb4bb5b4ee
fix: test total unallocated amount in payment
...
(cherry picked from commit 2499675ad1 )
2023-11-16 05:07:00 +00:00
Gursheen Anand
376e09680c
test: payment against partial return invoices
...
(cherry picked from commit 09f9764bbd )
2023-11-16 05:07:00 +00:00
Gursheen Anand
22b39ac4b4
fix: reset dr_or_cr for every reference
...
(cherry picked from commit a59c942cd4 )
2023-11-16 05:06:59 +00:00
Gursheen Anand
ac61abb2e4
fix: handle partial return against invoices
...
(cherry picked from commit 5b446d4575 )
2023-11-16 05:06:59 +00:00
ruthra kumar
d18fd87650
Merge pull request #38118 from frappe/mergify/bp/version-15-hotfix/pr-38038
...
refactor: supercharge Bulk actions (backport #38038 )
2023-11-16 10:22:20 +05:30
ruthra kumar
00a62692dc
Merge pull request #38117 from frappe/mergify/bp/version-15-hotfix/pr-38082
...
refactor: use 'boolean' parameter while fetching FY year (backport #38082 )
2023-11-16 10:07:33 +05:30
ruthra kumar
0134be4915
refactor: raise exception on invalid date
...
(cherry picked from commit a393a6b76c )
2023-11-16 04:22:47 +00:00
ruthra kumar
f28d718732
refactor: update traceback on retry
...
(cherry picked from commit a52a1b49af )
2023-11-16 04:22:47 +00:00
ruthra kumar
df5fcbee71
refactor: support list view filters
...
(cherry picked from commit 93295bf25b )
2023-11-16 04:22:47 +00:00
ruthra kumar
76f3d4a31c
chore: resolve linting issue
...
(cherry picked from commit 73639db910 )
2023-11-16 04:22:47 +00:00
ruthra kumar
0ec2978ea0
refactor: rollback for retries and UI alerts
...
(cherry picked from commit c320288690 )
2023-11-16 04:22:47 +00:00
ruthra kumar
db60e147e0
refactor: barebones retry functionality
...
(cherry picked from commit 0aa1636d04 )
2023-11-16 04:22:47 +00:00
ruthra kumar
33f1e709f1
chore: show retried in list view
...
(cherry picked from commit 194d70f8a0 )
2023-11-16 04:22:46 +00:00
ruthra kumar
696f8b0ae0
refactor: add basic functionalities
...
(cherry picked from commit af35590549 )
2023-11-16 04:22:46 +00:00
ruthra kumar
e68d2e138a
feat: virtual parent doctype
...
(cherry picked from commit a248b13cc3 )
2023-11-16 04:22:46 +00:00
ruthra kumar
461f7a1a1c
chore: make from_doctype readonly
...
(cherry picked from commit b0dfc936a1 )
2023-11-16 04:22:46 +00:00
ruthra kumar
6eaf67e700
chore: add indexes
...
(cherry picked from commit 73090fa130 )
2023-11-16 04:22:46 +00:00
ruthra kumar
f0a8c83fa8
chore: add list view filters
...
(cherry picked from commit ade09bc709 )
2023-11-16 04:22:46 +00:00
ruthra kumar
feb49f23ed
refactor: simplify logging logic bulk_transaction
...
(cherry picked from commit ebd74a4e5b )
2023-11-16 04:22:45 +00:00
ruthra kumar
3be8bfe9d8
chore: rearrange fields
...
(cherry picked from commit c4f8f3613f )
2023-11-16 04:22:45 +00:00
ruthra kumar
bf0d8c16ac
chore: convert child to normal table
...
(cherry picked from commit e5a8ad54e2 )
2023-11-16 04:22:45 +00:00
ruthra kumar
9a9d5775e8
chore: remove 'Bulk Transaction Log' doctype
...
(cherry picked from commit 815c616f18 )
2023-11-16 04:22:45 +00:00
ruthra kumar
e2dd414793
refactor: use 'boolean' parameter while fetching FY year
...
(cherry picked from commit c31ee8ea33 )
2023-11-16 04:18:34 +00:00
mergify[bot]
8bc871a842
chore: change read only condition of asset quantity field (backport #38111 ) ( #38113 )
...
chore: change read only condition of asset quantity field (#38111 )
chore: change read only condition of asset quantity
(cherry picked from commit 6e0362dee8 )
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com >
2023-11-15 18:01:33 +05:30
mergify[bot]
880cea5b36
fix: valuation rate for the subcontracting receipt supplied items with Serial and Batch Bundle (backport #38094 ) (backport #38097 ) ( #38101 )
...
fix: valuation rate for the subcontracting receipt supplied items with Serial and Batch Bundle (backport #38094 ) (#38097 )
fix: valuation rate for the subcontracting receipt supplied items with Serial and Batch Bundle (#38094 )
fix: valuation rate for the subcontracting receipt supplied items with batch
(cherry picked from commit 3e77c0b564 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
(cherry picked from commit 28e6e5d910 )
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-11-14 22:18:56 +05:30
mergify[bot]
28e6e5d910
fix: valuation rate for the subcontracting receipt supplied items with Serial and Batch Bundle (backport #38094 ) ( #38097 )
...
fix: valuation rate for the subcontracting receipt supplied items with Serial and Batch Bundle (#38094 )
fix: valuation rate for the subcontracting receipt supplied items with batch
(cherry picked from commit 3e77c0b564 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-11-14 21:15:44 +05:30
mergify[bot]
77b1eedcf4
chore: refetch item images on transaction save (backport #38095 ) ( #38099 )
...
chore: refetch item images on transaction save (#38095 )
chore: re fetch item images on transaction save
(cherry picked from commit e93a19ffb5 )
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com >
2023-11-14 20:11:19 +05:30
Deepesh Garg
9f9a4a9eab
Merge pull request #38088 from frappe/version-15-hotfix
...
chore: release v15
2023-11-14 18:52:01 +05:30
mergify[bot]
a8749977e1
fix: Not able to save subcontracting receipt ( #38085 )
...
fix: Not able to save subcontracting receipt (#38085 )
(cherry picked from commit e769e750ec )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-11-14 15:57:36 +05:30
mergify[bot]
4fdd1ec498
chore: delete comments and unlink attachments on company transactions deletion (backport #38077 ) ( #38079 )
...
* chore: delete comments and unlink attachments on company transactions deletion
(cherry picked from commit 2f9e96e324 )
* fix: unrelated transation date typo
(cherry picked from commit b097bb20d9 )
---------
Co-authored-by: anandbaburajan <anandbaburajan@gmail.com >
2023-11-13 19:17:00 +05:30
mergify[bot]
6d325a40a1
fix: indentation issue in the Production Plan Summary report (backport #38019 ) ( #38069 )
...
fix: indentation issue in the Production Plan Summary report (#38019 )
fix: Production Plan Summary report
(cherry picked from commit 4a111f7362 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-11-13 14:03:29 +05:30
bVisible
011cf3d73e
fix: Identical items are added line by line instead of grouped together in POS ( #37986 )
...
fix: Identical items are added line by line instead of grouped together in POS (#37986 )
2023-11-13 14:01:42 +05:30
ruthra kumar
f6b56f225b
Merge pull request #38067 from frappe/mergify/bp/version-15-hotfix/pr-38064
...
refactor: add revaluation journal checkbox in AR/AP summary reports (backport #38064 )
2023-11-13 13:39:24 +05:30
ruthra kumar
d71d5a2981
refactor: add revaluation journal checkbox in AR/AP summary reports
...
(cherry picked from commit 95edd82638 )
2023-11-13 07:52:12 +00:00
Raffael Meyer
6ab2f83a61
Merge pull request #38061 from frappe/mergify/bp/version-15-hotfix/pr-38055
...
fix(customer): contact creation for companies (backport #38055 , #38060 )
2023-11-12 20:27:20 +01:00
barredterra
6f2b34e7d5
fix: deprecate unused create_contact
2023-11-12 20:01:10 +01:00
barredterra
d3d10231b9
test: parse full name
2023-11-12 19:44:01 +01:00
barredterra
f61b476be1
refactor: parse full name
2023-11-12 19:43:51 +01:00
barredterra
0142a9308b
chore: resolve conflicts
2023-11-12 19:43:01 +01:00
David Arnold
fc09d757f0
fix(customer): contact creation for companies ( #38055 )
...
(cherry picked from commit 9fde782403 )
# Conflicts:
# erpnext/selling/doctype/customer/customer.py
2023-11-12 18:06:57 +00:00
mergify[bot]
cff56d4e50
fix: close Credit Limit Crossed dialog (backport #38052 ) ( #38059 )
...
fix: close `Credit Limit Crossed` dialog (#38052 )
(cherry picked from commit 94faa44697 )
Co-authored-by: Arjun <arjun99c@gmail.com >
2023-11-12 18:07:16 +05:30
mergify[bot]
d5bf7a039d
fix: COA Importer app related issues ( #37238 )
...
fix: COA Importer app related issues (#37238 )
* fix: COA Importer app related issues
* fix: Clear all account links fields befor import
* fix: Attribute error
(cherry picked from commit 8634abc021 )
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com >
2023-11-12 17:41:18 +05:30
mergify[bot]
02e225845e
fix(customer): quick form and integration fixes ( #37386 )
...
fix(customer): quick form and integration fixes (#37386 )
(cherry picked from commit ae508144cd )
Co-authored-by: David Arnold <dgx.arnold@gmail.com >
2023-11-11 20:19:22 +05:30
mergify[bot]
99b7cdb5be
fix: make item field read-only in batch (backport #38010 ) ( #38034 )
...
fix: make item field read-only in batch
(cherry picked from commit 779260fb49 )
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-11-11 10:48:09 +05:30
ruthra kumar
ddb1a7643a
Merge pull request #38036 from frappe/mergify/bp/version-15-hotfix/pr-38004
...
fix: handling of exchange rate journals in AR/AP (backport #38004 )
2023-11-10 11:59:06 +05:30
ruthra kumar
fb71a6e787
fix: new logic for handling revaluation journals
...
(cherry picked from commit 1d8fcd66e6 )
2023-11-10 11:18:59 +05:30
mergify[bot]
40cc3a7610
fix: sales order not assigned to territory orders (backport #37905 ) ( #38025 )
...
fix: sales order not assigned to territory orders (#37905 )
filtered sales order are not assigned to 'territory_orders' which results in 0 order amount and 0 billing amount in the output
(cherry picked from commit 45b4bfc947 )
Co-authored-by: jabir-elat <44110258+jabir-elat@users.noreply.github.com >
2023-11-09 21:52:27 +05:30
mergify[bot]
3c0f8b15a0
fix: Mark Status field in Payment Entry 'no_copy'. ( #38000 )
...
fix: Mark Status field in Payment Entry 'no_copy'.
(cherry picked from commit a89afb65d7 )
Co-authored-by: Bernd Oliver Sünderhauf <46800703+bosue@users.noreply.github.com >
2023-11-09 14:06:46 +05:30
Deepesh Garg
1b103faf05
Merge pull request #38007 from frappe/mergify/bp/version-15-hotfix/pr-37828
...
fix: payments irrespective of party types (backport #37828 )
2023-11-09 14:06:14 +05:30
ruthra kumar
54bed25056
Merge pull request #38013 from frappe/mergify/bp/version-15-hotfix/pr-37716
...
feat: multi-select customer group in AR Report (backport #37716 )
2023-11-09 13:23:38 +05:30
mergify[bot]
b23fa1f5dd
fix: make adjustment entry using stock reconciliation (backport #37995 ) ( #38009 )
...
fix: make adjustment entry using stock reconciliation (#37995 )
fix: do adjustment entry using stock reconciliation
(cherry picked from commit a8216b9727 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-11-09 13:14:32 +05:30
vishal
b1714ec21d
fix: minor change added to test_case
...
(cherry picked from commit 30402033bc )
2023-11-09 07:35:38 +00:00
vishal
848efe8047
feat(accounts_receivable): test_case added for multi-select customer group
...
(cherry picked from commit de445b32f5 )
2023-11-09 07:35:38 +00:00
vishal
24be04427c
fix: minor issue
...
(cherry picked from commit b60c57a97d )
2023-11-09 07:35:38 +00:00
vishal
fff294fb37
feat: multi-select customer group in AR Report
...
(cherry picked from commit 8903c1bc6f )
2023-11-09 07:35:38 +00:00
Gursheen Anand
2a5b3bdfd9
fix: use get_all instead of get_list
...
(cherry picked from commit 2984a86f37 )
2023-11-09 06:46:33 +00:00
Gursheen Anand
74983910bc
chore: linting issues
...
(cherry picked from commit 84f0d1ff1f )
2023-11-09 06:46:32 +00:00
Gursheen Anand
6e463b1953
fix: handle gle for standalone credit and debit notes
...
(cherry picked from commit 98a8288da2 )
2023-11-09 06:46:32 +00:00
Gursheen Anand
22e58e0ee0
fix: skip check for removed validation
...
(cherry picked from commit 0e100cd451 )
2023-11-09 06:46:32 +00:00
Gursheen Anand
ced6d004fb
refactor: move common util for fetching party types using account type
...
(cherry picked from commit 4867ca353c )
2023-11-09 06:46:32 +00:00
Gursheen Anand
9781f9b7b1
fix: credit note receive payment entry
...
(cherry picked from commit 4015723591 )
2023-11-09 06:46:31 +00:00
Gursheen Anand
46c86de093
test: receive payments from payable party
...
(cherry picked from commit cd1e016163 )
2023-11-09 06:46:31 +00:00
Gursheen Anand
a89af589e8
fix: test for invoice returns
...
(cherry picked from commit 1f4b381748 )
2023-11-09 06:46:31 +00:00
Gursheen Anand
8602a3eab1
fix: remove validation for negative outstanding invoices
...
(cherry picked from commit 3d9938221a )
2023-11-09 06:46:31 +00:00
ruthra kumar
4eb80ea804
Merge pull request #38002 from frappe/mergify/bp/version-15-hotfix/pr-37860
...
refactor: ignore disabled account while selecting Income Accounts (backport #37860 )
2023-11-09 10:41:20 +05:30
ruthra kumar
ef9e8406eb
refactor: ignore disabled account while selecting Income Accounts
...
(cherry picked from commit 6e3e094c95 )
2023-11-09 04:45:59 +00:00
mergify[bot]
b3562bdb87
fix: asset depreciation ledger (backport #37991 ) ( #37993 )
...
fix: asset depreciation ledger (#37991 )
* fix: include opening acc depr while calculating asset depr ledger report
* chore: include opening acc depr properly in acc depr amt
* chore: add cost_center in asset depr ledger report
* fix: handle finance books properly in asset depr ledger report
* chore: rename 'include default book entries' to 'include default FB entries'
(cherry picked from commit 9a171db97f )
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com >
2023-11-08 22:52:16 +05:30
mergify[bot]
d74f0ef586
fix: ignore Stock Reservation for future dated PR (backport #37979 ) ( #37990 )
...
fix: ignore Stock Reservation for future dated PR
(cherry picked from commit 33eedb97dc )
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-11-08 22:20:51 +05:30
Deepesh Garg
44bad3bd4a
Merge pull request #37964 from frappe/version-15-hotfix
...
chore: release v15
2023-11-08 11:48:14 +05:30
ruthra kumar
0e979b6c5b
Merge pull request #37902 from frappe/mergify/bp/version-15-hotfix/pr-37887
...
chore: performance optimization on payment ledger entry doctype (backport #37887 )
2023-11-08 10:13:55 +05:30
ruthra kumar
cbf8a1405a
Merge pull request #37976 from frappe/mergify/bp/version-15-hotfix/pr-37971
...
refactor: optimize bulk transaction for speed (backport #37971 )
2023-11-08 07:08:58 +05:30
ruthra kumar
3d97a98fd7
refactor: optimize for speed
...
(cherry picked from commit 416bd400bb )
2023-11-08 01:04:08 +00:00
mergify[bot]
3c843c7261
chore: typo in Stock Entry enqueue msg (backport #37970 ) ( #37973 )
...
chore: typo in `Stock Entry` enqueue msg
(cherry picked from commit ee60fa940c )
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-11-07 21:18:01 +05:30
ruthra kumar
3f25614e54
Merge pull request #37968 from frappe/mergify/bp/version-15-hotfix/pr-37954
...
refactor: expand repost to `Expense Claim` and make it configurable (backport #37954 )
2023-11-07 16:09:10 +05:30
ruthra kumar
463e71664c
refactor: update permissions for repost settings
...
(cherry picked from commit 10b9570429 )
2023-11-07 10:15:24 +00:00
ruthra kumar
b48b858752
refactor(test): repost test case for purchase invoice
...
(cherry picked from commit 11c8d9fcf1 )
2023-11-07 10:15:13 +00:00
ruthra kumar
85d255c8a2
refactor: select distinct types
...
(cherry picked from commit 61705047b0 )
2023-11-07 10:15:11 +00:00
ruthra kumar
3abee937f9
refactor(test): update repost settings for test cases
...
(cherry picked from commit ac79b8483f )
2023-11-07 10:15:09 +00:00
ruthra kumar
37dbb4d3f9
refactor: support for expense claim repost
...
(cherry picked from commit b651b36fff )
2023-11-07 10:15:08 +00:00
ruthra kumar
1b83a91246
refactor: configurable repost settings
...
(cherry picked from commit 5a068410c6 )
2023-11-07 10:15:07 +00:00
ruthra kumar
156d995ad8
chore: patch to update default repost settings value
...
(cherry picked from commit ebb186c8df )
2023-11-07 10:15:06 +00:00
ruthra kumar
c047fd7ac5
feat: settings page for repost
...
(cherry picked from commit d582a73795 )
2023-11-07 10:15:05 +00:00
ruthra kumar
dc10a721ab
Merge pull request #37958 from frappe/mergify/bp/version-15-hotfix/pr-37956
...
fix: type error on new payment entry (backport #37956 )
2023-11-07 12:38:15 +05:30
ruthra kumar
59371358ae
fix: type error on new payment entry
...
(cherry picked from commit adff287160 )
2023-11-07 06:53:27 +00:00
ruthra kumar
442c484258
Merge pull request #37950 from frappe/mergify/bp/version-15-hotfix/pr-37948
...
fix: typo in AR report (backport #37948 )
2023-11-06 20:47:54 +05:30
ruthra kumar
fc3d303b82
fix: typo in AR report
...
(cherry picked from commit 67e74d03ed )
2023-11-06 14:57:21 +00:00
mergify[bot]
915ca47515
fix: add translation wrapper (backport #37911 ) ( #37947 )
...
fix: add translation wrapper
(cherry picked from commit 8722318081 )
Co-authored-by: hyaray <hyaray@vip.qq.com >
2023-11-06 19:52:04 +05:30
mergify[bot]
a065f22a4c
fix: link between parent and child procedure (backport #37903 ) ( #37944 )
...
* fix: link between parent and child procedure
(cherry picked from commit 05f24ede96 )
* chore: add missing filters for `Parent Procedure`
(cherry picked from commit 8fbd4cea5b )
* test: add test case for Quality Procedure`
(cherry picked from commit 30c6b83a10 )
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-11-06 19:28:42 +05:30
mergify[bot]
e156564ea4
fix: don't reset rate if greater than zero in standalone debit note (backport #37935 ) ( #37941 )
...
* fix: don't reset rate if greater than zero in standalone debit note
(cherry picked from commit 5cce522ecd )
* fix(test): `test_gl_entries_for_standalone_debit_note`
(cherry picked from commit f9fc6c9c9d )
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-11-06 19:27:42 +05:30
mergify[bot]
7ad08179f2
fix: make Material Request Item required if Material Request is set in PO (backport #37928 ) ( #37937 )
...
fix: make `Material Request Item` required if `Material Request` is set in PO
(cherry picked from commit a9d91189b0 )
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-11-06 17:26:18 +05:30
mergify[bot]
df90fd7b35
feat: reserved production plan sub assembly items (backport #37884 ) ( #37927 )
...
feat: reserved production plan sub assembly items (#37884 )
(cherry picked from commit 34d3eb88b3 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-11-06 11:33:12 +05:30
ruthra kumar
21195343d5
Merge pull request #37925 from frappe/mergify/bp/version-15-hotfix/pr-37879
...
refactor: flag to toggle billed amy update in DN for Credit Note (backport #37879 )
2023-11-06 11:24:26 +05:30
ruthra kumar
61573f2645
refactor(test): enable billed amt update on Sales Return(Cr Note)
...
(cherry picked from commit 0c5bdbdcf3 )
2023-11-06 03:11:52 +00:00
ruthra kumar
463accbf04
refactor: flag to toggle billed amy update in DN for Credit Note
...
(cherry picked from commit a3191f1c8c )
2023-11-06 03:11:52 +00:00
mergify[bot]
fd7a768535
fix: POS change amount gl entry with no amount ( #37799 )
...
fix: POS change amount gl entry with no amount (#37799 )
(cherry picked from commit 2b02ef0066 )
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com >
2023-11-05 17:56:45 +05:30
mergify[bot]
e71ef10ca9
fix: list index out of range (backport #37890 ) ( #37920 )
...
fix: list index out of range (#37890 )
* fix: list index out of range
* fix: solve linter test failing
(cherry picked from commit e5bc8fccb1 )
Co-authored-by: viralkansodiya15 <98073516+viralpatel15@users.noreply.github.com >
2023-11-05 12:33:58 +05:30
mergify[bot]
7d0f1f4235
fix: Quality Inspection Parameter migration - DuplicateEntryError due to case sensitivity (backport #37499 ) ( #37917 )
...
fix: Quality Inspection Parameter migration - DuplicateEntryError due to case sensitivity (#37499 )
* fix: account for case-insensitive database primary key for parameter names
* chore: linting
(cherry picked from commit b099590b2c )
Co-authored-by: Richard Case <110036763+casesolved-co-uk@users.noreply.github.com >
2023-11-05 11:29:38 +05:30
mergify[bot]
e0b0b6bb7d
fix: consider reserved stock while cancelling a stock transaction (backport #37754 ) ( #37906 )
...
* fix: consider reserved serial nos while cancelling a stock transaction
(cherry picked from commit d9e284366d )
* fix: consider reserved batches while cancelling a stock transaction
(cherry picked from commit e1a87a802d )
* feat: add field `reserved_stock` in Bin
(cherry picked from commit 98d6cdd53c )
* feat: maintain `Reserved Stock` in Bin
(cherry picked from commit f52916a2c3 )
* fix: consider reserved stock while cancelling a stock transaction
(cherry picked from commit 73b65ac82e )
* fix(test): `test_stock_reservation_against_sales_order`
(cherry picked from commit 10242235bc )
* chore: patch to set reserved stock in Bin
(cherry picked from commit 1f88b1ef84 )
* fix: qty based check for stock reservation of serial-batch items based on qty
(cherry picked from commit 9231706227 )
* test: add test case for stock stock reservation
(cherry picked from commit 54b323e557 )
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-11-04 17:02:43 +05:30
ruthra kumar
65f23485d3
chore: performance optimization on payment ledger entry doctype
...
(cherry picked from commit f14d1eb871 )
2023-11-04 03:27:51 +00:00
mergify[bot]
5171e3238d
chore: rename depreciation_amount_based_on_num_days_in_month to daily_prorata_based [dev] (copy #37897 ) ( #37899 )
...
chore: rename depreciation_amount_based_on_num_days_in_month to daily_prorata_based
(cherry picked from commit 7c49b277ef )
Co-authored-by: anandbaburajan <anandbaburajan@gmail.com >
2023-11-04 02:02:25 +05:30
mergify[bot]
fc4bcc0965
chore: rename daily_depreciation in asset to depreciation_amount_based_on_num_days_in_month [dev] (backport #37893 ) ( #37896 )
...
chore: rename daily_depreciation in asset to depreciation_amount_based_on_num_days_in_month [dev] (#37893 )
* chore: rename daily_depreciation to depreciation_based_on_num_days_in_month
* chore: add patch
* chore: remove unnecessary files
* chore: add amount in field name
* chore: add amount in label
(cherry picked from commit 568d5bfbe8 )
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com >
2023-11-03 23:26:32 +05:30
mergify[bot]
febd20acbc
perf: index return against for purchase invoice (backport #37881 ) ( #37883 )
...
perf: index return against for purchase invoice (#37881 )
(cherry picked from commit 469ae2c7f1 )
Co-authored-by: Ankush Menat <ankush@frappe.io >
2023-11-03 21:59:49 +05:30
mergify[bot]
be8399f52e
fix: permission error while creating Supplier Quotation from Portal (backport #37864 ) ( #37871 )
...
fix: permission error while creating Supplier Quotation from Portal
(cherry picked from commit e019d43d0b )
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-11-03 16:21:20 +05:30
ruthra kumar
c29e22b3d1
Merge pull request #37876 from frappe/mergify/bp/version-15-hotfix/pr-37852
...
refactor: better ledger comparision report (backport #37852 )
2023-11-03 13:25:12 +05:30
ruthra kumar
796b1aa694
refactor(test): for ledger comparision report
...
(cherry picked from commit 639f427d6d )
2023-11-03 07:23:25 +00:00
ruthra kumar
8d66848f9d
refactor: better output on gl and pl comparison report
...
(cherry picked from commit 539f0251d9 )
2023-11-03 07:23:25 +00:00
ruthra kumar
9dae84feba
Merge pull request #37874 from frappe/mergify/bp/version-15-hotfix/pr-37869
...
refactor: 'group only by voucher' flag in AR/AP report (backport #37869 )
2023-11-03 12:51:07 +05:30
ruthra kumar
1e218c12a0
refactor: group only by voucher flag in AR/AP report
...
(cherry picked from commit 23beb46d15 )
2023-11-03 07:00:57 +00:00
mergify[bot]
847dd9e671
fix: TypeError in PR for non-stock item (backport #37819 ) ( #37842 )
...
* fix: `TypeError` in PR for non-stock item
(cherry picked from commit 028b3e2fbf )
# Conflicts:
# erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
* chore: `conflicts`
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-11-03 11:56:12 +05:30
mergify[bot]
b1982a6961
perf: Add index to supplier invoice field (backport #37861 ) ( #37863 )
...
fix: Add index to supplier invoice field (#37861 )
* fix: Add index to supplier invoice field
* chore: remove unintetional changes
(cherry picked from commit c37e374fdd )
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com >
2023-11-03 11:52:32 +05:30
rohitwaghchaure
e52291506e
Merge pull request #37851 from frappe/mergify/bp/version-15-hotfix/pr-37849
...
fix: remove voucher type and no for Item and Warehouse based reposting (backport #37849 )
2023-11-02 15:14:50 +05:30
Rohit Waghchaure
618a9ee49b
chore: fix test cases
2023-11-02 14:45:28 +05:30
mergify[bot]
71361f7673
fix: standard submit perm in repost ledger for editable invoices (backport #37826 ) ( #37855 )
...
fix: standard submit perm in repost ledger for editable invoices (#37826 )
* fix: ignore perm while reposting ledger
* fix: use flag in save
* fix: remove unnecessary save
(cherry picked from commit 1b808e1d7c )
Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com >
2023-11-02 14:33:47 +05:30
Rohit Waghchaure
b96be67a1f
fix: remove voucher type and no for Item and Warehouse based reposting
...
(cherry picked from commit 0104897d69 )
2023-11-02 07:57:52 +00:00
ruthra kumar
7bc02c49ba
Merge pull request #37847 from frappe/mergify/copy/version-15-hotfix/pr-37845
...
chore: add std permissions for Process Payment Reconciilation log (copy #37845 )
2023-11-02 12:10:36 +05:30
ruthra kumar
7524e425da
chore: std permissions for Process Payment Reconciilation log
...
(cherry picked from commit a9fceeb00f )
2023-11-02 06:16:07 +00:00
ruthra kumar
39a178d27a
Merge pull request #37844 from frappe/mergify/bp/version-15-hotfix/pr-37838
...
refactor: pass limits to JE and PE queries in reconciliation tool (backport #37838 )
2023-11-02 11:08:36 +05:30
mergify[bot]
fad8228a67
feat(Stock Balance): add filters from route (backport #37836 ) ( #37840 )
...
feat(Stock Balance): add filters from route
(cherry picked from commit 38e5e4a893 )
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com >
2023-11-02 10:46:28 +05:30
ruthra kumar
8ef48bc6b7
refactor: pass limits to JE and PE queries in reconciliation tool
...
(cherry picked from commit 54e8ce1ac5 )
2023-11-02 05:13:38 +00:00
ruthra kumar
0ab63f91f8
Merge pull request #37834 from frappe/mergify/bp/version-15-hotfix/pr-37832
...
refactor: checkbox to toggle remarks in General Ledger (backport #37832 )
2023-11-02 07:27:07 +05:30
ruthra kumar
e9bf48df9c
refactor: checkbox to toggle remarks in General Ledger
...
(cherry picked from commit 8fa677b8e8 )
2023-11-01 15:50:12 +00:00
mergify[bot]
c8791108de
refactor: update fields label and remove unused fields from BIN (backport #37827 ) ( #37830 )
...
* refactor: rearrange fields and update label
(cherry picked from commit ec1a7869f8 )
* refactor: remove unused fields `fcfs_rate` and `ma_rate` from Bin
(cherry picked from commit f0a1f4ac7c )
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-11-01 16:41:16 +05:30
Deepesh Garg
964a7a3dbd
Merge pull request #37824 from frappe/mergify/bp/version-15-hotfix/pr-37590
...
fix: gov compliance for tax withholding report (#37590 )
2023-11-01 15:22:10 +05:30
Deepesh Garg
c8c8c6533b
Merge pull request #37822 from frappe/mergify/bp/version-15-hotfix/pr-37635
...
fix: validate sales order item with quotation (#37635 )
2023-11-01 15:14:03 +05:30
Gursheen Anand
e51e5b36e2
feat: add cols for supplier inv details
...
(cherry picked from commit 6d5ccde864 )
2023-11-01 08:40:20 +00:00
Gursheen Anand
80dddb40ae
chore: linting issues
...
(cherry picked from commit 75441017c6 )
2023-11-01 08:40:20 +00:00
Gursheen Anand
6df125a05f
feat: proprietorship & partnership options in entity type
...
(cherry picked from commit ed2457bddf )
2023-11-01 08:40:20 +00:00
Gursheen Anand
06bb1a3208
fix: sort by section code
...
(cherry picked from commit 4471ad581e )
2023-11-01 08:40:19 +00:00
Gursheen Anand
aa19055899
chore: change column order
...
(cherry picked from commit 7ecc0d5a04 )
2023-11-01 08:40:19 +00:00
Gursheen Anand
7abe5d9905
refactor: avoid relying only on against in tds docs query
...
(cherry picked from commit 705dadae8e )
2023-11-01 08:40:18 +00:00
Deepesh Garg
2ba5bb8abc
Merge pull request #37718 from frappe/mergify/bp/version-15-hotfix/pr-37690
...
fix(plaid): Do not sync pending transactions (#37690 )
2023-11-01 14:10:17 +05:30
Gursheen Anand
71538cfab1
fix: validate so item with qtn
...
(cherry picked from commit 17ebc1ea80 )
2023-11-01 08:34:49 +00:00
Deepesh Garg
9675da6f38
Merge pull request #37816 from frappe/mergify/bp/version-15-hotfix/pr-37680
...
fix: status when over delivery or billing in SO (#37680 )
2023-11-01 14:04:19 +05:30
Gursheen Anand
95d6742587
fix: status for over delivery or billing
...
(cherry picked from commit d69b0d76dd )
2023-11-01 07:00:27 +00:00
Deepesh Garg
98a8267c38
Merge pull request #37787 from frappe/version-15-hotfix
...
chore: release v15
2023-11-01 12:10:26 +05:30
ruthra kumar
7a5bfe0009
Merge pull request #37805 from frappe/mergify/bp/version-15-hotfix/pr-37793
...
refactor: pull remarks only if needed on AR/AP report (backport #37793 )
2023-10-31 20:37:53 +05:30
ruthra kumar
c8243ec8e5
Merge pull request #37807 from frappe/mergify/bp/version-15-hotfix/pr-37795
...
chore: update default limit values in reconciliation tool (backport #37795 )
2023-10-31 20:37:26 +05:30
ruthra kumar
a72988a514
chore: update default limit values in reconciliation tool
...
(cherry picked from commit 1fd888175f )
2023-10-31 14:23:08 +00:00
ruthra kumar
0589232d3b
refactor: pull remarks only if needed on AR/AP report
...
(cherry picked from commit eb73017798 )
2023-10-31 14:22:06 +00:00
mergify[bot]
59e67cd384
fix: make project page translatable (backport #37743 ) ( #37801 )
...
fix: make project page translatable
(cherry picked from commit e72afd0bd6 )
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com >
2023-10-31 19:49:45 +05:30
mergify[bot]
254ec2cfd1
fix: In-Transit Warehouse company filter (backport #37796 ) ( #37798 )
...
fix: In-Transit Warehouse company filter (#37796 )
(cherry picked from commit daf2ec063c )
Co-authored-by: hyaray <hyaray@vip.qq.com >
2023-10-31 18:53:08 +05:30
mergify[bot]
9aa29f55d9
fix(packed_item): ensure proper names for ref integrity (backport #37597 ) ( #37794 )
...
fix(packed_item): ensure proper names for ref integrity (#37597 )
(cherry picked from commit fb0ec74d08 )
Co-authored-by: David Arnold <dgx.arnold@gmail.com >
2023-10-31 18:06:40 +05:30
mergify[bot]
8b3c4a948c
fix: incorrect material request quantity in production plan (backport #37785 ) ( #37790 )
...
fix: incorrect material request quantity in production plan (#37785 )
(cherry picked from commit 25718d9f1b )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-10-31 15:41:53 +05:30
mergify[bot]
98a7c170a0
fix: indexing on Delivery Note Item (backport #37766 ) ( #37778 )
...
fix: indexing on Delivery Note Item (#37766 )
fix: added indexing on Delivery Note Item
(cherry picked from commit 056b74b162 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-10-31 14:31:29 +05:30
mergify[bot]
e7423109b6
fix: PermissionError while creating DN from SO (backport #37758 ) ( #37768 )
...
fix: ignore permissions while mapping DN Item
(cherry picked from commit afc64ed9ee )
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-10-30 18:39:57 +05:30
ruthra kumar
4f9210541e
Merge pull request #37763 from frappe/mergify/bp/version-15-hotfix/pr-37761
...
chore: add index to posting_date in PLE (backport #37761 )
2023-10-30 17:16:54 +05:30
ruthra kumar
11dd1f14ff
Merge pull request #37764 from frappe/mergify/bp/version-15-hotfix/pr-37720
...
refactor: ignore cancelled GLE's while looking for currency of existing entries (backport #37720 )
2023-10-30 17:16:39 +05:30
ruthra kumar
9ce123d0b9
refactor: ignore cancelled GLE's while looking for currency
...
(cherry picked from commit 8d9b90f3f5 )
2023-10-30 11:23:35 +00:00
ruthra kumar
f64fdb6870
chore: add index to posting_date in PLE
...
(cherry picked from commit ca69845238 )
2023-10-30 11:20:03 +00:00
mergify[bot]
f132552968
fix: make changes that enable gantt view for job cards (backport #37661 ) ( #37757 )
...
fix: make changes that enable gantt view for job cards (#37661 )
* fix: make changes that enable gantt view for job cards
* fix: add fields on listview and remove from json file
* fix: undo modified date
---------
Co-authored-by: Dietmar Fischer <fischer@kk-software.de >
(cherry picked from commit 500435b856 )
Co-authored-by: Didiman1998 <118364772+Didiman1998@users.noreply.github.com >
2023-10-30 15:20:40 +05:30
mergify[bot]
18e40dd032
refactor: remove extraneous disabled filters (backport #37732 ) ( #37749 )
...
refactor: remove extraneous disabled filters
(cherry picked from commit f276fbba4f )
Co-authored-by: Bernd Oliver Sünderhauf <46800703+bosue@users.noreply.github.com >
2023-10-30 09:57:32 +05:30
mergify[bot]
4819fde8c5
fix: typo in function name and msg (backport #37722 ) ( #37741 )
...
fix: typo in function name and msg
(cherry picked from commit 48c66b68ab )
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-10-29 12:28:42 +05:30
mergify[bot]
5c46d7452e
fix(minor): set tax values for item variants (backport #37674 ) ( #37739 )
...
* fix: copy all child fields to item variant
(cherry picked from commit 5deba1b6f9 )
* fix: only update if variant table empty
(cherry picked from commit d436a40739 )
---------
Co-authored-by: Gursheen Anand <gursheen@frappe.io >
2023-10-29 12:16:05 +05:30
mergify[bot]
4034c16cde
chore: fixed test cases related to Internal Transfer (backport #37659 ) ( #37733 )
...
* chore: fixed test cases related to Internal Transfer (#37659 )
(cherry picked from commit 72d32a4901 )
* chore: fix test cases
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-10-28 13:31:29 +05:30
mergify[bot]
b03c65f21d
fix: unsupported operand type(s) for serial and batch bundle in POS Invoice (backport #37721 ) ( #37731 )
...
fix: unsupported operand type(s) for serial and batch bundle in POS Invoice (#37721 )
(cherry picked from commit fd78f868e1 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-10-28 11:10:46 +05:30
mergify[bot]
a3d3c0024e
chore: allow wip_composite_asset in the MR PO PR PI flow (copy #37723 ) ( #37724 )
...
* chore: allow wip_composite_asset in the MR PO PR PI flow
(cherry picked from commit 0e5bea33a3 )
# Conflicts:
# erpnext/buying/doctype/purchase_order/purchase_order.py
* chore: resolve conflict
---------
Co-authored-by: anandbaburajan <anandbaburajan@gmail.com >
2023-10-27 18:54:43 +05:30
Deepesh Garg
2149de44b1
fix(plaid): Do not sync pending transactions
...
(cherry picked from commit 46ea868559 )
2023-10-27 06:09:09 +00:00
mergify[bot]
f382b1cf61
fix(defaults): apply discount and provisonal defaults from item group and brand if available (backport #37466 ) ( #37704 )
...
fix(defaults): apply discount and provisonal defaults from item group and brand if available (#37466 )
(cherry picked from commit 1612d7ba3f )
Co-authored-by: David Arnold <dgx.arnold@gmail.com >
2023-10-26 18:14:57 +05:30
mergify[bot]
bfd240a19d
fix: avoid name clash in delivery stop (backport #37306 ) ( #37702 )
...
fix: avoid name clash in delivery stop (#37306 )
* fix(stock): avoid name clash in delivery stop with Document.lock()
* chore(stock): format delivery stop json according to doctype builder
(cherry picked from commit 681782121c )
Co-authored-by: David Arnold <dgx.arnold@gmail.com >
2023-10-26 18:13:23 +05:30
mergify[bot]
08ea62f4e4
feat(delivery): link to delivery notes list view from delivery trip (backport #37604 ) ( #37696 )
...
feat(delivery): link to delivery notes list view from delivery trip
(cherry picked from commit 85488cd0dc )
Co-authored-by: David Arnold <dgx.arnold@gmail.com >
2023-10-26 13:12:55 +05:30
mergify[bot]
40443258cf
feat: allow return of components for SCO that don't have SCR created (backport #37686 ) ( #37693 )
...
* feat: allow return of components for SCO that don't have SCR created
(cherry picked from commit 8e3b9ec879 )
* fix: consider returned qty while calculating unsupplied qty
(cherry picked from commit 3290df5593 )
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-10-26 11:56:27 +05:30
mergify[bot]
2f5d991225
refactor: rename field Over Order Allowance to Blanket Order Allowance (backport #37669 ) ( #37682 )
...
* refactor: rename field `Over Order Allowance` to `Blanket Order Allowance`
(cherry picked from commit 8ffa2bfe25 )
* chore: patch to rename field `over_order_allowance`
(cherry picked from commit fcfcf6957e )
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-10-25 14:58:01 +05:30
mergify[bot]
a871d955d4
fix: force delete removed report (backport #37668 ) ( #37670 )
...
fix: force delete removed report (#37668 )
(cherry picked from commit 7be578485e )
Co-authored-by: Ankush Menat <ankush@frappe.io >
2023-10-25 14:08:10 +05:30
mergify[bot]
882bd8e93a
chore: fixed test case non_internal_transfer_delivery_note (backport #37671 ) ( #37676 )
...
chore: fixed test case non_internal_transfer_delivery_note (#37671 )
(cherry picked from commit 2bcff4c7f2 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-10-25 13:49:38 +05:30
mergify[bot]
da5bf501eb
feat: auto reserve stock for Sales Order on purchase (backport #37603 ) ( #37648 )
...
* chore: make `Reserve Stock` checkbox visible in SO
(cherry picked from commit 36a996d704 )
* refactor: rename field `Auto Reserve Stock for Sales Order`
(cherry picked from commit 2b4fa98941 )
* feat: add fields to hold SO and SO Item ref in PR Item
(cherry picked from commit 188175be84 )
* feat: reserve stock for SO on PR submission
(cherry picked from commit 64497c9228 )
# Conflicts:
# erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
* feat: add field `From Voucher Type` in SRE
(cherry picked from commit 5ae9c2f62b )
* refactor: rename field `against_pick_list_item`
(cherry picked from commit 78fe567419 )
* refactor: rename field `against_pick_list`
(cherry picked from commit 961d2d9926 )
* fix: incorrect serial and batch get reserved
(cherry picked from commit 45395027d3 )
* fix: partial reservation against SBB
(cherry picked from commit 4f363f5bf3 )
* fix: ignore qty msg if From Voucher is set
(cherry picked from commit a432290a82 )
* test: add test case for auto-reservation from PR
(cherry picked from commit adf313a6d3 )
* chore: add SRE link in PR Connections
(cherry picked from commit 24788ddcc0 )
* chore: patch to update `From Voucher` details
(cherry picked from commit 6942ab1012 )
* chore: `conflicts`
* fix(patch): `update_sre_from_voucher_details`
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com >
2023-10-24 12:39:05 +05:30
mergify[bot]
31557902b8
fix: remove from or target warehouse for non internal transfer entries (backport #37612 ) ( #37627 )
...
fix: remove from or target warehouse for non internal transfer entries (#37612 )
(cherry picked from commit 5136fe196b )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-10-23 12:27:16 +05:30
mergify[bot]
bdb369e2b4
refactor: use gzip library's compress() and decompress() methods directly (backport #37611 ) ( #37621 )
...
refactor: use gzip library's compress() and decompress() methods directly (#37611 )
The util methods in framework were added for python2.7 compat, so can be removed
Signed-off-by: Akhil Narang <me@akhilnarang.dev >
[skip ci]
(cherry picked from commit 21c3d9c371 )
Co-authored-by: Akhil Narang <me@akhilnarang.dev >
2023-10-21 11:20:49 +05:30
Ankush Menat
0925cb28c7
Merge branch 'version-15-hotfix' into version-15
2023-10-20 18:16:32 +05:30
Ankush Menat
9863ba5fd8
Merge pull request #37616 from frappe/mergify/bp/version-15-hotfix/pr-37614
...
chore: new erpnext logo as per espresso (backport #37614 )
2023-10-20 17:58:13 +05:30
Maharshi Patel
889f84bcb7
chore: new erpnext logo as per espresso
...
(cherry picked from commit fff97b1cd2 )
2023-10-20 12:25:04 +00:00
Ankush Menat
b9e4719045
chore: enable automatic releases
2023-10-20 17:33:49 +05:30
Ankush Menat
5cca001a58
fix: Correctly extract last message ( #37602 )
...
frappe.message_log now contains plain dictionary and not JSON strings,
so no need to load them.
2023-10-20 17:28:55 +05:30
Smit Vora
e76860fae1
fix: update existing doc if possible
2023-10-20 17:28:49 +05:30
Smit Vora
844e6f47df
fix: add regional support to extend purchase gl entries
2023-10-20 17:28:42 +05:30
mergify[bot]
62d9de4848
fix: incorrect cost center in the purchase invoice (backport #37591 ) ( #37608 )
...
fix: incorrect cost center in the purchase invoice (#37591 )
(cherry picked from commit 14b009b093 )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
2023-10-20 17:03:51 +05:30
mergify[bot]
fa5c75fd0a
fix(delivery): rename dt fetch stop action (backport #37605 ) ( #37607 )
...
fix(delivery): rename dt fetch stop action
(cherry picked from commit 79d51a0a0b )
Co-authored-by: David Arnold <dgx.arnold@gmail.com >
2023-10-20 16:52:15 +05:30
Ankush Menat
777c1dd1ea
chore: add containers back
2023-10-20 11:53:49 +05:30
Ankush Menat
fca812448e
chore: v15 release
2023-10-19 16:04:06 +05:30