Pedro Those 2 should be OK and integrated in official, already checked them on first run of replay in February.
http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8696: [FIX] report_webkit - change description for new webkit lib path parameter ([email protected]) http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8897: [MRG] Fix a missing context propagation in product/pricelist.py (closes: lp:1155624) ([email protected]) Cheers, Yannick On Thu, Jul 3, 2014 at 10:26 AM, Pedro Manuel Baeza Romero < [email protected]> wrote: > OK, I'll made then PRs. > > Regards. > > > 2014-07-03 10:19 GMT+02:00 Stefan <[email protected]>: > > On 03-07-14 10:02, Pedro Manuel Baeza Romero wrote: >> >> Hi, Stefan, >> >> I have changed Wiki to assign me 12 of the 49 conflicts (for now) for >> resolving manually bit by bit. Do you have any guide you want me to follow? >> What I have tought is: >> >> - Inspect the changes of the revision and see if the patch is already >> inside (because Odoo has made it, but with minor differences). >> - If yes, nothing more to do. Mark as already patched by Odoo. >> - If no, apply changes manually. >> - Commit in local branch with original author. >> - Push directly to GitHub. >> >> >> Hi Pedro, >> >> exactly right. For the sake of clarity: push to your own clone, then >> create pull request. The proposed changes still need to be inspected as in >> the regular review process, but I think we can fasttrack these and merge >> upon the second approval. >> >> Thanks! >> Stefan >> >> > > _______________________________________________ > Mailing list: https://launchpad.net/~openerp-community > Post to : [email protected] > Unsubscribe : https://launchpad.net/~openerp-community > More help : https://help.launchpad.net/ListHelp > > -- Yannick Vaucher Business Solutions Software Developer Camptocamp SA PSE A, CH-1015 Lausanne Phone: +41 21 619 10 30 Office: +41 21 619 10 10 http://www.camptocamp.com/
_______________________________________________ Mailing list: https://launchpad.net/~openerp-community Post to : [email protected] Unsubscribe : https://launchpad.net/~openerp-community More help : https://help.launchpad.net/ListHelp
