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

[IMP + FIX] medical_prescription_merge: Set installable and fix mail.thread field merging #215

Merged

Conversation

lasley
Copy link
Member

@lasley lasley commented Jun 6, 2017

It seems this was previously migrated, but installable flag wasn't set.

@lasley lasley added this to the 10.0 milestone Jun 6, 2017
@lasley lasley requested a review from obulkin June 6, 2017 18:21
@obulkin obulkin force-pushed the hotfix/10.0/medical_prescription_merge-installable branch from c0b1e28 to 16bc152 Compare July 18, 2017 02:01
* Add merge logic for the mail.thread fields message_follower_ids and
message_ids, which require special handling due to an integer inverse field
and SQL uniqueness constraints. These fields can be introduced to the
prescription model by mail_thread_medical_prescription
* Add unit tests for the new logic
@obulkin obulkin changed the title [IMP] medical_prescription_merge: Set installable [IMP + FIX] medical_prescription_merge: Set installable and fix mail.thread field merging Jul 21, 2017
@obulkin
Copy link

obulkin commented Jul 21, 2017

I've expanded this PR to include a fix for various merge issues that can arise when the module is used in conjunction with mail_thread_medical_prescription, which adds mail.thread to the medical.prescription.order inheritance chain.

Copy link

@obulkin obulkin left a comment

Choose a reason for hiding this comment

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

Since this PR is now almost entirely my code, I'll pass on doing a review. 😆

@codecov-io
Copy link

codecov-io commented Jul 26, 2017

Codecov Report

Merging #215 into release/10.0 will increase coverage by 0.53%.
The diff coverage is 100%.

@@               Coverage Diff                @@
##           release/10.0     #215      +/-   ##
================================================
+ Coverage         83.99%   84.53%   +0.53%     
================================================
  Files               118      119       +1     
  Lines              2112     2192      +80     
================================================
+ Hits               1774     1853      +79     
- Misses              338      339       +1
Impacted Files Coverage Δ
..._merge/wizards/medical_prescription_order_merge.py 98.75% <100%> (ø)

@lasley
Copy link
Member Author

lasley commented Jul 27, 2017

LGTM thanks @obulkin

@lasley lasley merged commit 325953b into release/10.0 Jul 27, 2017
@lasley lasley deleted the hotfix/10.0/medical_prescription_merge-installable branch July 27, 2017 01:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants