Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/master' into malawi

# Conflicts:

# src/main/java/org/openlmis/DataSeeder.java

    • -2
    • +17
    ./upload/BaseCommunicationService.java
    • -6
    • +4
    ./upload/FacilityTypeApprovedProductService.java
    • -0
    • +125
    ./utils/JsonObjectComparisonUtils.java
Enabled the possibility of updating valid sources and destinations

    • -17
    • +17
    ./upload/ValidDestinationService.java
    • -17
    • +17
    ./upload/ValidSourceService.java
ANGOLASUP-113: Added support for object cleanup case

    • -8
    • +44
    ./utils/JsonObjectComparisonUtils.java
  1. … 1 more file in changeset.
ANGOLASUP-113: Improved trade item logic & added validation of camelCase style of mapping field names

    • -19
    • +9
    ./converter/FileArrayTypeConverter.java
    • -22
    • +14
    ./converter/FileObjectTypeConverter.java
    • -53
    • +0
    ./converter/FindCachedTradeItemTypeConverter.java
    • -0
    • +75
    ./converter/FindTradeItemFromFileTypeConverter.java
    • -1
    • +0
    ./upload/BaseCommunicationService.java
  1. … 5 more files in changeset.
ANGOLASUP-113: Fixed issues with comparing numeric values

    • -4
    • +29
    ./utils/JsonObjectComparisonUtils.java
ANGOLASUP-113: Used the strip method before converting CSV entries to fix a problem with occurring trailing and leading whitespaces

ANGOLASUP-113: Added isUpdateNeeded method & comparison of JSONs is conducted only for Orderables and FTAPs

    • -2
    • +17
    ./upload/BaseCommunicationService.java
    • -0
    • +5
    ./upload/FacilityTypeApprovedProductService.java
    • -16
    • +17
    ./utils/JsonObjectComparisonUtils.java
ANGOLASUP-113: Introduced JSON comparison mechanism

    • -0
    • +67
    ./utils/JsonObjectComparisonUtils.java
OLMIS-6540 - Changed condition in hasNoParameter method

    • -1
    • +1
    ./upload/FacilityTypeApprovedProductService.java
OLMIS-6540 - Fixed problem with NPE

    • -5
    • +6
    ./upload/FacilityTypeApprovedProductService.java
OLMIS-6540 - Fixed checkstyle

    • -5
    • +5
    ./upload/FacilityTypeApprovedProductService.java
OLMIS-6540 - Fixed checkstyle

    • -5
    • +5
    ./upload/FacilityTypeApprovedProductService.java
OLMIS-6540 - Fixed NPE

    • -9
    • +22
    ./upload/FacilityTypeApprovedProductService.java
OLMIS-6540 - Fixed NPE

    • -9
    • +22
    ./upload/FacilityTypeApprovedProductService.java
OLMIS-6540 - Updated finding unique ftap

    • -7
    • +7
    ./upload/FacilityTypeApprovedProductService.java
OLMIS-6540 - Updated finding unique ftap

    • -7
    • +7
    ./upload/FacilityTypeApprovedProductService.java
OLMIS-6540 - Fixed checkstyle

    • -5
    • +5
    ./upload/FacilityTypeApprovedProductService.java
OLMIS-6540 - Fixed checkstyle

    • -5
    • +5
    ./upload/FacilityTypeApprovedProductService.java
OLMIS-6540 - Add posibility to updated FTAPs

    • -6
    • +35
    ./upload/FacilityTypeApprovedProductService.java
OLMIS-6540 - Add posibility to updated FTAPs

    • -6
    • +35
    ./upload/FacilityTypeApprovedProductService.java
AO-408 Add new date format to Direct Date converter.

    • -1
    • +1
    ./converter/DirectDateTypeConverter.java
AO-408 Add new date format to Direct Date converter.

    • -1
    • +1
    ./converter/DirectDateTypeConverter.java
AO-478: Commented out code which can be used after stockmanagment 5.0.0 release

    • -20
    • +16
    ./upload/ValidDestinationService.java
    • -20
    • +16
    ./upload/ValidSourceService.java
AO-478: Commented out code which can be used after stockmanagment 5.0.0 release

    • -20
    • +16
    ./upload/ValidDestinationService.java
    • -20
    • +16
    ./upload/ValidSourceService.java
AO-478: Enable updates of valid sources/destinations via the seed tool

    • -0
    • +24
    ./upload/ValidDestinationService.java
AO-478: Enable updates of valid sources/destinations via the seed tool

    • -0
    • +24
    ./upload/ValidDestinationService.java
AO-486 Add ability to load organizations via seed tool.

  1. … 1 more file in changeset.
AO-486 Add ability to load organizations via seed tool.

  1. … 1 more file in changeset.
AO-429 Add email verified converter and add auto verifying user email address.

    • -0
    • +78
    ./converter/FindEmailVerifiedConverter.java
    • -0
    • +9
    ./upload/BaseCommunicationService.java
    • -0
    • +63
    ./upload/UserContactDetailService.java
  1. … 1 more file in changeset.
AO-429 Add email verified converter and add auto verifying user email address.

    • -0
    • +78
    ./converter/FindEmailVerifiedConverter.java
    • -0
    • +9
    ./upload/BaseCommunicationService.java
    • -0
    • +63
    ./upload/UserContactDetailService.java
  1. … 1 more file in changeset.