[Openerp-community-reviewer] [Merge] lp:~camptocamp/ocb-addons/ocb-7.0-595240-opw-skh_fix_1192115-afe into lp:ocb-addons
The proposal to merge lp:~camptocamp/ocb-addons/ocb-7.0-595240-opw-skh_fix_1192115-afe into lp:ocb-addons has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~camptocamp/ocb-addons/ocb-7.0-595240-opw-skh_fix_1192115-afe/+merge/211264 -- https://code.launchpad.net/~camptocamp/ocb-addons/ocb-7.0-595240-opw-skh_fix_1192115-afe/+merge/211264 Your team OpenERP Community Backports Team is subscribed to branch lp:ocb-addons. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
[Openerp-community-reviewer] [Merge] lp:~camptocamp/ocb-addons/ocb-7.0-595240-opw-skh_fix_1192115-afe into lp:ocb-addons
Alexandre Fayolle - camptocamp has proposed merging lp:~camptocamp/ocb-addons/ocb-7.0-595240-opw-skh_fix_1192115-afe into lp:ocb-addons. Requested reviews: OpenERP Community Backports Team (ocb) Related bugs: Bug #1192115 in OpenERP Community Backports (Addons): "[trunk/7.0] carrier information not propagated from sale order to pickings" https://bugs.launchpad.net/ocb-addons/+bug/1192115 For more details, see: https://code.launchpad.net/~camptocamp/ocb-addons/ocb-7.0-595240-opw-skh_fix_1192115-afe/+merge/211264 [FIX] delivery: carrier information not propagated from sale order to pickings. port of https://code.launchpad.net/~openerp-dev/openobject-addons/7.0-595240-opw-skh/+merge/180790 to OCB -- https://code.launchpad.net/~camptocamp/ocb-addons/ocb-7.0-595240-opw-skh_fix_1192115-afe/+merge/211264 Your team OpenERP Community Backports Team is requested to review the proposed merge of lp:~camptocamp/ocb-addons/ocb-7.0-595240-opw-skh_fix_1192115-afe into lp:ocb-addons. === modified file 'delivery/sale.py' --- delivery/sale.py 2012-10-23 16:05:04 + +++ delivery/sale.py 2014-03-17 08:38:11 + @@ -72,8 +72,7 @@ 'tax_id': [(6,0,taxes_ids)], 'type': 'make_to_stock' }) -#remove the value of the carrier_id field on the sale order -return self.write(cr, uid, ids, {'carrier_id': False}, context=context) +return True #return {'type': 'ir.actions.act_window_close'} action reload? sale_order() -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community-reviewer] [Merge] lp:~camptocamp/ocb-addons/ocb-7.0-595240-opw-skh_fix_1192115-afe into lp:ocb-addons
Review: Approve no test, code review LGTM -- https://code.launchpad.net/~camptocamp/ocb-addons/ocb-7.0-595240-opw-skh_fix_1192115-afe/+merge/211264 Your team OpenERP Community Backports Team is subscribed to branch lp:ocb-addons. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community-reviewer] [Merge] lp:~camptocamp/ocb-addons/ocb-7.0-595240-opw-skh_fix_1192115-afe into lp:ocb-addons
Review: Approve LGTM, for reference: commit of Quentin bringing the culprit lines altogether without real reason: https://github.com/akretion/openerp-addons/commit/c98b484699f349fef2f7e258c44a9861fa51b143 -- https://code.launchpad.net/~camptocamp/ocb-addons/ocb-7.0-595240-opw-skh_fix_1192115-afe/+merge/211264 Your team OpenERP Community Backports Team is subscribed to branch lp:ocb-addons. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community-reviewer] [Merge] lp:~camptocamp/ocb-addons/ocb-7.0-595240-opw-skh_fix_1192115-afe into lp:ocb-addons
Review: Approve code review -- https://code.launchpad.net/~camptocamp/ocb-addons/ocb-7.0-595240-opw-skh_fix_1192115-afe/+merge/211264 Your team OpenERP Community Backports Team is subscribed to branch lp:ocb-addons. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp