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
1=== added directory 'stock_move_cancel'
2=== added file 'stock_move_cancel/__init__.py'
3--- stock_move_cancel/__init__.py 1970-01-01 00:00:00 +0000
4+++ stock_move_cancel/__init__.py 2012-08-07 18:57:18 +0000
5@@ -0,0 +1,27 @@
6+# -*- coding: utf-8 -*-
7+###########################################################################
8+# Module Writen to OpenERP, Open Source Management Solution
9+#
10+# Copyright (c) 2012 Vauxoo - http://www.vauxoo.com
11+# All Rights Reserved.
12+# info@vauxoo.com
13+############################################################################
14+# Coded by: julio (julio@vauxoo.com)
15+############################################################################
16+#
17+# This program is free software: you can redistribute it and/or modify
18+# it under the terms of the GNU Affero General Public License as
19+# published by the Free Software Foundation, either version 3 of the
20+# License, or (at your option) any later version.
21+#
22+# This program is distributed in the hope that it will be useful,
23+# but WITHOUT ANY WARRANTY; without even the implied warranty of
24+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25+# GNU Affero General Public License for more details.
26+#
27+# You should have received a copy of the GNU Affero General Public License
28+# along with this program. If not, see <http://www.gnu.org/licenses/>.
29+#
30+##############################################################################
31+
32+
33
34=== added file 'stock_move_cancel/__openerp__.py'
35--- stock_move_cancel/__openerp__.py 1970-01-01 00:00:00 +0000
36+++ stock_move_cancel/__openerp__.py 2012-08-07 18:57:18 +0000
37@@ -0,0 +1,41 @@
38+# -*- coding: utf-8 -*-
39+###########################################################################
40+# Module Writen to OpenERP, Open Source Management Solution
41+#
42+# Copyright (c) 2012 Vauxoo - http://www.vauxoo.com
43+# All Rights Reserved.
44+# info@vauxoo.com
45+############################################################################
46+# Coded by: julio (julio@vauxoo.com)
47+############################################################################
48+#
49+# This program is free software: you can redistribute it and/or modify
50+# it under the terms of the GNU Affero General Public License as
51+# published by the Free Software Foundation, either version 3 of the
52+# License, or (at your option) any later version.
53+#
54+# This program is distributed in the hope that it will be useful,
55+# but WITHOUT ANY WARRANTY; without even the implied warranty of
56+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
57+# GNU Affero General Public License for more details.
58+#
59+# You should have received a copy of the GNU Affero General Public License
60+# along with this program. If not, see <http://www.gnu.org/licenses/>.
61+#
62+##############################################################################
63+{
64+ 'name': 'Stock Move Cancel',
65+ "version" : "1.1",
66+ 'author': 'Vauxoo',
67+ 'depends': ['stock'],
68+ 'description': """
69+ Allow cancel move in state done
70+ """,
71+ 'update_xml':[
72+ 'security/move_cancel_security.xml',
73+ 'stock_view.xml',
74+ ],
75+ 'active': False,
76+ 'installable': True
77+}
78+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
79
80=== added directory 'stock_move_cancel/security'
81=== added file 'stock_move_cancel/security/move_cancel_security.xml'
82--- stock_move_cancel/security/move_cancel_security.xml 1970-01-01 00:00:00 +0000
83+++ stock_move_cancel/security/move_cancel_security.xml 2012-08-07 18:57:18 +0000
84@@ -0,0 +1,8 @@
85+<?xml version="1.0" encoding="utf-8"?>
86+<openerp><data>
87+
88+ <record id="base.group_moves_cancel" model="res.groups">
89+ <field name="name">Moves / Button Cancel</field>
90+ </record>
91+
92+</data></openerp>
93
94=== added file 'stock_move_cancel/stock_view.xml'
95--- stock_move_cancel/stock_view.xml 1970-01-01 00:00:00 +0000
96+++ stock_move_cancel/stock_view.xml 2012-08-07 18:57:18 +0000
97@@ -0,0 +1,31 @@
98+<?xml version="1.0" encoding="utf-8"?>
99+<openerp>
100+ <data>
101+
102+ <record model="ir.ui.view" id="view_stock_move_inherit2">
103+ <field name="name">view.stock.move.inherit2</field>
104+ <field name="model">stock.move</field>
105+ <field name="inherit_id" ref="stock.view_move_form" />
106+ <field name="type">form</field>
107+ <field name="arch" type="xml">
108+ <xpath expr="/form/group/button[@name='action_cancel']" position="replace">
109+ <button name="action_cancel" states="assigned,confirmed,done" string="_Cancel" type="object" icon="gtk-cancel" groups="base.group_moves_cancel"/>
110+ </xpath>
111+ </field>
112+ </record>
113+
114+ <record model="ir.ui.view" id="view_stock_move_inherit3">
115+ <field name="name">view.stock.move.inherit3</field>
116+ <field name="model">stock.move</field>
117+ <field name="inherit_id" ref="stock.view_move_form_reception_picking" />
118+ <field name="type">form</field>
119+ <field name="arch" type="xml">
120+ <xpath expr="/form/group/button[@name='action_cancel']" position="replace">
121+ <button name="action_cancel" states="assigned,confirmed,done" string="_Cancel" type="object" icon="gtk-cancel" groups="base.group_moves_cancel"/>
122+ </xpath>
123+ </field>
124+ </record>
125+
126+
127+ </data>
128+</openerp>