Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,700 Commits 3 Branches 0 Tags
Commit Graph

47700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gursheen Kaur Anand
ddb84d9036 Revert "fix(minor): financial statements period end date" 
(cherry picked from commit 73625a2622f29a83c98179c0b5048a29e61ce243)
 2024-01-20 12:29:27 +00:00
mergify[bot]
00a3ee313b
refactor(UX): Accounts workspace cleanup (backport #39232) (#39456) 
* refactor(UX): Accounts workspace cleanup (#39232)

* refactor(UX): Accounts workspace cleanup

* chore: move asset workspace outside accounting

* fix: remove redundant links from parent workspace

* chore: change icons for payable & receivable workspaces

* chore: remove redundant links from subworkspaces

(cherry picked from commit 35067282cfeaf88a1e4251e3725f7557d3b2d356)

* chore: fix conflicts

---------

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2024-01-19 12:40:25 +05:30
Gursheen Kaur Anand
f8d7ca515c
Merge pull request #39451 from frappe/mergify/bp/version-15-hotfix/pr-39449 
fix: unallocated amount after taxes and charges (backport #39449)
 2024-01-19 10:57:35 +05:30
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
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
rohitwaghchaure
3244ef3a68
Merge pull request #39443 from frappe/mergify/bp/version-15-hotfix/pr-39436 
fix: duplicate name error while making variant (backport #39436)
 2024-01-18 06:52:17 +05:30
Rohit Waghchaure
b649c50ecc fix: duplicate name error while making variant 
(cherry picked from commit d7e6b83e6432a6c46ce6e374252d25c0438c2205)
 2024-01-18 01:21:52 +00:00
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 5df40661d2d857eeb987e51ea6f4b465aa3d502e)
 2024-01-17 15:36:04 +00:00
Nabin Hait
9f86b92eb7
Merge pull request #39431 from frappe/mergify/bp/version-15-hotfix/pr-39427 
fix: Asset module tests (backport #39427)
 2024-01-17 17:38:46 +05:30
Nabin Hait
04c8e9b355
Merge pull request #39422 from frappe/mergify/bp/version-15-hotfix/pr-39386 
fix: Cancel asset capitalisation record on cancellation of asset and vice-versa (backport #39386)
 2024-01-17 17:33:21 +05:30
Nabin Hait
fbfd0a6db0
Merge pull request #39420 from frappe/mergify/bp/version-15-hotfix/pr-39385 
fix: WDV as per IT Act: calculate yearly amount first and then split it based on months (backport #39385)
 2024-01-17 17:29:12 +05:30
Nabin Hait
9e33216c24 fix: Asset module tests 
(cherry picked from commit 97f69986ff3c56c032fe32d554b9f162df3f8b33)
 2024-01-17 11:56:41 +00:00
Deepesh Garg
62f7d984be
Merge pull request #39425 from frappe/mergify/bp/version-15-hotfix/pr-39423 
fix: Update subscription period (#39423)
 2024-01-17 15:03:51 +05:30
Deepesh Garg
e219042304 fix: Update subscription period 
(cherry picked from commit 7eefedfb119bcd8d01bbad2e43d87f5ed3b707ee)
 2024-01-17 07:28:57 +00:00
Nabin Hait
011c5a69f0 fix: Cancel asset capitalisation record on cancellation of asset and vice-versa 
(cherry picked from commit efe9f6656f01c46a6ac02e3bb61851564670d6bc)
 2024-01-17 06:45:39 +00:00
Nabin Hait
e3cd35b959 fix: WDV as per IT Act: calculate yearly amount first and then split it based on months 
(cherry picked from commit 22bd6a54b24129403e0b399938bddcaa9d630cae)
 2024-01-17 06:44:26 +00:00
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
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 bfe42fdccb13ab797ac7252ada58df49af43ad54)
 2024-01-16 10:55:36 +00:00
ruthra kumar
1b8f572e80 fix(test): test case for project query 
(cherry picked from commit 3349dde5e2914bd9e2dbe0ce4de94023bfee2e7f)
 2024-01-16 10:55:36 +00:00
ruthra kumar
07e2901e4b fix: project query controller logic 
(cherry picked from commit 4eefb445a748100f3c36094188e38c127ad80051)
 2024-01-16 10:55:35 +00:00
Rohit Waghchaure
8816b2740a fix: permission issue for the BIN 
(cherry picked from commit 6e4d4a55cd70964d8ab8870105591abaa1b17b9e)
 2024-01-16 10:22:22 +00:00
ruthra kumar
bcf8053fd9
Merge pull request #39383 from frappe/mergify/bp/version-15-hotfix/pr-39332 
refactor: prevent foreign currency subscription for a party (backport #39332)
 2024-01-16 11:19:37 +05:30
ruthra kumar
cd1820f680 refactor(test): set default currency for party 2024-01-16 10:47:51 +05:30
ruthra kumar
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 60b26ad8b262752e7d491b3fe21b398c0928bfaf)
 2024-01-15 15:16:51 +00:00
Nabin Hait
9897c26ae6
Merge pull request #39285 from frappe/mergify/bp/version-15-hotfix/pr-39052 
fix: asset WDV depreciation calc according to IT act [dev] (backport #39052)
 2024-01-15 16:58:45 +05:30
ruthra kumar
32afe7de31 refactor(test): supply default currency for subscription plans 
(cherry picked from commit 1387b0ba7f9edf71f838a270e5c8aa40b30b3a70)
 2024-01-15 09:36:50 +00:00
ruthra kumar
c288db0356 refactor: making currency mandatory for subcscription plans 
(cherry picked from commit 19975dcb7bb688f5b93b8e7757d6a906cb68a2bc)
 2024-01-15 09:36:50 +00:00
ruthra kumar
61f073f8b1 refactor: prevent foreign currency subscription for a party 
(cherry picked from commit 6b5fa2c673accab13a174a2945b333bd1b991cdb)
 2024-01-15 09:36:49 +00:00
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 aef87cced7da0524c7ca2dadfcd111aaf13ef0c2)

# Conflicts:
#	.github/workflows/release.yml

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
(cherry picked from commit e282ba78c179a7b6893d120e7d5db3d90baed72c)

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 aef87cced7da0524c7ca2dadfcd111aaf13ef0c2)

# 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 a27a4db3de6d6df7dd340d4212c114b7f4c0762c)
 2024-01-15 04:32:46 +00:00
ruthra kumar
f609b8ae5d refactor: better error message 
(cherry picked from commit b4354cbc8dfb22fafaed2cd39b92c438e5f199db)
 2024-01-15 04:32:46 +00:00
ruthra kumar
dbbba046ab refactor: disallow bank transactions on different currencies 
(cherry picked from commit cdd0acc672e471d94693c04079ab78ba48b82a30)
 2024-01-15 04:32:45 +00:00
ruthra kumar
b43f70325c fix: incorrect sql error if account name has '%' 
(cherry picked from commit 641c3de0caf3dd542a353edd78c8c18f686b8cae)
 2024-01-15 04:10:40 +00:00
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