← Back to team overview

openerp-community-reviewer team mailing list archive

Thread
Date

Re: [Merge] lp:~therp-nl/ocb-server/6.1-lp933496 into lp:ocb-server/6.1

To: "Holger Brunn \(Therp\)" <hbrunn@xxxxxxxx>
From: Pedro Manuel Baeza <pedro.baeza@xxxxxxxxx>
Date: Fri, 18 Apr 2014 13:55:31 -0000
In-reply-to: <20131029080626.8735.52004.launchpad@ackee.canonical.com>
Reply-to: mp+193011@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

I proceed with the merge making the change that Lionel has proposed (change to orm.TransientModel). In the unlikely case that OpenERP merge the patch in the upstream, we will have a conflict, but it's very easy to resolve.

Regards.
-- 
https://code.launchpad.net/~therp-nl/ocb-server/6.1-lp933496/+merge/193011
Your team OpenERP Community Backports Team is subscribed to branch lp:ocb-server/6.1.

References

[Merge] lp:~therp-nl/ocb-server/6.1-lp933496 into lp:ocb-server/6.1
From: Holger Brunn (Therp), 2013-10-29