Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/7.0-opw-601655-fka into lp:openobject-addons/7.0

  1. 7.0-opw-601655-fka
  2. Merge into 7.0
Proposed by Foram Katharotiya (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-opw-601655-fka
Merge into: lp:openobject-addons/7.0
Diff against target: 25 lines (+3/-2)
1 file modified
stock/stock_view.xml (+3/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-opw-601655-fka
Reviewer Review Type Date Requested Status
Vinay Rana (OpenERP) Pending
Naresh(OpenERP) Pending
Review via email: mp+199657@code.launchpad.net

Description of the change

Hello,

I have fixed the issue of 'cancel availability' button which is missing from stock move form view in version 7.0.

Regards,
FKA

To post a comment you must log in.
lp:~openerp-dev/openobject-addons/7.0-opw-601655-fka updated
9682. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

9683. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

9684. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

9685. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

9686. By Foram Katharotiya (OpenERP)

[IMP] improve priority of stock.move form view

Unmerged revisions

9686. By Foram Katharotiya (OpenERP)

[IMP] improve priority of stock.move form view

9685. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

9684. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

9683. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

9682. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

9681. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

9680. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

9679. By Foram Katharotiya (OpenERP)

[IMP] add cancel button in stock move for cancelling stock moves from stock picking

9678. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

9677. By Foram Katharotiya (OpenERP)

[IMP] visible 'cancel availability' button in stock.picking form view

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stock/stock_view.xml'
2--- stock/stock_view.xml 2013-12-10 16:05:05 +0000
3+++ stock/stock_view.xml 2014-01-16 11:11:19 +0000
4@@ -1204,7 +1204,7 @@
5 <record id="view_move_form" model="ir.ui.view">
6 <field name="name">stock.move.form</field>
7 <field name="model">stock.move</field>
8- <field eval="1" name="priority"/>
9+ <field eval="2" name="priority"/>
10 <field name="arch" type="xml">
11 <form string="Stock Moves" version="7.0">
12 <header>
13@@ -1284,10 +1284,11 @@
14 <record id="view_move_picking_form" model="ir.ui.view">
15 <field name="name">stock.move.form</field>
16 <field name="model">stock.move</field>
17- <field eval="2" name="priority"/>
18+ <field eval="1" name="priority"/>
19 <field name="arch" type="xml">
20 <form string="Stock Moves" version="7.0">
21 <header>
22+ <button name="action_cancel" states="assigned" string="Cancel" type="object" groups="base.group_user"/>
23 <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_user"/>
24 <button name="action_confirm" states="draft" string="Confirm" type="object" groups="base.group_user"/>
25 <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" groups="base.group_user"/>