Skip to content

Commit

Permalink
Merge branch 'master' into UIOR-1142
Browse files Browse the repository at this point in the history
  • Loading branch information
alisher-epam authored Oct 4, 2023
2 parents 6a781c8 + 4395341 commit 732f520
Show file tree
Hide file tree
Showing 32 changed files with 116 additions and 55 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
* Show a message about the missing version in the history. Refs UIOR-1136.
* *BREAKING* bump `react-intl` to `v6.4.4`. Refs UIOR-1146.
* When order line contains bad product IDs - the save & close does not work. Refs UIOR-1141.
* Upgrade `ui-plugin-find-po-line` and `ui-plugin-find-organization` plugins to `5` version. Refs UIOR-1154.
* POL - Display only active account numbers in dropdown list. Refs UIOR-1142.

## [4.0.2](https://github.com/folio-org/ui-orders/tree/v4.0.2) (2023-03-17)
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@
"sinon": "^7.0.0"
},
"dependencies": {
"@folio/plugin-find-po-line": "^4.0.0",
"@folio/plugin-find-po-line": "^5.0.0",
"@folio/stripes-acq-components": "~5.0.0",
"classnames": "^2.2.5",
"final-form": "^4.19.1",
Expand All @@ -472,7 +472,7 @@
},
"optionalDependencies": {
"@folio/plugin-find-instance": "^7.0.0",
"@folio/plugin-find-organization": "^4.0.0",
"@folio/plugin-find-organization": "^5.0.0",
"@folio/plugin-find-user": "^7.0.0"
}
}
4 changes: 3 additions & 1 deletion translations/ui-orders/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -847,5 +847,7 @@
"relatedInvoices.subscriptionEnd": "Subscription end",
"relatedInvoices.subscriptionDescription": "Subscription info",
"errors.encumbrancesForReEncumberNotFound": "The encumbrances were correctly created during the rollover or have already been updated.",
"versionHistory.noVersion": "No version history to display."
"versionHistory.noVersion": "No version history to display.",
"errors.invalidProductId": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"relatedInvoiceLines.vendorCode": "Vendor code"
}
6 changes: 4 additions & 2 deletions translations/ui-orders/ber.json
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@
"checkIn.pieceFormat.electronic": "Electronic",
"checkIn.pieceFormat.physical": "Physical",
"search.productIdISBN": "Product ID ISBN",
"errors.invalidISBN": "Invalid ISBN; adjust or remove",
"errors.invalidISBN": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"itemDetails.qualifier": "Qualifier",
"itemDetails.contributors": "Contributors",
"itemDetails.productIds": "Product identifiers",
Expand Down Expand Up @@ -847,5 +847,7 @@
"relatedInvoices.subscriptionEnd": "Subscription end",
"relatedInvoices.subscriptionDescription": "Subscription info",
"errors.encumbrancesForReEncumberNotFound": "The encumbrances were correctly created during the rollover or have already been updated.",
"versionHistory.noVersion": "No version history to display."
"versionHistory.noVersion": "No version history to display.",
"errors.invalidProductId": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"relatedInvoiceLines.vendorCode": "Vendor code"
}
6 changes: 4 additions & 2 deletions translations/ui-orders/ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@
"checkIn.pieceFormat.electronic": "Electronic",
"checkIn.pieceFormat.physical": "Physical",
"search.productIdISBN": "Product ID ISBN",
"errors.invalidISBN": "Invalid ISBN; adjust or remove",
"errors.invalidISBN": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"itemDetails.qualifier": "Qualifier",
"itemDetails.contributors": "Contributors",
"itemDetails.productIds": "Product identifiers",
Expand Down Expand Up @@ -847,5 +847,7 @@
"relatedInvoices.subscriptionEnd": "Subscription end",
"relatedInvoices.subscriptionDescription": "Subscription info",
"errors.encumbrancesForReEncumberNotFound": "The encumbrances were correctly created during the rollover or have already been updated.",
"versionHistory.noVersion": "No version history to display."
"versionHistory.noVersion": "No version history to display.",
"errors.invalidProductId": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"relatedInvoiceLines.vendorCode": "Vendor code"
}
4 changes: 3 additions & 1 deletion translations/ui-orders/cs_CZ.json
Original file line number Diff line number Diff line change
Expand Up @@ -847,5 +847,7 @@
"relatedInvoices.subscriptionEnd": "Konec předplatného",
"relatedInvoices.subscriptionDescription": "Informace o předplatném",
"errors.encumbrancesForReEncumberNotFound": "Břemena byly správně vytvořeny během převodu nebo již byly aktualizovány.",
"versionHistory.noVersion": "Žádná historie verzí k zobrazení."
"versionHistory.noVersion": "Žádná historie verzí k zobrazení.",
"errors.invalidProductId": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"relatedInvoiceLines.vendorCode": "Vendor code"
}
6 changes: 4 additions & 2 deletions translations/ui-orders/da.json
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@
"checkIn.pieceFormat.electronic": "Electronic",
"checkIn.pieceFormat.physical": "Physical",
"search.productIdISBN": "Product ID ISBN",
"errors.invalidISBN": "Invalid ISBN; adjust or remove",
"errors.invalidISBN": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"itemDetails.qualifier": "Qualifier",
"itemDetails.contributors": "Contributors",
"itemDetails.productIds": "Product identifiers",
Expand Down Expand Up @@ -847,5 +847,7 @@
"relatedInvoices.subscriptionEnd": "Subscription end",
"relatedInvoices.subscriptionDescription": "Subscription info",
"errors.encumbrancesForReEncumberNotFound": "The encumbrances were correctly created during the rollover or have already been updated.",
"versionHistory.noVersion": "No version history to display."
"versionHistory.noVersion": "No version history to display.",
"errors.invalidProductId": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"relatedInvoiceLines.vendorCode": "Vendor code"
}
4 changes: 3 additions & 1 deletion translations/ui-orders/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -847,5 +847,7 @@
"relatedInvoices.subscriptionEnd": "Subscription end",
"relatedInvoices.subscriptionDescription": "Subscription info",
"errors.encumbrancesForReEncumberNotFound": "The encumbrances were correctly created during the rollover or have already been updated.",
"versionHistory.noVersion": "No version history to display."
"versionHistory.noVersion": "No version history to display.",
"errors.invalidProductId": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"relatedInvoiceLines.vendorCode": "Vendor code"
}
6 changes: 4 additions & 2 deletions translations/ui-orders/en_GB.json
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@
"checkIn.pieceFormat.electronic": "Electronic",
"checkIn.pieceFormat.physical": "Physical",
"search.productIdISBN": "Product ID ISBN",
"errors.invalidISBN": "Invalid ISBN; adjust or remove",
"errors.invalidISBN": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"itemDetails.qualifier": "Qualifier",
"itemDetails.contributors": "Contributors",
"itemDetails.productIds": "Product identifiers",
Expand Down Expand Up @@ -847,5 +847,7 @@
"relatedInvoices.subscriptionEnd": "Subscription end",
"relatedInvoices.subscriptionDescription": "Subscription info",
"errors.encumbrancesForReEncumberNotFound": "The encumbrances were correctly created during the rollover or have already been updated.",
"versionHistory.noVersion": "No version history to display."
"versionHistory.noVersion": "No version history to display.",
"errors.invalidProductId": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"relatedInvoiceLines.vendorCode": "Vendor code"
}
6 changes: 4 additions & 2 deletions translations/ui-orders/en_SE.json
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@
"checkIn.pieceFormat.electronic": "Electronic",
"checkIn.pieceFormat.physical": "Physical",
"search.productIdISBN": "Product ID ISBN",
"errors.invalidISBN": "Invalid ISBN; adjust or remove",
"errors.invalidISBN": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"itemDetails.qualifier": "Qualifier",
"itemDetails.contributors": "Contributors",
"itemDetails.productIds": "Product identifiers",
Expand Down Expand Up @@ -847,5 +847,7 @@
"relatedInvoices.subscriptionEnd": "Subscription end",
"relatedInvoices.subscriptionDescription": "Subscription info",
"errors.encumbrancesForReEncumberNotFound": "The encumbrances were correctly created during the rollover or have already been updated.",
"versionHistory.noVersion": "No version history to display."
"versionHistory.noVersion": "No version history to display.",
"errors.invalidProductId": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"relatedInvoiceLines.vendorCode": "Vendor code"
}
6 changes: 4 additions & 2 deletions translations/ui-orders/en_US.json
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@
"checkIn.pieceFormat.electronic": "Electronic",
"checkIn.pieceFormat.physical": "Physical",
"search.productIdISBN": "Product ID ISBN",
"errors.invalidISBN": "Invalid ISBN; adjust or remove",
"errors.invalidISBN": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"itemDetails.qualifier": "Qualifier",
"itemDetails.contributors": "Contributors",
"itemDetails.productIds": "Product identifiers",
Expand Down Expand Up @@ -847,5 +847,7 @@
"relatedInvoices.subscriptionEnd": "Subscription end",
"relatedInvoices.subscriptionDescription": "Subscription info",
"errors.encumbrancesForReEncumberNotFound": "The encumbrances were correctly created during the rollover or have already been updated.",
"versionHistory.noVersion": "No version history to display."
"versionHistory.noVersion": "No version history to display.",
"errors.invalidProductId": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"relatedInvoiceLines.vendorCode": "Vendor code"
}
4 changes: 3 additions & 1 deletion translations/ui-orders/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -847,5 +847,7 @@
"relatedInvoices.subscriptionEnd": "Subscription end",
"relatedInvoices.subscriptionDescription": "Subscription info",
"errors.encumbrancesForReEncumberNotFound": "The encumbrances were correctly created during the rollover or have already been updated.",
"versionHistory.noVersion": "No version history to display."
"versionHistory.noVersion": "No version history to display.",
"errors.invalidProductId": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"relatedInvoiceLines.vendorCode": "Vendor code"
}
6 changes: 4 additions & 2 deletions translations/ui-orders/es_419.json
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@
"settings.createInventory.physical": "Físico predeterminado",
"settings.createInventory.other": "Otro predeterminado",
"settings.createInventory.recordType.all": "Instancia, Fondo, Ítem",
"settings.createInventory.recordType.instance": "Instancia:",
"settings.createInventory.recordType.instance": "Instancia",
"settings.createInventory.recordType.instanceAndHolding": "Instancia, Fondo",
"settings.createInventory.recordType.none": "Ninguno",
"checkIn.addPiece.error": "El elemento no se ha guardado",
Expand Down Expand Up @@ -847,5 +847,7 @@
"relatedInvoices.subscriptionEnd": "Fin de la suscripción",
"relatedInvoices.subscriptionDescription": "Información de suscripción",
"errors.encumbrancesForReEncumberNotFound": "Los gravámenes se crearon correctamente durante la prórroga o ya se han actualizado.",
"versionHistory.noVersion": "No version history to display."
"versionHistory.noVersion": "No version history to display.",
"errors.invalidProductId": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"relatedInvoiceLines.vendorCode": "Vendor code"
}
4 changes: 3 additions & 1 deletion translations/ui-orders/es_ES.json
Original file line number Diff line number Diff line change
Expand Up @@ -847,5 +847,7 @@
"relatedInvoices.subscriptionEnd": "Subscription end",
"relatedInvoices.subscriptionDescription": "Subscription info",
"errors.encumbrancesForReEncumberNotFound": "The encumbrances were correctly created during the rollover or have already been updated.",
"versionHistory.noVersion": "No version history to display."
"versionHistory.noVersion": "No version history to display.",
"errors.invalidProductId": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"relatedInvoiceLines.vendorCode": "Vendor code"
}
6 changes: 4 additions & 2 deletions translations/ui-orders/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@
"checkIn.pieceFormat.electronic": "Electronic",
"checkIn.pieceFormat.physical": "Physical",
"search.productIdISBN": "Product ID ISBN",
"errors.invalidISBN": "Invalid ISBN; adjust or remove",
"errors.invalidISBN": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"itemDetails.qualifier": "Qualifier",
"itemDetails.contributors": "Contributors",
"itemDetails.productIds": "Product identifiers",
Expand Down Expand Up @@ -847,5 +847,7 @@
"relatedInvoices.subscriptionEnd": "Subscription end",
"relatedInvoices.subscriptionDescription": "Subscription info",
"errors.encumbrancesForReEncumberNotFound": "The encumbrances were correctly created during the rollover or have already been updated.",
"versionHistory.noVersion": "No version history to display."
"versionHistory.noVersion": "No version history to display.",
"errors.invalidProductId": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"relatedInvoiceLines.vendorCode": "Vendor code"
}
4 changes: 3 additions & 1 deletion translations/ui-orders/fr_FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -847,5 +847,7 @@
"relatedInvoices.subscriptionEnd": "Subscription end",
"relatedInvoices.subscriptionDescription": "Subscription info",
"errors.encumbrancesForReEncumberNotFound": "The encumbrances were correctly created during the rollover or have already been updated.",
"versionHistory.noVersion": "No version history to display."
"versionHistory.noVersion": "No version history to display.",
"errors.invalidProductId": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"relatedInvoiceLines.vendorCode": "Vendor code"
}
6 changes: 4 additions & 2 deletions translations/ui-orders/he.json
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@
"checkIn.pieceFormat.electronic": "Electronic",
"checkIn.pieceFormat.physical": "Physical",
"search.productIdISBN": "Product ID ISBN",
"errors.invalidISBN": "Invalid ISBN; adjust or remove",
"errors.invalidISBN": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"itemDetails.qualifier": "Qualifier",
"itemDetails.contributors": "Contributors",
"itemDetails.productIds": "Product identifiers",
Expand Down Expand Up @@ -847,5 +847,7 @@
"relatedInvoices.subscriptionEnd": "Subscription end",
"relatedInvoices.subscriptionDescription": "Subscription info",
"errors.encumbrancesForReEncumberNotFound": "The encumbrances were correctly created during the rollover or have already been updated.",
"versionHistory.noVersion": "No version history to display."
"versionHistory.noVersion": "No version history to display.",
"errors.invalidProductId": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"relatedInvoiceLines.vendorCode": "Vendor code"
}
6 changes: 4 additions & 2 deletions translations/ui-orders/hi_IN.json
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@
"checkIn.pieceFormat.electronic": "Electronic",
"checkIn.pieceFormat.physical": "Physical",
"search.productIdISBN": "Product ID ISBN",
"errors.invalidISBN": "Invalid ISBN; adjust or remove",
"errors.invalidISBN": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"itemDetails.qualifier": "Qualifier",
"itemDetails.contributors": "Contributors",
"itemDetails.productIds": "Product identifiers",
Expand Down Expand Up @@ -847,5 +847,7 @@
"relatedInvoices.subscriptionEnd": "Subscription end",
"relatedInvoices.subscriptionDescription": "Subscription info",
"errors.encumbrancesForReEncumberNotFound": "The encumbrances were correctly created during the rollover or have already been updated.",
"versionHistory.noVersion": "No version history to display."
"versionHistory.noVersion": "No version history to display.",
"errors.invalidProductId": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"relatedInvoiceLines.vendorCode": "Vendor code"
}
6 changes: 4 additions & 2 deletions translations/ui-orders/hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@
"checkIn.pieceFormat.electronic": "Electronic",
"checkIn.pieceFormat.physical": "Physical",
"search.productIdISBN": "Product ID ISBN",
"errors.invalidISBN": "Invalid ISBN; adjust or remove",
"errors.invalidISBN": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"itemDetails.qualifier": "Qualifier",
"itemDetails.contributors": "Contributors",
"itemDetails.productIds": "Product identifiers",
Expand Down Expand Up @@ -847,5 +847,7 @@
"relatedInvoices.subscriptionEnd": "Subscription end",
"relatedInvoices.subscriptionDescription": "Subscription info",
"errors.encumbrancesForReEncumberNotFound": "The encumbrances were correctly created during the rollover or have already been updated.",
"versionHistory.noVersion": "No version history to display."
"versionHistory.noVersion": "No version history to display.",
"errors.invalidProductId": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"relatedInvoiceLines.vendorCode": "Vendor code"
}
4 changes: 3 additions & 1 deletion translations/ui-orders/it_IT.json
Original file line number Diff line number Diff line change
Expand Up @@ -847,5 +847,7 @@
"relatedInvoices.subscriptionEnd": "Subscription end",
"relatedInvoices.subscriptionDescription": "Subscription info",
"errors.encumbrancesForReEncumberNotFound": "The encumbrances were correctly created during the rollover or have already been updated.",
"versionHistory.noVersion": "No version history to display."
"versionHistory.noVersion": "No version history to display.",
"errors.invalidProductId": "Product ID number invalid based on product ID type. You can use \"Change instance connection\" to refresh product IDs from the instance record before editing the POL.",
"relatedInvoiceLines.vendorCode": "Vendor code"
}
Loading

0 comments on commit 732f520

Please sign in to comment.