Skip to content

[MIG] hr_expense: migration scripts - #1130

Merged
pedrobaeza merged 2 commits into
OCA:10.0from
Tecnativa:10.0-mig-hr_expense
Oct 30, 2017
Merged

[MIG] hr_expense: migration scripts#1130
pedrobaeza merged 2 commits into
OCA:10.0from
Tecnativa:10.0-mig-hr_expense

Conversation

@cubells

@cubells cubells commented Oct 16, 2017

Copy link
Copy Markdown
Member

@MiquelRForgeFlow

Copy link
Copy Markdown
Contributor

Why don't you include the cherry-pick of #1001?

@StefanRijnhart

Copy link
Copy Markdown
Member

Thanks @cubells. Agree with @mreficent that it is not acceptible to commit someone else's code as your own. To force a resolution, I merged #1001 so that you can rebase on that. Please note, I do highly appreciate your continuation of the work on the migration of this module!

@StefanRijnhart StefanRijnhart added this to the 10.0 milestone Oct 19, 2017
@cubells

cubells commented Oct 19, 2017

Copy link
Copy Markdown
Member Author

Thanks @StefanRijnhart @mreficent

I was going to do cherry-pick but I'm too busy now.

I'll do the changes later.

@cubells
cubells force-pushed the 10.0-mig-hr_expense branch 3 times, most recently from df39847 to 376c01c Compare October 23, 2017 06:55
@MiquelRForgeFlow

Copy link
Copy Markdown
Contributor

Why Travis is red?

@pedrobaeza pedrobaeza left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Fixed and green CI, so I merge.

@pedrobaeza
pedrobaeza merged commit eac5884 into OCA:10.0 Oct 30, 2017
@pedrobaeza
pedrobaeza deleted the 10.0-mig-hr_expense branch October 30, 2017 18:53
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.

4 participants