← Back to branch summary

~vauxoo/addons-vauxoo/7.0-project_issue_conf-dev_luis

« back to all changes in this revision

Viewing changes to stock_picking_cancel/stock_view.xml

 
[MERGE] Merge to add all changes in trunk series

Show diffs side-by-side

added added

removed removed

Lines of Context:
stock_picking_cancel/stock_view.xml
1
 
<?xml version="1.0" encoding="utf-8"?>
 
1
<?xml version='1.0' encoding='UTF-8'?>
2
2
<openerp>
3
3
    <data>
4
4
        <record id="view_picking_inherit_picking_cancel_form" model="ir.ui.view">
36
36
                    <button name="button_cancel" states="assigned,confirmed,draft,done" string="_Cancel" icon="gtk-cancel" groups="base.group_picking_cancel"/>
37
37
                </xpath>
38
38
                <xpath expr="//button[@name='button_cancel']" position="after">
39
 
                    <button name="action_cancel_draft" states="cancel" string="_Draft" type="object"  icon="gtk-go-forward"/>
 
39
                    <button name="action_cancel_draft" states="cancel" string="_Draft" type="object" icon="gtk-go-forward"/>
40
40
                </xpath>
41
41
            </field>
42
42
        </record>
44
44
        <record model="ir.ui.view" id="view_stock_move_inherit2">
45
45
            <field name="name">view.stock.move.inherit2</field>
46
46
            <field name="model">stock.move</field>
47
 
            <field name="inherit_id" ref="stock.view_move_form" />
 
47
            <field name="inherit_id" ref="stock.view_move_form"/>
48
48
            <field name="arch" type="xml">
49
 
                    <xpath expr="/form/header//button[@name='action_cancel']" position="replace">
 
49
                <xpath expr="//button[@name='action_cancel']" position="replace">
50
50
                        <button name="action_cancel" states="assigned,confirmed,done" string="_Cancel" type="object" icon="gtk-cancel" groups="base.group_picking_cancel"/>
51
51
                    </xpath>
52
52
            </field>