Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TRUNK-4156 - Add care_setting to orders table. #484

Merged
merged 1 commit into from Dec 19, 2013

Conversation

vinayvenu
Copy link
Member

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

    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
shruthidipali added a commit that referenced this pull request Dec 19, 2013
TRUNK-4156 - Add care_setting to orders table.
@shruthidipali shruthidipali merged commit f70fbfa into openmrs:1.10.x Dec 19, 2013
@@ -0,0 +1,48 @@
/**
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vinayvenu am not sure what you might be doing wrong to have duplicate commits for instance this pull is a duplicate of this commit 2bc1af0
Try to follow the openmrs conventions at https://wiki.openmrs.org/display/docs/Using+Git

@vinayvenu
Copy link
Member Author

@wluyima Did you mean the other pull request that I raised(#483)? The only difference was that it was raised against master, not 1.10.x. I changed the branch, and github made it a new pull request. I had immediately asked @shruthidipali to close it as it was raised by mistake.

@vinayvenu vinayvenu mentioned this pull request Dec 20, 2013
@vinayvenu vinayvenu deleted the TRUNK-4156 branch January 9, 2014 04:02
RandilaP pushed a commit to RandilaP/openmrs-core that referenced this pull request Jul 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants