Merge lp:~vauxoo/addons-vauxoo/addons-vauxoo-stock_move_cancel-dev-julio into lp:addons-vauxoo

Proposed by Julio Serna-http://www.vauxoo.com
Status: Merged
Merged at revision: 388
Proposed branch: lp:~vauxoo/addons-vauxoo/addons-vauxoo-stock_move_cancel-dev-julio
Merge into: lp:addons-vauxoo
Diff against target: 128 lines (+107/-0)
4 files modified
stock_move_cancel/__init__.py (+27/-0)
stock_move_cancel/__openerp__.py (+41/-0)
stock_move_cancel/security/move_cancel_security.xml (+8/-0)
stock_move_cancel/stock_view.xml (+31/-0)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/addons-vauxoo-stock_move_cancel-dev-julio
Reviewer Review Type Date Requested Status
Moisés López - http://www.vauxoo.com Pending
Review via email: mp+118618@code.launchpad.net

Description of the change

agrega boton de cancelar en el estado done del move

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory 'stock_move_cancel'
=== added file 'stock_move_cancel/__init__.py'
--- stock_move_cancel/__init__.py 1970-01-01 00:00:00 +0000
+++ stock_move_cancel/__init__.py 2012-08-07 18:57:18 +0000
@@ -0,0 +1,27 @@
1# -*- coding: utf-8 -*-
2###########################################################################
3# Module Writen to OpenERP, Open Source Management Solution
4#
5# Copyright (c) 2012 Vauxoo - http://www.vauxoo.com
6# All Rights Reserved.
7# info@vauxoo.com
8############################################################################
9# Coded by: julio (julio@vauxoo.com)
10############################################################################
11#
12# This program is free software: you can redistribute it and/or modify
13# it under the terms of the GNU Affero General Public License as
14# published by the Free Software Foundation, either version 3 of the
15# License, or (at your option) any later version.
16#
17# This program is distributed in the hope that it will be useful,
18# but WITHOUT ANY WARRANTY; without even the implied warranty of
19# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20# GNU Affero General Public License for more details.
21#
22# You should have received a copy of the GNU Affero General Public License
23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#
25##############################################################################
26
27
028
=== added file 'stock_move_cancel/__openerp__.py'
--- stock_move_cancel/__openerp__.py 1970-01-01 00:00:00 +0000
+++ stock_move_cancel/__openerp__.py 2012-08-07 18:57:18 +0000
@@ -0,0 +1,41 @@
1# -*- coding: utf-8 -*-
2###########################################################################
3# Module Writen to OpenERP, Open Source Management Solution
4#
5# Copyright (c) 2012 Vauxoo - http://www.vauxoo.com
6# All Rights Reserved.
7# info@vauxoo.com
8############################################################################
9# Coded by: julio (julio@vauxoo.com)
10############################################################################
11#
12# This program is free software: you can redistribute it and/or modify
13# it under the terms of the GNU Affero General Public License as
14# published by the Free Software Foundation, either version 3 of the
15# License, or (at your option) any later version.
16#
17# This program is distributed in the hope that it will be useful,
18# but WITHOUT ANY WARRANTY; without even the implied warranty of
19# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20# GNU Affero General Public License for more details.
21#
22# You should have received a copy of the GNU Affero General Public License
23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#
25##############################################################################
26{
27 'name': 'Stock Move Cancel',
28 "version" : "1.1",
29 'author': 'Vauxoo',
30 'depends': ['stock'],
31 'description': """
32 Allow cancel move in state done
33 """,
34 'update_xml':[
35 'security/move_cancel_security.xml',
36 'stock_view.xml',
37 ],
38 'active': False,
39 'installable': True
40}
41# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
042
=== added directory 'stock_move_cancel/security'
=== added file 'stock_move_cancel/security/move_cancel_security.xml'
--- stock_move_cancel/security/move_cancel_security.xml 1970-01-01 00:00:00 +0000
+++ stock_move_cancel/security/move_cancel_security.xml 2012-08-07 18:57:18 +0000
@@ -0,0 +1,8 @@
1<?xml version="1.0" encoding="utf-8"?>
2<openerp><data>
3
4 <record id="base.group_moves_cancel" model="res.groups">
5 <field name="name">Moves / Button Cancel</field>
6 </record>
7
8</data></openerp>
09
=== added file 'stock_move_cancel/stock_view.xml'
--- stock_move_cancel/stock_view.xml 1970-01-01 00:00:00 +0000
+++ stock_move_cancel/stock_view.xml 2012-08-07 18:57:18 +0000
@@ -0,0 +1,31 @@
1<?xml version="1.0" encoding="utf-8"?>
2<openerp>
3 <data>
4
5 <record model="ir.ui.view" id="view_stock_move_inherit2">
6 <field name="name">view.stock.move.inherit2</field>
7 <field name="model">stock.move</field>
8 <field name="inherit_id" ref="stock.view_move_form" />
9 <field name="type">form</field>
10 <field name="arch" type="xml">
11 <xpath expr="/form/group/button[@name='action_cancel']" position="replace">
12 <button name="action_cancel" states="assigned,confirmed,done" string="_Cancel" type="object" icon="gtk-cancel" groups="base.group_moves_cancel"/>
13 </xpath>
14 </field>
15 </record>
16
17 <record model="ir.ui.view" id="view_stock_move_inherit3">
18 <field name="name">view.stock.move.inherit3</field>
19 <field name="model">stock.move</field>
20 <field name="inherit_id" ref="stock.view_move_form_reception_picking" />
21 <field name="type">form</field>
22 <field name="arch" type="xml">
23 <xpath expr="/form/group/button[@name='action_cancel']" position="replace">
24 <button name="action_cancel" states="assigned,confirmed,done" string="_Cancel" type="object" icon="gtk-cancel" groups="base.group_moves_cancel"/>
25 </xpath>
26 </field>
27 </record>
28
29
30 </data>
31</openerp>