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

[FIX] do_merge now returns a tuple. #265

Merged
merged 1 commit into from May 31, 2017
Merged

Conversation

NL66278
Copy link
Contributor

@NL66278 NL66278 commented May 10, 2017

do_merge method should have a consistent return value. Now we had a crash in a database where account_invoice_merge_purchase was not installed. This was due to this being a new module, and an existing database. But can also happen in databases were purchase is not needed and installed, so auto_install of account_invoice_merge_purchase will not be done.

@pedrobaeza
Copy link
Member

Do you know why the Travis error?

@NL66278
Copy link
Contributor Author

NL66278 commented May 22, 2017

@pedrobaeza I do not quite see where the Travis error comes from. The error only occurs when some modules are excluded from testing. And then it fails on invoice sorting, which I feel has nothing to do with the changes proposed here.

@gurneyalex
Copy link
Member

the 8.0 build of Travis is read, so unless we fix this all PR on that branch will be red too.

@gurneyalex
Copy link
Member

is this the same thing as #268 ?

@astirpe
Copy link
Member

astirpe commented May 31, 2017

@gurneyalex yes, regarding module account_invoice_merge_purchase the fix the same.
This PR include the fix for module account_invoice_merge also.

Copy link
Member

@astirpe astirpe left a comment

Choose a reason for hiding this comment

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

@NL66278 after the merge of #268, this PR has some conflicts to be fixed

@NL66278
Copy link
Contributor Author

NL66278 commented May 31, 2017

@astirpe #268 Partially had the same changes that I proposed. I only kept the extra stuff in my branch that was missing in #268

@pedrobaeza pedrobaeza merged commit 3b460d6 into OCA:8.0 May 31, 2017
@NL66278 NL66278 deleted the 8.0-fix-merge branch June 1, 2017 07:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants