resolved confilct

I-TECH · Nov 18, 2014 · 5a0b48a · 5a0b48a
1 parent 15cb274
commit 5a0b48a
Show file tree

Hide file tree

Showing 717 changed files with 5 additions and 47 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/README.md b/README.md
diff --git a/api/pom.xml b/api/pom.xml
diff --git a/api/src/main/distro/metadata/concepts.xml b/api/src/main/distro/metadata/concepts.xml
diff --git a/api/src/main/distro/metadata/forms.xml b/api/src/main/distro/metadata/forms.xml
diff --git a/api/src/main/distro/metadata/identifierTypes.xml b/api/src/main/distro/metadata/identifierTypes.xml
diff --git a/api/src/main/distro/metadata/programs.xml b/api/src/main/distro/metadata/programs.xml
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/ArtAssessmentMethod.java b/api/src/main/java/org/openmrs/module/kenyaemr/ArtAssessmentMethod.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/Configuration.java b/api/src/main/java/org/openmrs/module/kenyaemr/Configuration.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/Dictionary.java b/api/src/main/java/org/openmrs/module/kenyaemr/Dictionary.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/EmrActivator.java b/api/src/main/java/org/openmrs/module/kenyaemr/EmrActivator.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/EmrConstants.java b/api/src/main/java/org/openmrs/module/kenyaemr/EmrConstants.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/HivConstants.java b/api/src/main/java/org/openmrs/module/kenyaemr/HivConstants.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/PregnancyStage.java b/api/src/main/java/org/openmrs/module/kenyaemr/PregnancyStage.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/TbConstants.java b/api/src/main/java/org/openmrs/module/kenyaemr/TbConstants.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/advice/EncounterServiceAdvice.java b/api/src/main/java/org/openmrs/module/kenyaemr/advice/EncounterServiceAdvice.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/api/KenyaEmrService.java b/api/src/main/java/org/openmrs/module/kenyaemr/api/KenyaEmrService.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/api/db/KenyaEmrDAO.java b/api/src/main/java/org/openmrs/module/kenyaemr/api/db/KenyaEmrDAO.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/api/db/hibernate/HibernateKenyaEmrDAO.java b/api/src/main/java/org/openmrs/module/kenyaemr/api/db/hibernate/HibernateKenyaEmrDAO.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/api/impl/KenyaEmrServiceImpl.java b/api/src/main/java/org/openmrs/module/kenyaemr/api/impl/KenyaEmrServiceImpl.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/calculation/BaseEmrCalculation.java b/api/src/main/java/org/openmrs/module/kenyaemr/calculation/BaseEmrCalculation.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/calculation/EmrCalculationUtils.java b/api/src/main/java/org/openmrs/module/kenyaemr/calculation/EmrCalculationUtils.java
diff --git a/...ain/java/org/openmrs/module/kenyaemr/calculation/library/DeceasedPatientsCalculation.java b/...ain/java/org/openmrs/module/kenyaemr/calculation/library/DeceasedPatientsCalculation.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/calculation/library/InProgramCalculation.java b/api/src/main/java/org/openmrs/module/kenyaemr/calculation/library/InProgramCalculation.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/calculation/library/IsPregnantCalculation.java b/api/src/main/java/org/openmrs/module/kenyaemr/calculation/library/IsPregnantCalculation.java
diff --git a/...ava/org/openmrs/module/kenyaemr/calculation/library/MissedLastAppointmentCalculation.java b/...ava/org/openmrs/module/kenyaemr/calculation/library/MissedLastAppointmentCalculation.java
diff --git a/...ain/java/org/openmrs/module/kenyaemr/calculation/library/RecordedDeceasedCalculation.java b/...ain/java/org/openmrs/module/kenyaemr/calculation/library/RecordedDeceasedCalculation.java
diff --git a/.../java/org/openmrs/module/kenyaemr/calculation/library/ScheduledVisitOnDayCalculation.java b/.../java/org/openmrs/module/kenyaemr/calculation/library/ScheduledVisitOnDayCalculation.java
diff --git a/...src/main/java/org/openmrs/module/kenyaemr/calculation/library/VisitsOnDayCalculation.java b/...src/main/java/org/openmrs/module/kenyaemr/calculation/library/VisitsOnDayCalculation.java
diff --git a/...main/java/org/openmrs/module/kenyaemr/calculation/library/hiv/AllPatientsCalculation.java b/...main/java/org/openmrs/module/kenyaemr/calculation/library/hiv/AllPatientsCalculation.java
diff --git a/...ain/java/org/openmrs/module/kenyaemr/calculation/library/hiv/DecliningCd4Calculation.java b/...ain/java/org/openmrs/module/kenyaemr/calculation/library/hiv/DecliningCd4Calculation.java
diff --git a/...org/openmrs/module/kenyaemr/calculation/library/hiv/EligibleForHivProgramCalculation.java b/...org/openmrs/module/kenyaemr/calculation/library/hiv/EligibleForHivProgramCalculation.java
diff --git a/...g/openmrs/module/kenyaemr/calculation/library/hiv/InCareHasAtLeast2VisitsCalculation.java b/...g/openmrs/module/kenyaemr/calculation/library/hiv/InCareHasAtLeast2VisitsCalculation.java
diff --git a/...ain/java/org/openmrs/module/kenyaemr/calculation/library/hiv/LastCd4CountCalculation.java b/...ain/java/org/openmrs/module/kenyaemr/calculation/library/hiv/LastCd4CountCalculation.java
diff --git a/...ava/org/openmrs/module/kenyaemr/calculation/library/hiv/LastCd4PercentageCalculation.java b/...ava/org/openmrs/module/kenyaemr/calculation/library/hiv/LastCd4PercentageCalculation.java
diff --git a/...ain/java/org/openmrs/module/kenyaemr/calculation/library/hiv/LastWhoStageCalculation.java b/...ain/java/org/openmrs/module/kenyaemr/calculation/library/hiv/LastWhoStageCalculation.java
diff --git a/...n/java/org/openmrs/module/kenyaemr/calculation/library/hiv/LostToFollowUpCalculation.java b/...n/java/org/openmrs/module/kenyaemr/calculation/library/hiv/LostToFollowUpCalculation.java
diff --git a/...odule/kenyaemr/calculation/library/hiv/LostToFollowUpIncludingTransferOutCalculation.java b/...odule/kenyaemr/calculation/library/hiv/LostToFollowUpIncludingTransferOutCalculation.java
diff --git a/...ain/java/org/openmrs/module/kenyaemr/calculation/library/hiv/NeedsCd4TestCalculation.java b/...ain/java/org/openmrs/module/kenyaemr/calculation/library/hiv/NeedsCd4TestCalculation.java
diff --git a/...va/org/openmrs/module/kenyaemr/calculation/library/hiv/NeverScreenedForTbCalculation.java b/...va/org/openmrs/module/kenyaemr/calculation/library/hiv/NeverScreenedForTbCalculation.java
diff --git a/...rg/openmrs/module/kenyaemr/calculation/library/hiv/NeverTakenCtxOrDapsoneCalculation.java b/...rg/openmrs/module/kenyaemr/calculation/library/hiv/NeverTakenCtxOrDapsoneCalculation.java
diff --git a/...a/org/openmrs/module/kenyaemr/calculation/library/hiv/OnCtxWithinDurationCalculation.java b/...a/org/openmrs/module/kenyaemr/calculation/library/hiv/OnCtxWithinDurationCalculation.java
diff --git a/...module/kenyaemr/calculation/library/hiv/PatientsWhoMeetCriteriaForNutritionalSupport.java b/...module/kenyaemr/calculation/library/hiv/PatientsWhoMeetCriteriaForNutritionalSupport.java
diff --git a/...org/openmrs/module/kenyaemr/calculation/library/hiv/art/CurrentArtRegimenCalculation.java b/...org/openmrs/module/kenyaemr/calculation/library/hiv/art/CurrentArtRegimenCalculation.java
diff --git a/...ain/java/org/openmrs/module/kenyaemr/calculation/library/hiv/art/DateARV1Calculation.java b/...ain/java/org/openmrs/module/kenyaemr/calculation/library/hiv/art/DateARV1Calculation.java
diff --git a/...ain/java/org/openmrs/module/kenyaemr/calculation/library/hiv/art/DateARV2Calculation.java b/...ain/java/org/openmrs/module/kenyaemr/calculation/library/hiv/art/DateARV2Calculation.java
diff --git a/...java/org/openmrs/module/kenyaemr/calculation/library/hiv/art/DateLastSeenCalculation.java b/...java/org/openmrs/module/kenyaemr/calculation/library/hiv/art/DateLastSeenCalculation.java
diff --git a/.../org/openmrs/module/kenyaemr/calculation/library/hiv/art/DateOfEnrollmentCalculation.java b/.../org/openmrs/module/kenyaemr/calculation/library/hiv/art/DateOfEnrollmentCalculation.java
diff --git a/...va/org/openmrs/module/kenyaemr/calculation/library/hiv/art/EligibleForArtCalculation.java b/...va/org/openmrs/module/kenyaemr/calculation/library/hiv/art/EligibleForArtCalculation.java
diff --git a/...openmrs/module/kenyaemr/calculation/library/hiv/art/EligibleForArtTriggerCalculation.java b/...openmrs/module/kenyaemr/calculation/library/hiv/art/EligibleForArtTriggerCalculation.java
diff --git a/...org/openmrs/module/kenyaemr/calculation/library/hiv/art/InitialArtRegimenCalculation.java b/...org/openmrs/module/kenyaemr/calculation/library/hiv/art/InitialArtRegimenCalculation.java
diff --git a/...g/openmrs/module/kenyaemr/calculation/library/hiv/art/InitialArtStartDateCalculation.java b/...g/openmrs/module/kenyaemr/calculation/library/hiv/art/InitialArtStartDateCalculation.java
diff --git a/...java/org/openmrs/module/kenyaemr/calculation/library/hiv/art/IsTransferInCalculation.java b/...java/org/openmrs/module/kenyaemr/calculation/library/hiv/art/IsTransferInCalculation.java
diff --git a/...ava/org/openmrs/module/kenyaemr/calculation/library/hiv/art/IsTransferOutCalculation.java b/...ava/org/openmrs/module/kenyaemr/calculation/library/hiv/art/IsTransferOutCalculation.java
diff --git a/...main/java/org/openmrs/module/kenyaemr/calculation/library/hiv/art/LastCd4Calculation.java b/...main/java/org/openmrs/module/kenyaemr/calculation/library/hiv/art/LastCd4Calculation.java
diff --git a/.../org/openmrs/module/kenyaemr/calculation/library/hiv/art/LastCd4CountDateCalculation.java b/.../org/openmrs/module/kenyaemr/calculation/library/hiv/art/LastCd4CountDateCalculation.java
diff --git a/...enmrs/module/kenyaemr/calculation/library/hiv/art/OnAlternateFirstLineArtCalculation.java b/...enmrs/module/kenyaemr/calculation/library/hiv/art/OnAlternateFirstLineArtCalculation.java
diff --git a/...c/main/java/org/openmrs/module/kenyaemr/calculation/library/hiv/art/OnArtCalculation.java b/...c/main/java/org/openmrs/module/kenyaemr/calculation/library/hiv/art/OnArtCalculation.java
diff --git a/...penmrs/module/kenyaemr/calculation/library/hiv/art/OnOriginalFirstLineArtCalculation.java b/...penmrs/module/kenyaemr/calculation/library/hiv/art/OnOriginalFirstLineArtCalculation.java
diff --git a/...a/org/openmrs/module/kenyaemr/calculation/library/hiv/art/OnSecondLineArtCalculation.java b/...a/org/openmrs/module/kenyaemr/calculation/library/hiv/art/OnSecondLineArtCalculation.java
diff --git a/...va/org/openmrs/module/kenyaemr/calculation/library/hiv/art/OriginalCohortCalculation.java b/...va/org/openmrs/module/kenyaemr/calculation/library/hiv/art/OriginalCohortCalculation.java
diff --git a/...va/org/openmrs/module/kenyaemr/calculation/library/hiv/art/PatientOutComeCalculation.java b/...va/org/openmrs/module/kenyaemr/calculation/library/hiv/art/PatientOutComeCalculation.java
diff --git a/...rg/openmrs/module/kenyaemr/calculation/library/hiv/art/PregnantAtArtStartCalculation.java b/...rg/openmrs/module/kenyaemr/calculation/library/hiv/art/PregnantAtArtStartCalculation.java
diff --git a/...dule/kenyaemr/calculation/library/hiv/art/StartedArtAtTransferingFacilityCalculation.java b/...dule/kenyaemr/calculation/library/hiv/art/StartedArtAtTransferingFacilityCalculation.java
diff --git a/...g/openmrs/module/kenyaemr/calculation/library/hiv/art/TbPatientAtArtStartCalculation.java b/...g/openmrs/module/kenyaemr/calculation/library/hiv/art/TbPatientAtArtStartCalculation.java
diff --git a/...va/org/openmrs/module/kenyaemr/calculation/library/hiv/art/TransferInDateCalculation.java b/...va/org/openmrs/module/kenyaemr/calculation/library/hiv/art/TransferInDateCalculation.java
diff --git a/...a/org/openmrs/module/kenyaemr/calculation/library/hiv/art/TransferOutDateCalculation.java b/...a/org/openmrs/module/kenyaemr/calculation/library/hiv/art/TransferOutDateCalculation.java
diff --git a/...rg/openmrs/module/kenyaemr/calculation/library/hiv/art/WhoStageAtArtStartCalculation.java b/...rg/openmrs/module/kenyaemr/calculation/library/hiv/art/WhoStageAtArtStartCalculation.java
diff --git a/...openmrs/module/kenyaemr/calculation/library/mchcs/EligibleForMchcsProgramCalculation.java b/...openmrs/module/kenyaemr/calculation/library/mchcs/EligibleForMchcsProgramCalculation.java
diff --git a/...s/module/kenyaemr/calculation/library/mchcs/HEICohortsXMonthsDuringReviewCalculation.java b/...s/module/kenyaemr/calculation/library/mchcs/HEICohortsXMonthsDuringReviewCalculation.java
diff --git a/...rg/openmrs/module/kenyaemr/calculation/library/mchcs/InfantFeedingOptionsCalculation.java b/...rg/openmrs/module/kenyaemr/calculation/library/mchcs/InfantFeedingOptionsCalculation.java
diff --git a/...s/module/kenyaemr/calculation/library/mchcs/InfantMotherGuardianRelationsCalculation.java b/...s/module/kenyaemr/calculation/library/mchcs/InfantMotherGuardianRelationsCalculation.java
diff --git a/...odule/kenyaemr/calculation/library/mchcs/InfantMotherOrGuardianPairVisitsCalculation.java b/...odule/kenyaemr/calculation/library/mchcs/InfantMotherOrGuardianPairVisitsCalculation.java
diff --git a/...org/openmrs/module/kenyaemr/calculation/library/mchcs/InfantNeverTakenCTXCalculation.java b/...org/openmrs/module/kenyaemr/calculation/library/mchcs/InfantNeverTakenCTXCalculation.java
diff --git a/...mrs/module/kenyaemr/calculation/library/mchcs/InfantNeverTakenProphylaxisCalculation.java b/...mrs/module/kenyaemr/calculation/library/mchcs/InfantNeverTakenProphylaxisCalculation.java
diff --git a/.../java/org/openmrs/module/kenyaemr/calculation/library/mchcs/InfantsDNAPCRCalculation.java b/.../java/org/openmrs/module/kenyaemr/calculation/library/mchcs/InfantsDNAPCRCalculation.java
diff --git a/...rg/openmrs/module/kenyaemr/calculation/library/mchcs/MotherGuardianVisitsCalculation.java b/...rg/openmrs/module/kenyaemr/calculation/library/mchcs/MotherGuardianVisitsCalculation.java
diff --git a/...a/org/openmrs/module/kenyaemr/calculation/library/mchcs/NeedsAntibodyTestCalculation.java b/...a/org/openmrs/module/kenyaemr/calculation/library/mchcs/NeedsAntibodyTestCalculation.java
diff --git a/...n/java/org/openmrs/module/kenyaemr/calculation/library/mchcs/NeedsPcrTestCalculation.java b/...n/java/org/openmrs/module/kenyaemr/calculation/library/mchcs/NeedsPcrTestCalculation.java
diff --git a/...mrs/module/kenyaemr/calculation/library/mchcs/NotTakenPcrConfirmatoryTestCalculation.java b/...mrs/module/kenyaemr/calculation/library/mchcs/NotTakenPcrConfirmatoryTestCalculation.java
diff --git a/...org/openmrs/module/kenyaemr/calculation/library/mchcs/VisitsWithinAPeriodCalculation.java b/...org/openmrs/module/kenyaemr/calculation/library/mchcs/VisitsWithinAPeriodCalculation.java
diff --git a/...rs/module/kenyaemr/calculation/library/mchms/AllDeliveriesOnOrAfterMonthsCalculation.java b/...rs/module/kenyaemr/calculation/library/mchms/AllDeliveriesOnOrAfterMonthsCalculation.java
diff --git a/...rg/openmrs/module/kenyaemr/calculation/library/mchms/AssessedOnFirstVisitCalculation.java b/...rg/openmrs/module/kenyaemr/calculation/library/mchms/AssessedOnFirstVisitCalculation.java
diff --git a/...s/module/kenyaemr/calculation/library/mchms/DeliveriesWithFullPartographsCalculation.java b/...s/module/kenyaemr/calculation/library/mchms/DeliveriesWithFullPartographsCalculation.java
diff --git a/...va/org/openmrs/module/kenyaemr/calculation/library/mchms/DiscordantCoupleCalculation.java b/...va/org/openmrs/module/kenyaemr/calculation/library/mchms/DiscordantCoupleCalculation.java
diff --git a/...mrs/module/kenyaemr/calculation/library/mchms/EddEstimateFromMchmsProgramCalculation.java b/...mrs/module/kenyaemr/calculation/library/mchms/EddEstimateFromMchmsProgramCalculation.java
diff --git a/...openmrs/module/kenyaemr/calculation/library/mchms/EligibleForMchmsProgramCalculation.java b/...openmrs/module/kenyaemr/calculation/library/mchms/EligibleForMchmsProgramCalculation.java
diff --git a/...g/openmrs/module/kenyaemr/calculation/library/mchms/HivTestedAtEnrollmentCalculation.java b/...g/openmrs/module/kenyaemr/calculation/library/mchms/HivTestedAtEnrollmentCalculation.java
diff --git a/...java/org/openmrs/module/kenyaemr/calculation/library/mchms/LateEnrollmentCalculation.java b/...java/org/openmrs/module/kenyaemr/calculation/library/mchms/LateEnrollmentCalculation.java
diff --git a/...org/openmrs/module/kenyaemr/calculation/library/mchms/MchmsFirstVisitDateCalculation.java b/...org/openmrs/module/kenyaemr/calculation/library/mchms/MchmsFirstVisitDateCalculation.java
diff --git a/...va/org/openmrs/module/kenyaemr/calculation/library/mchms/MchmsHivTestDateCalculation.java b/...va/org/openmrs/module/kenyaemr/calculation/library/mchms/MchmsHivTestDateCalculation.java
diff --git a/...enmrs/module/kenyaemr/calculation/library/mchms/MotherNewBornPairReviewedCalculation.java b/...enmrs/module/kenyaemr/calculation/library/mchms/MotherNewBornPairReviewedCalculation.java
diff --git a/...n/java/org/openmrs/module/kenyaemr/calculation/library/mchms/NotHivTestedCalculation.java b/...n/java/org/openmrs/module/kenyaemr/calculation/library/mchms/NotHivTestedCalculation.java
diff --git a/.../main/java/org/openmrs/module/kenyaemr/calculation/library/mchms/NotOnArtCalculation.java b/.../main/java/org/openmrs/module/kenyaemr/calculation/library/mchms/NotOnArtCalculation.java
diff --git a/...c/main/java/org/openmrs/module/kenyaemr/calculation/library/mchms/OnHaartCalculation.java b/...c/main/java/org/openmrs/module/kenyaemr/calculation/library/mchms/OnHaartCalculation.java
diff --git a/...openmrs/module/kenyaemr/calculation/library/mchms/PartnerHivStatusUnknownCalculation.java b/...openmrs/module/kenyaemr/calculation/library/mchms/PartnerHivStatusUnknownCalculation.java
diff --git a/...g/openmrs/module/kenyaemr/calculation/library/mchms/PregnantWithANCVisitsCalculation.java b/...g/openmrs/module/kenyaemr/calculation/library/mchms/PregnantWithANCVisitsCalculation.java
diff --git a/...org/openmrs/module/kenyaemr/calculation/library/mchms/TestedForHivInMchmsCalculation.java b/...org/openmrs/module/kenyaemr/calculation/library/mchms/TestedForHivInMchmsCalculation.java
diff --git a/...a/org/openmrs/module/kenyaemr/calculation/library/tb/EligibleForTbProgramCalculation.java b/...a/org/openmrs/module/kenyaemr/calculation/library/tb/EligibleForTbProgramCalculation.java
diff --git a/.../main/java/org/openmrs/module/kenyaemr/calculation/library/tb/InTbProgramCalculation.java b/.../main/java/org/openmrs/module/kenyaemr/calculation/library/tb/InTbProgramCalculation.java
diff --git a/...rg/openmrs/module/kenyaemr/calculation/library/tb/MissedLastTbAppointmentCalculation.java b/...rg/openmrs/module/kenyaemr/calculation/library/tb/MissedLastTbAppointmentCalculation.java
diff --git a/...org/openmrs/module/kenyaemr/calculation/library/tb/MissingTbSputumResultsCalculation.java b/...org/openmrs/module/kenyaemr/calculation/library/tb/MissingTbSputumResultsCalculation.java
diff --git a/...java/org/openmrs/module/kenyaemr/calculation/library/tb/NeedsTbSputumTestCalculation.java b/...java/org/openmrs/module/kenyaemr/calculation/library/tb/NeedsTbSputumTestCalculation.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/calculation/library/tb/OnCPTCalculation.java b/api/src/main/java/org/openmrs/module/kenyaemr/calculation/library/tb/OnCPTCalculation.java
diff --git a/...rg/openmrs/module/kenyaemr/calculation/library/tb/TbDiseaseClassificationCalculation.java b/...rg/openmrs/module/kenyaemr/calculation/library/tb/TbDiseaseClassificationCalculation.java
diff --git a/...ava/org/openmrs/module/kenyaemr/calculation/library/tb/TbInitialTreatmentCalculation.java b/...ava/org/openmrs/module/kenyaemr/calculation/library/tb/TbInitialTreatmentCalculation.java
diff --git a/...rg/openmrs/module/kenyaemr/calculation/library/tb/TbPatientClassificationCalculation.java b/...rg/openmrs/module/kenyaemr/calculation/library/tb/TbPatientClassificationCalculation.java
diff --git a/...java/org/openmrs/module/kenyaemr/calculation/library/tb/TbTreatmentNumberCalculation.java b/...java/org/openmrs/module/kenyaemr/calculation/library/tb/TbTreatmentNumberCalculation.java
diff --git a/...a/org/openmrs/module/kenyaemr/calculation/library/tb/TbTreatmentStartDateCalculation.java b/...a/org/openmrs/module/kenyaemr/calculation/library/tb/TbTreatmentStartDateCalculation.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/chore/ConvertNationalIdAttributes.java b/api/src/main/java/org/openmrs/module/kenyaemr/chore/ConvertNationalIdAttributes.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/chore/FixMissingOpenmrsIdentifiers.java b/api/src/main/java/org/openmrs/module/kenyaemr/chore/FixMissingOpenmrsIdentifiers.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/chore/HivEnrollmentEncounterDateSynched.java b/api/src/main/java/org/openmrs/module/kenyaemr/chore/HivEnrollmentEncounterDateSynched.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/chore/MohTherapyFormFixes.java b/api/src/main/java/org/openmrs/module/kenyaemr/chore/MohTherapyFormFixes.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/chore/VoidDuplicateIdentifiers.java b/api/src/main/java/org/openmrs/module/kenyaemr/chore/VoidDuplicateIdentifiers.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/datatype/FormDatatype.java b/api/src/main/java/org/openmrs/module/kenyaemr/datatype/FormDatatype.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/datatype/LocationDatatype.java b/api/src/main/java/org/openmrs/module/kenyaemr/datatype/LocationDatatype.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/form/element/DynamicObsContainerElement.java b/api/src/main/java/org/openmrs/module/kenyaemr/form/element/DynamicObsContainerElement.java
diff --git a/...ain/java/org/openmrs/module/kenyaemr/form/element/EncounterLocationSubmissionElement.java b/...ain/java/org/openmrs/module/kenyaemr/form/element/EncounterLocationSubmissionElement.java
diff --git a/...ain/java/org/openmrs/module/kenyaemr/form/element/EncounterProviderSubmissionElement.java b/...ain/java/org/openmrs/module/kenyaemr/form/element/EncounterProviderSubmissionElement.java
diff --git a/...src/main/java/org/openmrs/module/kenyaemr/form/element/ImmunizationSubmissionElement.java b/...src/main/java/org/openmrs/module/kenyaemr/form/element/ImmunizationSubmissionElement.java
diff --git a/...rc/main/java/org/openmrs/module/kenyaemr/form/element/LabTestPickerSubmissionElement.java b/...rc/main/java/org/openmrs/module/kenyaemr/form/element/LabTestPickerSubmissionElement.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/form/element/RecentObsElement.java b/api/src/main/java/org/openmrs/module/kenyaemr/form/element/RecentObsElement.java
diff --git a/...src/main/java/org/openmrs/module/kenyaemr/form/handler/DynamicObsContainerTagHandler.java b/...src/main/java/org/openmrs/module/kenyaemr/form/handler/DynamicObsContainerTagHandler.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/form/handler/EncounterLocationTagHandler.java b/api/src/main/java/org/openmrs/module/kenyaemr/form/handler/EncounterLocationTagHandler.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/form/handler/EncounterProviderTagHandler.java b/api/src/main/java/org/openmrs/module/kenyaemr/form/handler/EncounterProviderTagHandler.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/form/handler/ImmunizationTagHandler.java b/api/src/main/java/org/openmrs/module/kenyaemr/form/handler/ImmunizationTagHandler.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/form/handler/LabTestPickerTagHandler.java b/api/src/main/java/org/openmrs/module/kenyaemr/form/handler/LabTestPickerTagHandler.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/form/handler/RecentObsTagHandler.java b/api/src/main/java/org/openmrs/module/kenyaemr/form/handler/RecentObsTagHandler.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/form/velocity/EmrVelocityContentProvider.java b/api/src/main/java/org/openmrs/module/kenyaemr/form/velocity/EmrVelocityContentProvider.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/form/velocity/EmrVelocityFunctions.java b/api/src/main/java/org/openmrs/module/kenyaemr/form/velocity/EmrVelocityFunctions.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/form/velocity/UiVelocityFunctions.java b/api/src/main/java/org/openmrs/module/kenyaemr/form/velocity/UiVelocityFunctions.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/form/widget/ObjectSearchWidget.java b/api/src/main/java/org/openmrs/module/kenyaemr/form/widget/ObjectSearchWidget.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/metadata/CommonMetadata.java b/api/src/main/java/org/openmrs/module/kenyaemr/metadata/CommonMetadata.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/metadata/FacilityMetadata.java b/api/src/main/java/org/openmrs/module/kenyaemr/metadata/FacilityMetadata.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/metadata/HivMetadata.java b/api/src/main/java/org/openmrs/module/kenyaemr/metadata/HivMetadata.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/metadata/MchMetadata.java b/api/src/main/java/org/openmrs/module/kenyaemr/metadata/MchMetadata.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/metadata/PackagesMetadata.java b/api/src/main/java/org/openmrs/module/kenyaemr/metadata/PackagesMetadata.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/metadata/SecurityMetadata.java b/api/src/main/java/org/openmrs/module/kenyaemr/metadata/SecurityMetadata.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/metadata/TbMetadata.java b/api/src/main/java/org/openmrs/module/kenyaemr/metadata/TbMetadata.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/metadata/sync/LocationMflCsvSource.java b/api/src/main/java/org/openmrs/module/kenyaemr/metadata/sync/LocationMflCsvSource.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/metadata/sync/LocationMflSynchronization.java b/api/src/main/java/org/openmrs/module/kenyaemr/metadata/sync/LocationMflSynchronization.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/regimen/DrugReference.java b/api/src/main/java/org/openmrs/module/kenyaemr/regimen/DrugReference.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/regimen/Regimen.java b/api/src/main/java/org/openmrs/module/kenyaemr/regimen/Regimen.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/regimen/RegimenChange.java b/api/src/main/java/org/openmrs/module/kenyaemr/regimen/RegimenChange.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/regimen/RegimenChangeHistory.java b/api/src/main/java/org/openmrs/module/kenyaemr/regimen/RegimenChangeHistory.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/regimen/RegimenComponent.java b/api/src/main/java/org/openmrs/module/kenyaemr/regimen/RegimenComponent.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/regimen/RegimenConfiguration.java b/api/src/main/java/org/openmrs/module/kenyaemr/regimen/RegimenConfiguration.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/regimen/RegimenDefinition.java b/api/src/main/java/org/openmrs/module/kenyaemr/regimen/RegimenDefinition.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/regimen/RegimenDefinitionGroup.java b/api/src/main/java/org/openmrs/module/kenyaemr/regimen/RegimenDefinitionGroup.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/regimen/RegimenManager.java b/api/src/main/java/org/openmrs/module/kenyaemr/regimen/RegimenManager.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/regimen/RegimenOrder.java b/api/src/main/java/org/openmrs/module/kenyaemr/regimen/RegimenOrder.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/regimen/RegimenValidator.java b/api/src/main/java/org/openmrs/module/kenyaemr/regimen/RegimenValidator.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/reporting/ColumnParameters.java b/api/src/main/java/org/openmrs/module/kenyaemr/reporting/ColumnParameters.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/reporting/EmrReportingUtils.java b/api/src/main/java/org/openmrs/module/kenyaemr/reporting/EmrReportingUtils.java
diff --git a/.../main/java/org/openmrs/module/kenyaemr/reporting/builder/common/ArtDrugReportBuilder.java b/.../main/java/org/openmrs/module/kenyaemr/reporting/builder/common/ArtDrugReportBuilder.java
diff --git a/...rc/main/java/org/openmrs/module/kenyaemr/reporting/builder/common/Dhis2ReportBuilder.java b/...rc/main/java/org/openmrs/module/kenyaemr/reporting/builder/common/Dhis2ReportBuilder.java
diff --git a/...c/main/java/org/openmrs/module/kenyaemr/reporting/builder/common/Moh711ReportBuilder.java b/...c/main/java/org/openmrs/module/kenyaemr/reporting/builder/common/Moh711ReportBuilder.java
diff --git a/...c/main/java/org/openmrs/module/kenyaemr/reporting/builder/common/Moh731ReportBuilder.java b/...c/main/java/org/openmrs/module/kenyaemr/reporting/builder/common/Moh731ReportBuilder.java
diff --git a/...ava/org/openmrs/module/kenyaemr/reporting/builder/hiv/ArtCohortAnalysisReportBuilder.java b/...ava/org/openmrs/module/kenyaemr/reporting/builder/hiv/ArtCohortAnalysisReportBuilder.java
diff --git a/...ain/java/org/openmrs/module/kenyaemr/reporting/builder/hiv/DecliningCd4ReportBuilder.java b/...ain/java/org/openmrs/module/kenyaemr/reporting/builder/hiv/DecliningCd4ReportBuilder.java
diff --git a/.../main/java/org/openmrs/module/kenyaemr/reporting/builder/hiv/QiAdultCTxReportBuilder.java b/.../main/java/org/openmrs/module/kenyaemr/reporting/builder/hiv/QiAdultCTxReportBuilder.java
diff --git a/...src/main/java/org/openmrs/module/kenyaemr/reporting/builder/hiv/QiEmtctReportBuilder.java b/...src/main/java/org/openmrs/module/kenyaemr/reporting/builder/hiv/QiEmtctReportBuilder.java
diff --git a/...c/main/java/org/openmrs/module/kenyaemr/reporting/builder/hiv/QiPaedCTxReportBuilder.java b/...c/main/java/org/openmrs/module/kenyaemr/reporting/builder/hiv/QiPaedCTxReportBuilder.java
diff --git a/...rg/openmrs/module/kenyaemr/reporting/builder/mchcs/InfantFeedingOptionsReportBuilder.java b/...rg/openmrs/module/kenyaemr/reporting/builder/mchcs/InfantFeedingOptionsReportBuilder.java
diff --git a/...enmrs/module/kenyaemr/reporting/builder/tb/NewSmearNegativePTB2And81215ReportBuilder.java b/...enmrs/module/kenyaemr/reporting/builder/tb/NewSmearNegativePTB2And81215ReportBuilder.java
diff --git a/...rg/openmrs/module/kenyaemr/reporting/builder/tb/SmearNotDonePTB2And8812ReportBuilder.java b/...rg/openmrs/module/kenyaemr/reporting/builder/tb/SmearNotDonePTB2And8812ReportBuilder.java
diff --git a/...org/openmrs/module/kenyaemr/reporting/cohort/definition/RegimenOrderCohortDefinition.java b/...org/openmrs/module/kenyaemr/reporting/cohort/definition/RegimenOrderCohortDefinition.java
diff --git a/...kenyaemr/reporting/cohort/definition/evaluator/RegimenOrderCohortDefinitionEvaluator.java b/...kenyaemr/reporting/cohort/definition/evaluator/RegimenOrderCohortDefinitionEvaluator.java
diff --git a/...rc/main/java/org/openmrs/module/kenyaemr/reporting/data/converter/BirthdateConverter.java b/...rc/main/java/org/openmrs/module/kenyaemr/reporting/data/converter/BirthdateConverter.java
diff --git a/...java/org/openmrs/module/kenyaemr/reporting/data/converter/CalculationResultConverter.java b/...java/org/openmrs/module/kenyaemr/reporting/data/converter/CalculationResultConverter.java
diff --git a/...va/org/openmrs/module/kenyaemr/reporting/dataset/definition/MergingDataSetDefinition.java b/...va/org/openmrs/module/kenyaemr/reporting/dataset/definition/MergingDataSetDefinition.java
diff --git a/...enmrs/module/kenyaemr/reporting/dataset/definition/evaluator/MergingDataSetEvaluator.java b/...enmrs/module/kenyaemr/reporting/dataset/definition/evaluator/MergingDataSetEvaluator.java
diff --git a/...src/main/java/org/openmrs/module/kenyaemr/reporting/indicator/HivCareVisitsIndicator.java b/...src/main/java/org/openmrs/module/kenyaemr/reporting/indicator/HivCareVisitsIndicator.java
diff --git a/...penmrs/module/kenyaemr/reporting/indicator/evaluator/HivCareVisitsIndicatorEvaluator.java b/...penmrs/module/kenyaemr/reporting/indicator/evaluator/HivCareVisitsIndicatorEvaluator.java
diff --git a/...c/main/java/org/openmrs/module/kenyaemr/reporting/library/moh711/Moh711CohortLibrary.java b/...c/main/java/org/openmrs/module/kenyaemr/reporting/library/moh711/Moh711CohortLibrary.java
diff --git a/...c/main/java/org/openmrs/module/kenyaemr/reporting/library/moh731/Moh731CohortLibrary.java b/...c/main/java/org/openmrs/module/kenyaemr/reporting/library/moh731/Moh731CohortLibrary.java
diff --git a/...ain/java/org/openmrs/module/kenyaemr/reporting/library/moh731/Moh731IndicatorLibrary.java b/...ain/java/org/openmrs/module/kenyaemr/reporting/library/moh731/Moh731IndicatorLibrary.java
diff --git a/...java/org/openmrs/module/kenyaemr/reporting/library/shared/common/CommonCohortLibrary.java b/...java/org/openmrs/module/kenyaemr/reporting/library/shared/common/CommonCohortLibrary.java
diff --git a/...a/org/openmrs/module/kenyaemr/reporting/library/shared/common/CommonDimensionLibrary.java b/...a/org/openmrs/module/kenyaemr/reporting/library/shared/common/CommonDimensionLibrary.java
diff --git a/...a/org/openmrs/module/kenyaemr/reporting/library/shared/common/CommonIndicatorLibrary.java b/...a/org/openmrs/module/kenyaemr/reporting/library/shared/common/CommonIndicatorLibrary.java
diff --git a/...ain/java/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/Dhis2CohortLibrary.java b/...ain/java/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/Dhis2CohortLibrary.java
diff --git a/.../java/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/Dhis2IndicatorLibrary.java b/.../java/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/Dhis2IndicatorLibrary.java
diff --git a/.../main/java/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/HivCohortLibrary.java b/.../main/java/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/HivCohortLibrary.java
diff --git a/...in/java/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/HivIndicatorLibrary.java b/...in/java/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/HivIndicatorLibrary.java
diff --git a/.../main/java/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/PwpCohortLibrary.java b/.../main/java/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/PwpCohortLibrary.java
diff --git a/...in/java/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/PwpIndicatorLibrary.java b/...in/java/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/PwpIndicatorLibrary.java
diff --git a/...c/main/java/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/QiCohortLibrary.java b/...c/main/java/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/QiCohortLibrary.java
diff --git a/...n/java/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/QiEmtctCohortLibrary.java b/...n/java/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/QiEmtctCohortLibrary.java
diff --git a/...ava/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/QiEmtctIndicatorLibrary.java b/...ava/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/QiEmtctIndicatorLibrary.java
diff --git a/...ain/java/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/QiIndicatorLibrary.java b/...ain/java/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/QiIndicatorLibrary.java
diff --git a/...n/java/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/QiPaedsCohortLibrary.java b/...n/java/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/QiPaedsCohortLibrary.java
diff --git a/...ava/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/QiPaedsIndicatorLibrary.java b/...ava/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/QiPaedsIndicatorLibrary.java
diff --git a/...n/java/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/art/ArtCohortLibrary.java b/...n/java/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/art/ArtCohortLibrary.java
diff --git a/...ava/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/art/ArtIndicatorLibrary.java b/...ava/org/openmrs/module/kenyaemr/reporting/library/shared/hiv/art/ArtIndicatorLibrary.java
diff --git a/...n/java/org/openmrs/module/kenyaemr/reporting/library/shared/mchcs/MchcsCohortLibrary.java b/...n/java/org/openmrs/module/kenyaemr/reporting/library/shared/mchcs/MchcsCohortLibrary.java
diff --git a/...ava/org/openmrs/module/kenyaemr/reporting/library/shared/mchcs/MchcsIndicatorLibrary.java b/...ava/org/openmrs/module/kenyaemr/reporting/library/shared/mchcs/MchcsIndicatorLibrary.java
diff --git a/...n/java/org/openmrs/module/kenyaemr/reporting/library/shared/mchms/MchmsCohortLibrary.java b/...n/java/org/openmrs/module/kenyaemr/reporting/library/shared/mchms/MchmsCohortLibrary.java
diff --git a/...ava/org/openmrs/module/kenyaemr/reporting/library/shared/mchms/MchmsIndicatorLibrary.java b/...ava/org/openmrs/module/kenyaemr/reporting/library/shared/mchms/MchmsIndicatorLibrary.java
diff --git a/...rc/main/java/org/openmrs/module/kenyaemr/reporting/library/shared/tb/TbCohortLibrary.java b/...rc/main/java/org/openmrs/module/kenyaemr/reporting/library/shared/tb/TbCohortLibrary.java
diff --git a/...main/java/org/openmrs/module/kenyaemr/reporting/library/shared/tb/TbIndicatorLibrary.java b/...main/java/org/openmrs/module/kenyaemr/reporting/library/shared/tb/TbIndicatorLibrary.java
diff --git a/...src/main/java/org/openmrs/module/kenyaemr/reporting/renderer/MergedCsvReportRenderer.java b/...src/main/java/org/openmrs/module/kenyaemr/reporting/renderer/MergedCsvReportRenderer.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/system/CielRequirement.java b/api/src/main/java/org/openmrs/module/kenyaemr/system/CielRequirement.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/util/BuildProperties.java b/api/src/main/java/org/openmrs/module/kenyaemr/util/BuildProperties.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/util/EmrUiUtils.java b/api/src/main/java/org/openmrs/module/kenyaemr/util/EmrUiUtils.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/util/EmrUtils.java b/api/src/main/java/org/openmrs/module/kenyaemr/util/EmrUtils.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/util/ServerInformation.java b/api/src/main/java/org/openmrs/module/kenyaemr/util/ServerInformation.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/visit/EmrVisitAssignmentHandler.java b/api/src/main/java/org/openmrs/module/kenyaemr/visit/EmrVisitAssignmentHandler.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/visit/ExistingEncounterVisitHandler.java b/api/src/main/java/org/openmrs/module/kenyaemr/visit/ExistingEncounterVisitHandler.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/wrapper/EncounterWrapper.java b/api/src/main/java/org/openmrs/module/kenyaemr/wrapper/EncounterWrapper.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/wrapper/Enrollment.java b/api/src/main/java/org/openmrs/module/kenyaemr/wrapper/Enrollment.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/wrapper/Facility.java b/api/src/main/java/org/openmrs/module/kenyaemr/wrapper/Facility.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/wrapper/PatientWrapper.java b/api/src/main/java/org/openmrs/module/kenyaemr/wrapper/PatientWrapper.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/wrapper/PersonWrapper.java b/api/src/main/java/org/openmrs/module/kenyaemr/wrapper/PersonWrapper.java
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/wrapper/VisitWrapper.java b/api/src/main/java/org/openmrs/module/kenyaemr/wrapper/VisitWrapper.java
diff --git a/api/src/main/resources/content/kenyaemr.common.xml b/api/src/main/resources/content/kenyaemr.common.xml
diff --git a/api/src/main/resources/content/kenyaemr.hiv.xml b/api/src/main/resources/content/kenyaemr.hiv.xml
diff --git a/api/src/main/resources/content/kenyaemr.mchcs.xml b/api/src/main/resources/content/kenyaemr.mchcs.xml
diff --git a/api/src/main/resources/content/kenyaemr.mchms.xml b/api/src/main/resources/content/kenyaemr.mchms.xml
diff --git a/api/src/main/resources/content/kenyaemr.tb.xml b/api/src/main/resources/content/kenyaemr.tb.xml
diff --git a/api/src/main/resources/messages.properties b/api/src/main/resources/messages.properties
diff --git a/api/src/main/resources/metadata/KenyaEMR_Drugs-2.zip b/api/src/main/resources/metadata/KenyaEMR_Drugs-2.zip
diff --git a/api/src/main/resources/metadata/KenyaEMR_Misc-41.zip b/api/src/main/resources/metadata/KenyaEMR_Misc-41.zip
diff --git a/api/src/main/resources/metadata/mfl_2014-05-12.csv b/api/src/main/resources/metadata/mfl_2014-05-12.csv
diff --git a/api/src/main/resources/moduleApplicationContext.xml b/api/src/main/resources/moduleApplicationContext.xml
diff --git a/api/src/main/resources/regimens.xml b/api/src/main/resources/regimens.xml
diff --git a/api/src/test/java/org/openmrs/module/kenyaemr/ConfigurationTest.java b/api/src/test/java/org/openmrs/module/kenyaemr/ConfigurationTest.java
diff --git a/api/src/test/java/org/openmrs/module/kenyaemr/DictionaryTest.java b/api/src/test/java/org/openmrs/module/kenyaemr/DictionaryTest.java
diff --git a/api/src/test/java/org/openmrs/module/kenyaemr/EmrActivatorTest.java b/api/src/test/java/org/openmrs/module/kenyaemr/EmrActivatorTest.java
diff --git a/api/src/test/java/org/openmrs/module/kenyaemr/EmrConstantsTest.java b/api/src/test/java/org/openmrs/module/kenyaemr/EmrConstantsTest.java
diff --git a/api/src/test/java/org/openmrs/module/kenyaemr/HivConstantsTest.java b/api/src/test/java/org/openmrs/module/kenyaemr/HivConstantsTest.java
diff --git a/api/src/test/java/org/openmrs/module/kenyaemr/MetadataTest.java b/api/src/test/java/org/openmrs/module/kenyaemr/MetadataTest.java
diff --git a/api/src/test/java/org/openmrs/module/kenyaemr/TbConstantsTest.java b/api/src/test/java/org/openmrs/module/kenyaemr/TbConstantsTest.java
diff --git a/api/src/test/java/org/openmrs/module/kenyaemr/api/impl/KenyaEmrServiceImplTest.java b/api/src/test/java/org/openmrs/module/kenyaemr/api/impl/KenyaEmrServiceImplTest.java
diff --git a/api/src/test/java/org/openmrs/module/kenyaemr/calculation/DeadPatientsCalculationTest.java b/api/src/test/java/org/openmrs/module/kenyaemr/calculation/DeadPatientsCalculationTest.java
diff --git a/api/src/test/java/org/openmrs/module/kenyaemr/calculation/EmrCalculationUtilsTest.java b/api/src/test/java/org/openmrs/module/kenyaemr/calculation/EmrCalculationUtilsTest.java
diff --git a/...c/test/java/org/openmrs/module/kenyaemr/calculation/library/InProgramCalculationTest.java b/...c/test/java/org/openmrs/module/kenyaemr/calculation/library/InProgramCalculationTest.java
diff --git a/.../test/java/org/openmrs/module/kenyaemr/calculation/library/IsPregnantCalculationTest.java b/.../test/java/org/openmrs/module/kenyaemr/calculation/library/IsPregnantCalculationTest.java
diff --git a/...org/openmrs/module/kenyaemr/calculation/library/MissedLastAppointmentCalculationTest.java b/...org/openmrs/module/kenyaemr/calculation/library/MissedLastAppointmentCalculationTest.java
diff --git a/...java/org/openmrs/module/kenyaemr/calculation/library/RecordedDeceasedCalculationTest.java b/...java/org/openmrs/module/kenyaemr/calculation/library/RecordedDeceasedCalculationTest.java
diff --git a/...a/org/openmrs/module/kenyaemr/calculation/library/ScheduledVisitOnDayCalculationTest.java b/...a/org/openmrs/module/kenyaemr/calculation/library/ScheduledVisitOnDayCalculationTest.java
diff --git a/...test/java/org/openmrs/module/kenyaemr/calculation/library/VisitsOnDayCalculationTest.java b/...test/java/org/openmrs/module/kenyaemr/calculation/library/VisitsOnDayCalculationTest.java
diff --git a/...java/org/openmrs/module/kenyaemr/calculation/library/hiv/DecliningCd4CalculationTest.java b/...java/org/openmrs/module/kenyaemr/calculation/library/hiv/DecliningCd4CalculationTest.java
diff --git a/...openmrs/module/kenyaemr/calculation/library/hiv/EligibleForHivProgramCalculationTest.java b/...openmrs/module/kenyaemr/calculation/library/hiv/EligibleForHivProgramCalculationTest.java
diff --git a/...java/org/openmrs/module/kenyaemr/calculation/library/hiv/LastCd4CountCalculationTest.java b/...java/org/openmrs/module/kenyaemr/calculation/library/hiv/LastCd4CountCalculationTest.java
diff --git a/...org/openmrs/module/kenyaemr/calculation/library/hiv/LastCd4PercentageCalculationTest.java b/...org/openmrs/module/kenyaemr/calculation/library/hiv/LastCd4PercentageCalculationTest.java
diff --git a/...java/org/openmrs/module/kenyaemr/calculation/library/hiv/LastWhoStageCalculationTest.java b/...java/org/openmrs/module/kenyaemr/calculation/library/hiv/LastWhoStageCalculationTest.java
diff --git a/...va/org/openmrs/module/kenyaemr/calculation/library/hiv/LostToFollowUpCalculationTest.java b/...va/org/openmrs/module/kenyaemr/calculation/library/hiv/LostToFollowUpCalculationTest.java
diff --git a/...java/org/openmrs/module/kenyaemr/calculation/library/hiv/NeedsCd4TestCalculationTest.java b/...java/org/openmrs/module/kenyaemr/calculation/library/hiv/NeedsCd4TestCalculationTest.java
diff --git a/...rg/openmrs/module/kenyaemr/calculation/library/hiv/NeverScreenedForTbCalculationTest.java b/...rg/openmrs/module/kenyaemr/calculation/library/hiv/NeverScreenedForTbCalculationTest.java
diff --git a/...penmrs/module/kenyaemr/calculation/library/hiv/NeverTakenCtxOrDapsoneCalculationTest.java b/...penmrs/module/kenyaemr/calculation/library/hiv/NeverTakenCtxOrDapsoneCalculationTest.java
diff --git a/...g/openmrs/module/kenyaemr/calculation/library/hiv/OnCtxWithinDurationCalculationTest.java b/...g/openmrs/module/kenyaemr/calculation/library/hiv/OnCtxWithinDurationCalculationTest.java
diff --git a/...le/kenyaemr/calculation/library/hiv/PatientsWhoMeetCriteriaForNutritionalSupportTest.java b/...le/kenyaemr/calculation/library/hiv/PatientsWhoMeetCriteriaForNutritionalSupportTest.java
diff --git a/...openmrs/module/kenyaemr/calculation/library/hiv/art/CurrentArtRegimenCalculationTest.java b/...openmrs/module/kenyaemr/calculation/library/hiv/art/CurrentArtRegimenCalculationTest.java
diff --git a/...rg/openmrs/module/kenyaemr/calculation/library/hiv/art/EligibleForArtCalculationTest.java b/...rg/openmrs/module/kenyaemr/calculation/library/hiv/art/EligibleForArtCalculationTest.java
diff --git a/...mrs/module/kenyaemr/calculation/library/hiv/art/EligibleForArtTriggerCalculationTest.java b/...mrs/module/kenyaemr/calculation/library/hiv/art/EligibleForArtTriggerCalculationTest.java
diff --git a/...enmrs/module/kenyaemr/calculation/library/hiv/art/InitialArtStartDateCalculationTest.java b/...enmrs/module/kenyaemr/calculation/library/hiv/art/InitialArtStartDateCalculationTest.java
diff --git a/.../org/openmrs/module/kenyaemr/calculation/library/hiv/art/IsTransferInCalculationTest.java b/.../org/openmrs/module/kenyaemr/calculation/library/hiv/art/IsTransferInCalculationTest.java
diff --git a/...org/openmrs/module/kenyaemr/calculation/library/hiv/art/IsTransferOutCalculationTest.java b/...org/openmrs/module/kenyaemr/calculation/library/hiv/art/IsTransferOutCalculationTest.java
diff --git a/...s/module/kenyaemr/calculation/library/hiv/art/OnAlternateFirstLineArtCalculationTest.java b/...s/module/kenyaemr/calculation/library/hiv/art/OnAlternateFirstLineArtCalculationTest.java
diff --git a/...st/java/org/openmrs/module/kenyaemr/calculation/library/hiv/art/OnArtCalculationTest.java b/...st/java/org/openmrs/module/kenyaemr/calculation/library/hiv/art/OnArtCalculationTest.java
diff --git a/...rs/module/kenyaemr/calculation/library/hiv/art/OnOriginalFirstLineArtCalculationTest.java b/...rs/module/kenyaemr/calculation/library/hiv/art/OnOriginalFirstLineArtCalculationTest.java
diff --git a/...g/openmrs/module/kenyaemr/calculation/library/hiv/art/OnSecondLineArtCalculationTest.java b/...g/openmrs/module/kenyaemr/calculation/library/hiv/art/OnSecondLineArtCalculationTest.java
diff --git a/...penmrs/module/kenyaemr/calculation/library/hiv/art/PregnantAtArtStartCalculationTest.java b/...penmrs/module/kenyaemr/calculation/library/hiv/art/PregnantAtArtStartCalculationTest.java
diff --git a/...enmrs/module/kenyaemr/calculation/library/hiv/art/TbPatientAtArtStartCalculationTest.java b/...enmrs/module/kenyaemr/calculation/library/hiv/art/TbPatientAtArtStartCalculationTest.java
diff --git a/...rg/openmrs/module/kenyaemr/calculation/library/hiv/art/TransferInDateCalculationTest.java b/...rg/openmrs/module/kenyaemr/calculation/library/hiv/art/TransferInDateCalculationTest.java
diff --git a/...penmrs/module/kenyaemr/calculation/library/hiv/art/WhoStageAtArtStartCalculationTest.java b/...penmrs/module/kenyaemr/calculation/library/hiv/art/WhoStageAtArtStartCalculationTest.java
diff --git a/...dule/kenyaemr/calculation/library/mchcs/HEICohortsXMonthsDuringReviewCalculationTest.java b/...dule/kenyaemr/calculation/library/mchcs/HEICohortsXMonthsDuringReviewCalculationTest.java
diff --git a/...penmrs/module/kenyaemr/calculation/library/mchcs/InfantFeedingOptionsCalculationTest.java b/...penmrs/module/kenyaemr/calculation/library/mchcs/InfantFeedingOptionsCalculationTest.java
diff --git a/...dule/kenyaemr/calculation/library/mchcs/InfantMotherGuardianRelationsCalculationTest.java b/...dule/kenyaemr/calculation/library/mchcs/InfantMotherGuardianRelationsCalculationTest.java
diff --git a/...e/kenyaemr/calculation/library/mchcs/InfantMotherOrGuardianPairVisitsCalculationTest.java b/...e/kenyaemr/calculation/library/mchcs/InfantMotherOrGuardianPairVisitsCalculationTest.java
diff --git a/...openmrs/module/kenyaemr/calculation/library/mchcs/InfantNeverTakenCTXCalculationTest.java b/...openmrs/module/kenyaemr/calculation/library/mchcs/InfantNeverTakenCTXCalculationTest.java
diff --git a/...module/kenyaemr/calculation/library/mchcs/InfantNeverTakenProphylaxisCalculationTest.java b/...module/kenyaemr/calculation/library/mchcs/InfantNeverTakenProphylaxisCalculationTest.java
diff --git a/...a/org/openmrs/module/kenyaemr/calculation/library/mchcs/InfantsDNAPCRCalculationTest.java b/...a/org/openmrs/module/kenyaemr/calculation/library/mchcs/InfantsDNAPCRCalculationTest.java
diff --git a/...penmrs/module/kenyaemr/calculation/library/mchcs/MotherGuardianVisitsCalculationTest.java b/...penmrs/module/kenyaemr/calculation/library/mchcs/MotherGuardianVisitsCalculationTest.java
diff --git a/...g/openmrs/module/kenyaemr/calculation/library/mchcs/NeedsAntibodyTestCalculationTest.java b/...g/openmrs/module/kenyaemr/calculation/library/mchcs/NeedsAntibodyTestCalculationTest.java
diff --git a/...va/org/openmrs/module/kenyaemr/calculation/library/mchcs/NeedsPcrTestCalculationTest.java b/...va/org/openmrs/module/kenyaemr/calculation/library/mchcs/NeedsPcrTestCalculationTest.java
diff --git a/...module/kenyaemr/calculation/library/mchcs/NotTakenPcrConfirmatoryTestCalculationTest.java b/...module/kenyaemr/calculation/library/mchcs/NotTakenPcrConfirmatoryTestCalculationTest.java
diff --git a/...openmrs/module/kenyaemr/calculation/library/mchcs/VisitsWithinAPeriodCalculationTest.java b/...openmrs/module/kenyaemr/calculation/library/mchcs/VisitsWithinAPeriodCalculationTest.java
diff --git a/...odule/kenyaemr/calculation/library/mchms/AllDeliveriesOnOrAfterMonthsCalculationTest.java b/...odule/kenyaemr/calculation/library/mchms/AllDeliveriesOnOrAfterMonthsCalculationTest.java
diff --git a/...penmrs/module/kenyaemr/calculation/library/mchms/AssessedOnFirstVisitCalculationTest.java b/...penmrs/module/kenyaemr/calculation/library/mchms/AssessedOnFirstVisitCalculationTest.java
diff --git a/...dule/kenyaemr/calculation/library/mchms/DeliveriesWithFullPartographsCalculationTest.java b/...dule/kenyaemr/calculation/library/mchms/DeliveriesWithFullPartographsCalculationTest.java
diff --git a/...rg/openmrs/module/kenyaemr/calculation/library/mchms/DiscordantCoupleCalculationTest.java b/...rg/openmrs/module/kenyaemr/calculation/library/mchms/DiscordantCoupleCalculationTest.java
diff --git a/...module/kenyaemr/calculation/library/mchms/EddEstimateFromMchmsProgramCalculationTest.java b/...module/kenyaemr/calculation/library/mchms/EddEstimateFromMchmsProgramCalculationTest.java
diff --git a/...mrs/module/kenyaemr/calculation/library/mchms/EligibleForMchmsProgramCalculationTest.java b/...mrs/module/kenyaemr/calculation/library/mchms/EligibleForMchmsProgramCalculationTest.java
diff --git a/...enmrs/module/kenyaemr/calculation/library/mchms/HivTestedAtEnrollmentCalculationTest.java b/...enmrs/module/kenyaemr/calculation/library/mchms/HivTestedAtEnrollmentCalculationTest.java
diff --git a/.../org/openmrs/module/kenyaemr/calculation/library/mchms/LateEnrollmentCalculationTest.java b/.../org/openmrs/module/kenyaemr/calculation/library/mchms/LateEnrollmentCalculationTest.java
diff --git a/...openmrs/module/kenyaemr/calculation/library/mchms/MchmsFirstVisitDateCalculationTest.java b/...openmrs/module/kenyaemr/calculation/library/mchms/MchmsFirstVisitDateCalculationTest.java
diff --git a/...rg/openmrs/module/kenyaemr/calculation/library/mchms/MchmsHivTestDateCalculationTest.java b/...rg/openmrs/module/kenyaemr/calculation/library/mchms/MchmsHivTestDateCalculationTest.java
diff --git a/...s/module/kenyaemr/calculation/library/mchms/MotherNewBornPairReviewedCalculationTest.java b/...s/module/kenyaemr/calculation/library/mchms/MotherNewBornPairReviewedCalculationTest.java
diff --git a/...va/org/openmrs/module/kenyaemr/calculation/library/mchms/NotHivTestedCalculationTest.java b/...va/org/openmrs/module/kenyaemr/calculation/library/mchms/NotHivTestedCalculationTest.java
diff --git a/...t/java/org/openmrs/module/kenyaemr/calculation/library/mchms/NotOnArtCalculationTest.java b/...t/java/org/openmrs/module/kenyaemr/calculation/library/mchms/NotOnArtCalculationTest.java
diff --git a/...st/java/org/openmrs/module/kenyaemr/calculation/library/mchms/OnHaartCalculationTest.java b/...st/java/org/openmrs/module/kenyaemr/calculation/library/mchms/OnHaartCalculationTest.java
diff --git a/...mrs/module/kenyaemr/calculation/library/mchms/PartnerHivStatusUnknownCalculationTest.java b/...mrs/module/kenyaemr/calculation/library/mchms/PartnerHivStatusUnknownCalculationTest.java
diff --git a/...enmrs/module/kenyaemr/calculation/library/mchms/PregnantWithANCVisitsCalculationTest.java b/...enmrs/module/kenyaemr/calculation/library/mchms/PregnantWithANCVisitsCalculationTest.java
diff --git a/...openmrs/module/kenyaemr/calculation/library/mchms/TestedForHivInMchmsCalculationTest.java b/...openmrs/module/kenyaemr/calculation/library/mchms/TestedForHivInMchmsCalculationTest.java
diff --git a/...g/openmrs/module/kenyaemr/calculation/library/tb/EligibleForTbProgramCalculationTest.java b/...g/openmrs/module/kenyaemr/calculation/library/tb/EligibleForTbProgramCalculationTest.java
diff --git a/...t/java/org/openmrs/module/kenyaemr/calculation/library/tb/InTbProgramCalculationTest.java b/...t/java/org/openmrs/module/kenyaemr/calculation/library/tb/InTbProgramCalculationTest.java
diff --git a/.../org/openmrs/module/kenyaemr/calculation/library/tb/NeedsTbSputumTestCalculationTest.java b/.../org/openmrs/module/kenyaemr/calculation/library/tb/NeedsTbSputumTestCalculationTest.java
diff --git a/api/src/test/java/org/openmrs/module/kenyaemr/chore/ConvertNationalIdAttributesTest.java b/api/src/test/java/org/openmrs/module/kenyaemr/chore/ConvertNationalIdAttributesTest.java
diff --git a/api/src/test/java/org/openmrs/module/kenyaemr/chore/FixMissingOpenmrsIdentifiersTest.java b/api/src/test/java/org/openmrs/module/kenyaemr/chore/FixMissingOpenmrsIdentifiersTest.java