Changed requisition version to 7.0.0-SNAPSHOT

Changed requisition version to RC3 for uat, uat3 and uat4

Release requisition v7.0.0-RC3

Changed Version to 7.0.0-SNAPSHOT

Changed Version to 7.0.0-RC2

Changed Version to 7.0.0-SNAPSHOT

Changed requisition version to 7.0.0-RC1 in uat, uat3 and uat4 envs.

Update release version to v7.0.0-RC1

OLMIS-4966: updated documentation of function that calculates adjusted consumption

OLMIS-4966: remove unessary check of isDisplayed. inverse if statement to remove operator.

OLMIS-4966: added tests that cover two conditions.

OLMIS-4966: Added additional column on requisition template.

Validate the requisition template to make sure that the additionalQuantityRequired field

is only enabled when adjsted consumption column is also visible.

Calculate adjusted consumption when additional quantity required is changed.

OLMIS-4966: Add additional column on requisition template called additionalQuantityRequired.

This new column cannot be displayed if the template does not display the adjusted consumption field.

If additionalQuantityRequired column is displayed, the calculation of adjusted consumption will be influenced.

    • -2
    • +48
    /demo-data/requisition.columns_maps.json
    • -0
    • +13
    /src/main/resources/db/migration/20180706200019454__add_additional_quantity_required_column.sql
Fix indentation

Add missing test

OLMIS-4865: Address code review feedbacks

Use array.filter instead of angular.forEach functions

Add documentation @return

Move error handling code to catch(

    • -7
    • +11
    /src/requisition/requisitions.service.js
OLMIS-4958: code review feedback

    • -1
    • +1
    /src/main/resources/api-definition.yaml
OLMIS-4865: additional test for releasing without order.

OLMIS-4958: code review feedback

    • -2
    • +2
    /src/main/resources/api-definition.yaml
    • -0
    • +25
    /src/main/resources/schemas/releasableRequisitionBatchDto.json
OLMIS-4958: code review feedback

Rename DTOs and Spec for batchReleases API

    • -3
    • +3
    /src/main/resources/api-definition.yaml
    • -0
    • +25
    /src/main/resources/schemas/releasableBatchDto.json
  1. … 9 more files in changeset.
OLMIS-4865: release requisition without order

This commit also refactors the convert to order functionality to use the new batchReleases api.

    • -7
    • +33
    /src/requisition/requisitions.service.js
OLMIS-4867: address code review feedbacks

renamed test cases for better clarity.

OLMIS-4868: address code review feedbacks

pluralise order status

    • -3
    • +3
    /src/order-view/order-view.controller.js
OLMIS-4867: address code review feedbacks

change a error message.

update test name

cover a few more condition on order test.

OLMIS-4958: incorporate feedbacks to make the api RESTful.

    • -2
    • +9
    /src/main/resources/api-definition.yaml
remove s from schema name.

    • -1
    • +1
    /src/main/resources/api-definition.yaml
OLMIS-4958: propose a new resource to release requisitions with or without orders

This commit contains propsed new API that will implement both convert to order as well as releasing requisitions without order.

    • -0
    • +18
    /src/main/resources/api-definition.yaml
    • -0
    • +25
    /src/main/resources/schemas/releaseRequisitionDto.json
    • -0
    • +19
    /src/main/resources/schemas/releaseRequisitionLineItemDto.json
OLMIS-4958: create a consolidated api for releasing requisitions with or without order.

OLMIS-4865: capability to release requisitions without order.

Before releasing the requisition without order, this change

checks if a user has permission to convert to order.

    • -0
    • +25
    /src/main/resources/api-definition.yaml
  1. … 11 more files in changeset.
OLMIS-4868: trivial, add missing semicolon.

OLMIS-4868: remove extra comma.