TRUNK-4156 - revised #483
Closed
TRUNK-4156 - revised #483
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BaseWebContextSensitivetest - TRUNK-3593
…n names (cherry picked from commit 81d0750) Conflicts: api/src/test/java/org/openmrs/validator/PersonNameValidatorTest.java
(cherry picked from commit 91116b9)
…ry exception when writing warnings to file (cherry picked from commit 8b9b742)
…n invokin Encounter.addObs (cherry picked from commit 41f320b)
…9(cherry picked from commit 1b9b756)
encounter rows - TRUNK-2969
(cherry picked from commit a1230a7)
drug - TRUNK-3008 Conflicts: api/src/main/java/org/openmrs/validator/DrugOrderValidator.java
consistency problems - TRUNK-3769
…es outside of their module's namespace
…tifierType> patientIdentifierTypes, List<Location> locations, List<Patient> patients, Boolean isPreferred) does not restrict by location backport to 1.9.x
made some changes
…riendly error message - TRUNK-2975 added some changes Cleaned up code in AlertValidator
This reverts commit 62d6759.
This reverts commit 6360b0e.
Conflicts: api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml
…er hibernate mapping
…nstructions property
TRUNK-4157 | Adding dosing_instructions property to drug order.
to new orders - TRUNK-4163
TRUNK-4142 | Adding commentToFulfiller column in orders table.
…ne during the order entry rework
…r.commentsToFullfiller - TRUNK-4242
TRUNK-4159 added fixes for comments as a result reviewing my previous commit Removed default value of null from order_frequency.retired_by column - TRUNK-4159 Added javadocs for OrderFrequency class - TRUNK-4159
Primary change is to add a new class called CareSetting as an attribute to Order.
All test datasets have been modified to include this new attribute.
Fixed EncounterServiceTest to add new care setting
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please ignore my previous pull request #480 and use this instead.
Changes from previous pull request