Merge lp:~openerp-dev/openobject-addons/saas-3-opw-606213-acl into lp:~openerp/openobject-addons/saas-3

Proposed by Martin Trigaux (OpenERP)
Status: Rejected
Rejected by: Martin Trigaux (OpenERP)
Proposed branch: lp:~openerp-dev/openobject-addons/saas-3-opw-606213-acl
Merge into: lp:~openerp/openobject-addons/saas-3
Diff against target: 48 lines (+6/-4)
1 file modified
stock/stock_view.xml (+6/-4)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/saas-3-opw-606213-acl
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+217427@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Trigaux (OpenERP) (mat-openerp) wrote :

Rejected as todo in 7.0

Unmerged revisions

9406. By Anaƫl Closson (openerp)

[FIX] Only internal location can be chosen as dest location for stock.picking.* - opw 606213

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml 2014-04-25 12:59:26 +0000
+++ stock/stock_view.xml 2014-04-28 12:38:16 +0000
@@ -792,7 +792,7 @@
792 </group>792 </group>
793 <notebook>793 <notebook>
794 <page string="Products">794 <page string="Products">
795 <field name="move_lines" context="{'address_in_id': partner_id, 'form_view_ref':'stock.view_move_picking_form', 'tree_view_ref':'stock.view_move_picking_tree', 'picking_type': 'internal'}" options='{"reload_on_button": true}'/>795 <field name="move_lines" string="Stock Move" context="{'address_in_id': partner_id, 'form_view_ref':'stock.view_move_picking_form', 'tree_view_ref':'stock.view_move_picking_tree', 'picking_type': 'internal'}" options='{"reload_on_button": true}'/>
796 <field name="note" placeholder="Add an internal note..." class="oe_inline"/>796 <field name="note" placeholder="Add an internal note..." class="oe_inline"/>
797 </page>797 </page>
798 <page string="Additional Info">798 <page string="Additional Info">
@@ -926,7 +926,7 @@
926 <field name="partner_id" on_change="onchange_partner_in(partner_id)" string="Customer" domain="[('customer','=',True)]" />926 <field name="partner_id" on_change="onchange_partner_in(partner_id)" string="Customer" domain="[('customer','=',True)]" />
927 </xpath>927 </xpath>
928 <xpath expr="//field[@name='move_lines']" position="replace">928 <xpath expr="//field[@name='move_lines']" position="replace">
929 <field name="move_lines" context="{'address_out_id': partner_id, 'picking_type': 'out', 'form_view_ref':'stock.view_move_picking_form', 'tree_view_ref':'stock.view_move_picking_tree'}" options='{"reload_on_button": true}'/>929 <field name="move_lines" string="Stock Move" context="{'address_out_id': partner_id, 'picking_type': 'out', 'form_view_ref':'stock.view_move_picking_form', 'tree_view_ref':'stock.view_move_picking_tree'}" options='{"reload_on_button": true}'/>
930 </xpath>930 </xpath>
931 <xpath expr="/form/sheet" position="after">931 <xpath expr="/form/sheet" position="after">
932 <div class="oe_chatter">932 <div class="oe_chatter">
@@ -1053,7 +1053,7 @@
1053 <field name="partner_id" on_change="onchange_partner_in(partner_id)" string="Supplier" domain="[('supplier','=',True)]" context="{'default_supplier':1,'default_customer':0}"/>1053 <field name="partner_id" on_change="onchange_partner_in(partner_id)" string="Supplier" domain="[('supplier','=',True)]" context="{'default_supplier':1,'default_customer':0}"/>
1054 </xpath>1054 </xpath>
1055 <xpath expr="//field[@name='move_lines']" position="replace">1055 <xpath expr="//field[@name='move_lines']" position="replace">
1056 <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'in', 'form_view_ref':'stock.view_move_picking_form', 'tree_view_ref':'stock.view_move_picking_tree'}" options='{"reload_on_button": true}'/>1056 <field name="move_lines" string="Stock Move" context="{'address_in_id': partner_id, 'picking_type': 'in', 'form_view_ref':'stock.view_move_picking_form', 'tree_view_ref':'stock.view_move_picking_tree'}" options='{"reload_on_button": true}'/>
1057 </xpath>1057 </xpath>
1058 <xpath expr="/form/sheet" position="after">1058 <xpath expr="/form/sheet" position="after">
1059 <div class="oe_chatter">1059 <div class="oe_chatter">
@@ -1340,7 +1340,7 @@
13401340
1341 <group string="Locations" groups="stock.group_locations">1341 <group string="Locations" groups="stock.group_locations">
1342 <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>1342 <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
1343 <field name="location_dest_id" domain="[('usage','=','internal')]" groups="stock.group_locations"/>1343 <field name="location_dest_id" domain="[('usage','in', ['internal', 'supplier', 'customer'])]" groups="stock.group_locations"/>
1344 </group>1344 </group>
13451345
1346 <group groups="stock.group_tracking_lot" string="Traceability">1346 <group groups="stock.group_tracking_lot" string="Traceability">
@@ -1371,6 +1371,8 @@
1371 </field>1371 </field>
1372 </record>1372 </record>
13731373
1374
1375
1374 <record id="view_move_search" model="ir.ui.view">1376 <record id="view_move_search" model="ir.ui.view">
1375 <field name="name">stock.move.search</field>1377 <field name="name">stock.move.search</field>
1376 <field name="model">stock.move</field>1378 <field name="model">stock.move</field>

Subscribers

People subscribed via source and target branches