37455 Commits

Author SHA1 Message Date
Rohit Waghchaure
2905db19e5 fix: Item Tax template is not working for e-commerce
(cherry picked from commit 7d3240ae3a2e8fc761d460793fbddfb2b5cffc09)
2024-01-25 06:07:23 +00:00
Florian HENRY
b2e0d24954 fix: Payment Terms Status for Sales Order report should show all payment terms from order not only this comming from template
(cherry picked from commit 6c8f52b26f0601135ec0dd1be94835951936cd11)
2024-01-24 10:43:08 +00:00
rohitwaghchaure
84a94cec6b
Merge pull request #39531 from frappe/mergify/bp/version-15-hotfix/pr-39525
fix: email list for auto reorder material request (backport #39525)
2024-01-24 14:49:28 +05:30
Frappe PR Bot
cc195777f4 chore(release): Bumped to Version 15.10.5
## [15.10.5](https://github.com/frappe/erpnext/compare/v15.10.4...v15.10.5) (2024-01-24)

### Bug Fixes

* AttributeError in company transaction deletion ([3549cd3](3549cd39f1))
2024-01-24 07:59:52 +00:00
ruthra kumar
3549cd39f1 fix: AttributeError in company transaction deletion
(cherry picked from commit b127aa308eeda0246cdf885c36f0b36f270e2ae1)
2024-01-24 07:43:02 +00:00
ruthra kumar
222005ca44 fix: AttributeError in company transaction deletion
(cherry picked from commit b127aa308eeda0246cdf885c36f0b36f270e2ae1)
2024-01-24 07:40:59 +00:00
Rohit Waghchaure
98c56535d8 fix: email list for auto reorder material request
(cherry picked from commit 764f3422a0826e22d116616daa3849d02cc1e117)
2024-01-24 07:07:16 +00:00
Rohit Waghchaure
1f5dbebe68 fix: not able to edit address through portal
(cherry picked from commit b046d980ad83b906d46515082bd32038daadcb3c)
2024-01-24 06:20:31 +00:00
Gursheen Anand
e2d85c513c fix: skip liability account for internal transfer
(cherry picked from commit 236b73565e6889aaa7027929f770918e89bca7fc)
2024-01-24 05:04:45 +00:00
rohitwaghchaure
880f648846
Merge pull request #39513 from frappe/mergify/bp/version-15-hotfix/pr-39503
fix: Serial No Ledger permission issue (backport #39503)
2024-01-24 10:27:23 +05:30
barredterra
fe41e2a341 refactor(Batch): use const instead of var
(cherry picked from commit 7a7a2132855e496a0b1d51698cdb7d675c527650)
2024-01-23 16:55:27 +00:00
barredterra
a97b8fd876 fix(Batch): reload doc after splitting
to show updated qty

(cherry picked from commit 34ec2f8a2b805e63c531ad293f3adb2061c219eb)
2024-01-23 16:55:27 +00:00
barredterra
6ed42e939b refactor: split batch
(cherry picked from commit 3c7e7a76f0c89b6bedf0b27062895f05f68c1fa5)
2024-01-23 16:55:26 +00:00
Rohit Waghchaure
f9d1995954 fix: Serial No Ledger permission issue
(cherry picked from commit 1a670ff266c83ea1b18ede1c504873c08c310de1)
2024-01-23 13:37:35 +00:00
Frappe PR Bot
028ae5b34f chore(release): Bumped to Version 15.10.4
## [15.10.4](https://github.com/frappe/erpnext/compare/v15.10.3...v15.10.4) (2024-01-23)

### Bug Fixes

* added button to make serial / batch from Purchase Invoice ([96e1db8](96e1db80ac))
* auto create serial no on scan ([ca93f67](ca93f671df))
* duplicate name error while making variant ([b649c50](b649c50ecc))
* key error during reposting ([b4981f8](b4981f8816))
* linting issue ([86f3f62](86f3f62e00))
* party field in pdf html ([9a08349](9a0834987c))
* set unallocated amount after base tax ([74613c7](74613c7fe8))
* UOM needs to be whole number not being checked in quotations ([c7d5857](c7d5857014))
* use most reliable section reference per report line ([b388adc](b388adcb2e))
* UX improvements for Serial and Batch Bundle ([c761459](c76145985d))
2024-01-23 11:59:22 +00:00
ruthra kumar
2a7f7df3e5
Merge pull request #39505 from frappe/version-15-hotfix
chore: release v15
2024-01-23 17:28:01 +05:30
Rohit Waghchaure
ca93f671df fix: auto create serial no on scan
(cherry picked from commit fc0d2aeeffed9a2f87be0d87f0a0af0e837c5955)
2024-01-23 06:27:59 +00:00
Rohit Waghchaure
c76145985d fix: UX improvements for Serial and Batch Bundle
(cherry picked from commit 5d94f0bde55329411c419c242749e0260d3bb7c9)
2024-01-23 06:27:59 +00:00
Rohit Waghchaure
c7d5857014 fix: UOM needs to be whole number not being checked in quotations
(cherry picked from commit aaf83da3e9a28244c0f57f01a86b98257bdf503b)
2024-01-22 11:55:29 +00:00
Gursheen Kaur Anand
b53e072082
Merge pull request #39483 from frappe/mergify/bp/version-15-hotfix/pr-39462
fix: party field in PDF for AP / AR reports (backport #39462)
2024-01-22 17:05:48 +05:30
ruthra kumar
0acbbefa8b refactor: move 'project' set_query to sales_common.js
(cherry picked from commit 52814724eb3e7d0a350ddeb01214ba3855a1ccc9)
2024-01-22 10:21:28 +00:00
Gursheen Anand
9a0834987c fix: party field in pdf html
(cherry picked from commit b2d9380596dd8ca134777148337ef039f10cc2ca)
2024-01-22 09:51:29 +00:00
ruthra kumar
80e3597338 refactor: delete transactions in background
(cherry picked from commit a50808a077b8d6475ff360b611cd5f0a8cb37d65)
2024-01-22 04:28:27 +00:00
Rohit Waghchaure
b0e872aad4 test: fixed test
(cherry picked from commit 63ffce58cce6c68c210572287024da9ca414aca9)
2024-01-21 16:53:46 +00:00
Rohit Waghchaure
96e1db80ac fix: added button to make serial / batch from Purchase Invoice
(cherry picked from commit b4393bc03d68769f57678bb56a09baf7b4ec3dc0)
2024-01-21 16:53:46 +00:00
Rohit Waghchaure
b4981f8816 fix: key error during reposting
(cherry picked from commit ebc8230d4564385b151e19f21d57172afe803108)
2024-01-21 14:22:36 +00:00
David Arnold
b388adcb2e fix: use most reliable section reference per report line
(cherry picked from commit b5be17c6dfc9ab10e9eb57669f697fbb5576489c)
2024-01-21 08:14:55 +00:00
Gursheen Kaur Anand
ddb84d9036 Revert "fix(minor): financial statements period end date"
(cherry picked from commit 73625a2622f29a83c98179c0b5048a29e61ce243)
2024-01-20 12:29:27 +00:00
mergify[bot]
00a3ee313b
refactor(UX): Accounts workspace cleanup (backport #39232) (#39456)
* refactor(UX): Accounts workspace cleanup (#39232)

* refactor(UX): Accounts workspace cleanup

* chore: move asset workspace outside accounting

* fix: remove redundant links from parent workspace

* chore: change icons for payable & receivable workspaces

* chore: remove redundant links from subworkspaces

(cherry picked from commit 35067282cfeaf88a1e4251e3725f7557d3b2d356)

* chore: fix conflicts

---------

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2024-01-19 12:40:25 +05:30
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
Gursheen Anand
86f3f62e00 fix: linting issue
(cherry picked from commit 99b94af49ffd34bccb76b73c2f06187540444a44)
2024-01-18 10:45:49 +00:00
Gursheen Anand
74613c7fe8 fix: set unallocated amount after base tax
(cherry picked from commit e9bc63aacf20dd83cb7e15494bb8f2f025491991)
2024-01-18 10:45:49 +00:00
Rohit Waghchaure
0c222aa504 fix: duplicate name error while making variant
(cherry picked from commit d7e6b83e6432a6c46ce6e374252d25c0438c2205)
(cherry picked from commit b649c50eccc3280168a7a69523d1aac829f4f71a)
2024-01-18 01:24:00 +00:00
Rohit Waghchaure
b649c50ecc fix: duplicate name error while making variant
(cherry picked from commit d7e6b83e6432a6c46ce6e374252d25c0438c2205)
2024-01-18 01:21:52 +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
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
ff1647a1d2 fix: test for asset depreciation 2024-01-17 21:53:00 +05:30
Nabin Hait
8bc8bc1822 fix: composite asset capitalization using asset components
(cherry picked from commit 5df40661d2d857eeb987e51ea6f4b465aa3d502e)
2024-01-17 15:36:04 +00:00
Nabin Hait
9f86b92eb7
Merge pull request #39431 from frappe/mergify/bp/version-15-hotfix/pr-39427
fix: Asset module tests (backport #39427)
2024-01-17 17:38:46 +05:30
Nabin Hait
04c8e9b355
Merge pull request #39422 from frappe/mergify/bp/version-15-hotfix/pr-39386
fix: Cancel asset capitalisation record on cancellation of asset and vice-versa (backport #39386)
2024-01-17 17:33:21 +05:30
Nabin Hait
fbfd0a6db0
Merge pull request #39420 from frappe/mergify/bp/version-15-hotfix/pr-39385
fix: WDV as per IT Act: calculate yearly amount first and then split it based on months (backport #39385)
2024-01-17 17:29:12 +05:30
Nabin Hait
9e33216c24 fix: Asset module tests
(cherry picked from commit 97f69986ff3c56c032fe32d554b9f162df3f8b33)
2024-01-17 11:56:41 +00:00
Deepesh Garg
e219042304 fix: Update subscription period
(cherry picked from commit 7eefedfb119bcd8d01bbad2e43d87f5ed3b707ee)
2024-01-17 07:28:57 +00:00
Nabin Hait
011c5a69f0 fix: Cancel asset capitalisation record on cancellation of asset and vice-versa
(cherry picked from commit efe9f6656f01c46a6ac02e3bb61851564670d6bc)
2024-01-17 06:45:39 +00:00
Nabin Hait
e3cd35b959 fix: WDV as per IT Act: calculate yearly amount first and then split it based on months
(cherry picked from commit 22bd6a54b24129403e0b399938bddcaa9d630cae)
2024-01-17 06:44:26 +00:00
mergify[bot]
53f61f1ad1
fix: consistency in display reserved_stock checkbox on Sales Order Item according global settings and item.is_stock_item (backport #38322) (#39417)
fix: consistency in display reserved_stock checkbox on Sales Order Item according global settings and item.is_stock_item (#38322)

* fix: consistency in display reserved_stock checkbox on Sales Order Item according global settings and item.is_stock_item

* fix: evaluate depends_on for fdata visibility in grid

* fix: evaluate depends_on for fdata visibility in grid

* chore: change after review

* chore: change for review

(cherry picked from commit af80d253dbf5d1502f3df4a18b234d392bd96556)

Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
2024-01-17 10:45:57 +05:30
rohitwaghchaure
c939aa5cf8
Merge pull request #39409 from frappe/mergify/bp/version-15-hotfix/pr-39406
fix: permission issue for the Bin (backport #39406)
2024-01-16 16:55:50 +05:30
ruthra kumar
5a65a10dba refactor: better ordering of query result
(cherry picked from commit bfe42fdccb13ab797ac7252ada58df49af43ad54)
2024-01-16 10:55:36 +00:00
ruthra kumar
1b8f572e80 fix(test): test case for project query
(cherry picked from commit 3349dde5e2914bd9e2dbe0ce4de94023bfee2e7f)
2024-01-16 10:55:36 +00:00