OpenERP Community Backports (Addons)

Merge lp:~camptocamp/ocb-addons/7.0-fix-github-650 into lp:ocb-addons

  1. 7.0-fix-github-650
  2. Merge into 7.0
Proposed by Yannick Vaucher @ Camptocamp
Status: Merged
Merged at revision: 10213
Proposed branch: lp:~camptocamp/ocb-addons/7.0-fix-github-650
Merge into: lp:ocb-addons
Diff against target: 12 lines (+1/-1)
1 file modified
sale_stock/stock_view.xml (+1/-1)
To merge this branch: bzr merge lp:~camptocamp/ocb-addons/7.0-fix-github-650
Reviewer Review Type Date Requested Status
Pedro Manuel Baeza code review Approve
Leonardo Pistone Approve
Nicolas Bessi - Camptocamp (community) Approve
Review via email: mp+223727@code.launchpad.net

Description of the change

Official MP is there: https://github.com/odoo/odoo/pull/650

To post a comment you must log in.
Revision history for this message
Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) wrote :

LGTM

review: Approve
Revision history for this message
Leonardo Pistone (lepistone) wrote :

+1

review: Approve
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

LGTM

review: Approve (code review)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sale_stock/stock_view.xml'
2--- sale_stock/stock_view.xml 2014-03-10 08:54:20 +0000
3+++ sale_stock/stock_view.xml 2014-06-19 12:46:24 +0000
4@@ -51,7 +51,7 @@
5
6 <record id="stock_picking_out_inherit_sale" model="ir.ui.view">
7 <field name="name">Outgoing picking Inherited</field>
8- <field name="model">stock.picking</field>
9+ <field name="model">stock.picking.out</field>
10 <field name="inherit_id" ref="stock.view_picking_out_form"/>
11 <field name="arch" type="xml">
12 <field name="move_type" position="after">