Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/folio-org/mod-finance int…
Browse files Browse the repository at this point in the history
…o MODFIN-283
  • Loading branch information
SerhiiNosko committed Nov 8, 2023
2 parents 7f3af33 + fd7481a commit 31c4743
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 4 deletions.
21 changes: 20 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,23 @@
## 4.8.0 - Unreleased
## 4.9.0 - Unreleased

## 4.8.0 - Released (Poppy R2 2023)
The primary focus of this release was to add possibility to filter expense classes by fiscal year id

[Full Changelog](https://github.com/folio-org/mod-finance/compare/v4.7.0...v4.8.0)

### Stories
* [MODFIN-329](https://issues.folio.org/browse/MODFIN-329) - Add missed permissions to module descriptor
* [MODFIN-324](https://issues.folio.org/browse/MODFIN-324) - Add missing required interface to module descriptor
* [MODFIN-322](https://issues.folio.org/browse/MODFIN-322) - Update to Java 17 mod-finance
* [MODFIN-317](https://issues.folio.org/browse/MODFIN-317) - Add possibility to filter expense classes by fiscal year id
* [MODFIN-316](https://issues.folio.org/browse/MODFIN-316) - Provide proxy endpoints to add and delete ledger rollover error in the business layer
* [MODFIN-296](https://issues.folio.org/browse/MODFIN-296) - Update dependent raml-util

### Bug Fixes
* [MODFIN-308](https://issues.folio.org/browse/MODFIN-308) - Maintain displaying "Available" as a negative number for group and ledger

### Dependencies
* Bump `java version` from `11` to `17`

## 4.7.0 - Released (Orchid R1 2023)
The primary focus of this release was to restrict search/view of Fiscal year records based upon acquisitions unit
Expand Down
22 changes: 21 additions & 1 deletion descriptors/ModuleDescriptor-template.json
Original file line number Diff line number Diff line change
Expand Up @@ -1403,7 +1403,8 @@
"finance.invoice-transaction-summaries.item.post",
"finance.invoice-transaction-summaries.item.put",
"finance.exchange-rate.item.get",
"finance.expense-classes.all"
"finance.expense-classes.all",
"finance.acquisitions-units-assignments.all"
],
"visible": false
},
Expand Down Expand Up @@ -1449,6 +1450,25 @@
"permissionName" : "finance.funds.budget.item.get",
"displayName" : "budget-item get",
"description" : "Fetch an budget for fund"
},
{
"permissionName": "finance.acquisitions-units-assignments.assign",
"displayName": "Acquisitions unit assignments - create unit assignments",
"description": "Assign acquisition units"
},
{
"permissionName": "finance.acquisitions-units-assignments.manage",
"displayName": "Acquisitions unit assignments - manage unit assignments",
"description": "Manage acquisition unit assignments"
},
{
"permissionName": "finance.acquisitions-units-assignments.all",
"displayName": "Acquisitions unit assignments - all permissions",
"description": "All acquisition unit assignments permissions",
"subPermissions": [
"finance.acquisitions-units-assignments.assign",
"finance.acquisitions-units-assignments.manage"
]
}
],
"launchDescriptor": {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.folio</groupId>
<artifactId>mod-finance</artifactId>
<version>4.8.0-SNAPSHOT</version>
<version>4.9.0-SNAPSHOT</version>
<packaging>jar</packaging>

<licenses>
Expand Down
2 changes: 1 addition & 1 deletion ramls/acq-models
Submodule acq-models updated 56 files
+0 −13 common/schemas/entity.json
+8 −0 mod-finance/examples/fund.sample
+8 −0 mod-finance/examples/fund_collection.sample
+8 −0 mod-finance/examples/fund_details.sample
+0 −3 mod-finance/schemas/budget.json
+0 −3 mod-finance/schemas/budget_expense_class.json
+0 −3 mod-finance/schemas/expense_class.json
+16 −0 mod-finance/schemas/fund.json
+16 −0 mod-finance/schemas/fund_details.json
+0 −3 mod-finance/schemas/transaction.json
+4 −1 mod-invoice-storage/examples/export_configuration.sample
+1 −0 mod-invoice-storage/examples/invoice.sample
+17 −2 mod-invoice-storage/schemas/export_configuration.json
+5 −0 mod-invoice-storage/schemas/invoice.json
+2 −0 mod-orders-storage/examples/order_line_audit_event.sample
+10 −4 mod-orders-storage/examples/piece_collection.sample
+3 −1 mod-orders-storage/examples/piece_get.sample
+4 −2 mod-orders-storage/examples/piece_post.sample
+6 −0 mod-orders-storage/examples/po_line_collection.sample
+6 −0 mod-orders-storage/examples/po_line_get.sample
+6 −0 mod-orders-storage/examples/po_line_post.sample
+6 −0 mod-orders-storage/examples/title_collection.sample
+6 −0 mod-orders-storage/examples/title_get.sample
+6 −0 mod-orders-storage/examples/title_post.sample
+15 −1 mod-orders-storage/schemas/piece.json
+18 −0 mod-orders-storage/schemas/po_line.json
+0 −3 mod-orders-storage/schemas/prefix.json
+0 −3 mod-orders-storage/schemas/purchase_order.json
+0 −3 mod-orders-storage/schemas/reason_for_closure.json
+0 −3 mod-orders-storage/schemas/suffix.json
+17 −0 mod-orders-storage/schemas/title.json
+6 −0 mod-orders/examples/composite_po_line.sample
+2 −0 mod-orders/examples/composite_purchase_order.sample
+18 −0 mod-orders/schemas/composite_po_line.json
+21 −0 mod-orgs/examples/banking_account_type_collection.sample
+8 −0 mod-orgs/examples/banking_account_type_get.sample
+3 −0 mod-orgs/examples/banking_account_type_post.sample
+35 −0 mod-orgs/examples/banking_information_collection.sample
+15 −0 mod-orgs/examples/banking_information_get.sample
+9 −0 mod-orgs/examples/banking_information_post.sample
+4 −0 mod-orgs/examples/organization_collection.sample
+3 −0 mod-orgs/examples/organization_get.sample
+4 −0 mod-orgs/examples/organization_post.sample
+3 −0 mod-orgs/examples/organization_put.sample
+23 −0 mod-orgs/examples/setting_collection.sample
+9 −0 mod-orgs/examples/setting_get.sample
+4 −0 mod-orgs/examples/setting_post.sample
+24 −0 mod-orgs/schemas/banking_account_type.json
+25 −0 mod-orgs/schemas/banking_account_type_collection.json
+57 −0 mod-orgs/schemas/banking_information.json
+25 −0 mod-orgs/schemas/banking_information_collection.json
+4 −0 mod-orgs/schemas/contact.json
+14 −0 mod-orgs/schemas/organization.json
+4 −0 mod-orgs/schemas/organization_type.json
+33 −0 mod-orgs/schemas/setting.json
+25 −0 mod-orgs/schemas/setting_collection.json

0 comments on commit 31c4743

Please sign in to comment.