Merge lp:~vauxoo/addons-vauxoo/addons-vauxoo-stock_picking_cancel-dev-fernando into lp:addons-vauxoo/6.1

[Fernando Lopez]

Se eliminó el modulo stock move cancel, y su funcionalidad se agregó a stock picking cancel.

[Moisés López - http://www.vauxoo.com (moylop260)]

Rodolfo,
Verifica esta propuesta de merge que todo esté bien, please.
Y actualizala en producción
NOTA: Es importante que antes de actualizarla, desintales el módulo que se elimina y también que reasignes el grupo de cancelar a los usuarios que ya lo tenían.

[Moisés López - http://www.vauxoo.com (moylop260)]

review: Approve

[Ulises Lopez (ulcalderon)]

Al instalarse el modulo genera dos grupos de usuario: Picking / Button Cancel y Moves / Button Cancel el grupo que tiene la funcionalidad es Picking / Button Cancel, el otro Moves / Button Cancel no tiene ninguna funcionalidad.

review: Needs Fixing

[lp:~vauxoo/addons-vauxoo/addons-vauxoo-stock_picking_cancel-dev-fernando]

502. By Fernando Lopez on 2012-12-18

[FIX] Removed Moves / Button Cancel group

=== removed directory 'stock_move_cancel'
=== removed file 'stock_move_cancel/__init__.py'
--- stock_move_cancel/__init__.py	2012-08-07 17:30:51 +0000
+++ stock_move_cancel/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-###########################################################################
-#    Module Writen to OpenERP, Open Source Management Solution
-#
-#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com
-#    All Rights Reserved.
-#    [e-mail]
-############################################################################
-#    Coded by: julio ([e-mail])
-############################################################################
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-

=== removed file 'stock_move_cancel/__openerp__.py'
--- stock_move_cancel/__openerp__.py	2012-08-07 17:42:18 +0000
+++ stock_move_cancel/__openerp__.py	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-###########################################################################
-#    Module Writen to OpenERP, Open Source Management Solution
-#
-#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com
-#    All Rights Reserved.
-#    [e-mail]
-############################################################################
-#    Coded by: julio ([e-mail])
-############################################################################
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-{
-    'name': 'Stock Move Cancel',
-    "version" : "1.1",
-    'author': 'Vauxoo',
-    'depends': ['stock'],
-    'description': """
-        Allow cancel move in state done
-    """,
-    'update_xml':[
-        'security/move_cancel_security.xml',
-        'stock_view.xml',
-    ],
-    'active': False,
-    'installable': True
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== removed directory 'stock_move_cancel/security'
=== removed file 'stock_move_cancel/security/move_cancel_security.xml'
--- stock_move_cancel/security/move_cancel_security.xml	2012-08-07 17:42:18 +0000
+++ stock_move_cancel/security/move_cancel_security.xml	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp><data>
-
-    <record id="base.group_moves_cancel" model="res.groups">
-        <field name="name">Moves / Button Cancel</field>
-    </record>
-
-</data></openerp>

=== removed file 'stock_move_cancel/stock_view.xml'
--- stock_move_cancel/stock_view.xml	2012-08-07 17:42:18 +0000
+++ stock_move_cancel/stock_view.xml	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record model="ir.ui.view" id="view_stock_move_inherit2">
-            <field name="name">view.stock.move.inherit2</field>
-            <field name="model">stock.move</field>
-            <field name="inherit_id" ref="stock.view_move_form" />
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                    <xpath expr="/form/group/button[@name='action_cancel']" position="replace">
- 			<button name="action_cancel" states="assigned,confirmed,done" string="_Cancel" type="object" icon="gtk-cancel" groups="base.group_moves_cancel"/>
-                    </xpath>
-	    </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_stock_move_inherit3">
-            <field name="name">view.stock.move.inherit3</field>
-            <field name="model">stock.move</field>
-            <field name="inherit_id" ref="stock.view_move_form_reception_picking" />
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                    <xpath expr="/form/group/button[@name='action_cancel']" position="replace">
- 			<button name="action_cancel" states="assigned,confirmed,done" string="_Cancel" type="object" icon="gtk-cancel" groups="base.group_moves_cancel"/>
-                    </xpath>
-	    </field>
-        </record>
-
-
-    </data>
-</openerp>

=== modified file 'stock_picking_cancel/security/picking_security.xml'
--- stock_picking_cancel/security/picking_security.xml	2012-08-07 18:37:02 +0000
+++ stock_picking_cancel/security/picking_security.xml	2012-12-18 16:12:31 +0000
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp><data>
-
-    <record id="base.group_picking_cancel" model="res.groups">
-        <field name="name">Picking / Button Cancel</field>
-    </record>
-
-</data></openerp>
+    <openerp>
+        <data>
+
+            <record id="base.group_picking_cancel" model="res.groups">
+                <field name="name">Picking / Button Cancel</field>
+            </record>
+
+        </data>
+    </openerp>
\ No newline at end of file

=== modified file 'stock_picking_cancel/stock_view.xml'
--- stock_picking_cancel/stock_view.xml	2012-08-07 18:49:12 +0000
+++ stock_picking_cancel/stock_view.xml	2012-12-18 16:12:31 +0000
@@ -43,5 +43,30 @@
                 </xpath>
             </field>
         </record>
+	<!--from stock move cancel module-->
+	<record model="ir.ui.view" id="view_stock_move_inherit2">
+            <field name="name">view.stock.move.inherit2</field>
+            <field name="model">stock.move</field>
+            <field name="inherit_id" ref="stock.view_move_form" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                    <xpath expr="/form/group/button[@name='action_cancel']" position="replace">
+ 			<button name="action_cancel" states="assigned,confirmed,done" string="_Cancel" type="object" icon="gtk-cancel" groups="base.group_picking_cancel"/>
+                    </xpath>
+	    </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_stock_move_inherit3">
+            <field name="name">view.stock.move.inherit3</field>
+            <field name="model">stock.move</field>
+            <field name="inherit_id" ref="stock.view_move_form_reception_picking" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                    <xpath expr="/form/group/button[@name='action_cancel']" position="replace">
+ 			<button name="action_cancel" states="assigned,confirmed,done" string="_Cancel" type="object" icon="gtk-cancel" groups="base.group_picking_cancel"/>
+                    </xpath>
+	    </field>
+        </record>
+	
     </data>
 </openerp>