Merge lp:~syleam/wms/5.0-christophe-chauvet into lp:wms

[Christophe CHAUVET]

Add new method to change state from confirmed to draft

[Christophe CHAUVET (christophe-chauvet)]

ok

review: Approve

[Jean-Sebastien SUZANNE - http://www.Syleam.fr (alnjssuza)]

c deja bien d'etre d'accord avec soi meme
:D

2011/3/22 Christophe Chauvet - http://www.syleam.fr/ <
<email address hidden>>

> Review: Approve
> ok
> --
> https://code.launchpad.net/~syleam/wms/5.0-christophe-chauvet/+merge/54353<https://code.launchpad.net/%7Esyleam/wms/5.0-christophe-chauvet/+merge/54353>
> Your team Syleam's employee is subscribed to branch
> lp:~syleam/wms/5.0-christophe-chauvet.
>

--
Jean-Sébastien Suzanne
Développeur / *Software d*eveloper

27 avenue Jean Mantelet
61000 Alençon
FRANCE

*Tel : [phone]
Fax : [phone]*

********************************************************************************
Ce message et toutes les pièces jointes (ci-après le "message") sont établis à
l'intention exclusive de ses destinataires et sont confidentiels. Si vous
recevez ce message par erreur, merci de le détruire et d'en avertir
immédiatement l'expéditeur. Toute utilisation de ce message non conforme à sa
destination, toute diffusion ou toute publication, totale ou partielle, est
interdite, sauf autorisation expresse. L'internet ne permettant pas d'assurer
l'intégrité de ce message, SYLEAM décline toute responsabilité au titre de ce
message, dans l'hypothèse où il aurait été modifié.

This message and any attachments (the "message") is intended solely for the
addressees and is confidential. If you receive this message in error, please
delete it and immediately notify the sender. Any use not in accord with its
purpose, any dissemination or disclosure, either whole or partial, is prohibited
except formal approval. The internet can not guarantee the integrity of this
message. SYLEAM shall not therefore be liable for the message if modified.
********************************************************************************

[lp:~syleam/wms/5.0-christophe-chauvet]

220. By Christophe CHAUVET on 2011-03-22

merge from lp:~syleam/wms/5.0-christophe-chauvet

=== modified file 'wms/__terp__.py'
--- wms/__terp__.py	2011-03-04 08:44:04 +0000
+++ wms/__terp__.py	2011-03-22 14:29:27 +0000
@@ -79,6 +79,7 @@
         'view/report_stock.xml',
         'wizard/wizard.xml',
         #'report/report.xml',
+        'workflow/workflow.xml',
     ],
     'demo_xml': [
         'demo/partner_apple.xml',
 
=== modified file 'wms/object/picking.py'
--- wms/object/picking.py	2011-03-15 13:42:16 +0000
+++ wms/object/picking.py	2011-03-22 14:29:27 +0000
@@ -25,6 +25,7 @@
 from osv import osv
 from osv import fields
 from tools.translate import _
+import netsvc
 
 _picking_state = [
     ('draft', 'Draft'),
@@ -556,6 +557,73 @@
 
         return known_moves
 
+    def reinit_draft(self, cr, uid, ids, context=None):
+        """
+        When picking is confirmed, we can put in draft,
+        and delete all moves before reimport it
+        """
+        if context is None:
+            context = {}
+
+        wf_service = netsvc.LocalService("workflow")
+        move_obj = self.pool.get('stock.move')
+        ctx = context.copy()
+        ctx.update({'call_unlink': True})
+        for p in self.browse(cr, uid, ids, context=context):
+            if p.state != 'confirmed':
+                raise osv.except_osv(_('Error'), _('Only picking in confirmed or assigned must be reset!'))
+
+            picking_link = []
+            move_link = []
+            move_current = []
+            ## Retrieve all picking link to the movement
+            for m in p.move_lines:
+                move_current.append(m.id)
+                if m.move_dest_id and m.move_dest_id.picking_id:
+                    move_link.append(m.move_dest_id.id)
+                    if m.move_dest_id.picking_id.id not in picking_link:
+                        picking_link.append(m.move_dest_id.picking_id.id)
+
+            ## Delete movement for the relate picking
+            if move_link:
+                move_obj.unlink(cr, uid, move_link, context=ctx)
+
+            ## Delete the related picking
+            if picking_link:
+                self.unlink(cr, uid, picking_link, context=ctx)
+
+            if move_current:
+                move_obj.write(cr, uid, move_current, {'state': 'draft'}, context=ctx)
+
+            #self.write(cr, uid, p.id, {'state': 'draft'}, ctx)
+            wf_service.trg_validate(uid, 'stock.picking', p.id, 'button_draft', cr)
+
+            if move_current:
+                move_obj.unlink(cr, uid, move_current, context=ctx)
+
+        return True
+
+    def action_draft(self, cr, uid, ids, context=None):
+        """
+        move from cancel state to draft
+        """
+        if context is None:
+            context = {}
+
+        print 'action_draft ', ids
+        self.write(cr, uid, ids, {'state': 'draft'}, context=context)
+        return True
+
+    #def test_cancel(self, cr, uid, ids, context={}):
+    #    """
+    #    Redefine test cancel, to protect 
+    #    """
+    #    for pick in self.browse(cr, uid, ids, context=context):
+    #        for move in pick.move_lines:
+    #            if move.state not in ('cancel',):
+    #                return False
+    #    return True
+
 StockPicking()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'wms/workflow/workflow.xml'
--- wms/workflow/workflow.xml	2010-06-07 06:03:32 +0000
+++ wms/workflow/workflow.xml	2011-03-22 14:29:27 +0000
@@ -1,29 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-##############################################################################
-#
-#    wms module for OpenERP, WMS Extended for Open ERP
-#    Copyright (C) 2010 SYLEAM Info Services ([http://www.syleam.fr/])
-#              Christophe CHAUVET [[e-mail]]
-#
-#    This file is a part of wms
-#
-#    wms is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    wms 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see [http://www.gnu.org/licenses/].
-#
-##############################################################################
-
+        ##############################################################################
+        #
+        #    wms module for OpenERP, WMS Extended for Open ERP
+        #    Copyright (C) 2010-2011 SYLEAM Info Services ([http://www.syleam.fr/])
+        #              Christophe CHAUVET [[e-mail]]
+        #
+        #    This file is a part of wms
+        #
+        #    wms is free software: you can redistribute it and/or modify
+        #    it under the terms of the GNU General Public License as published by
+        #    the Free Software Foundation, either version 3 of the License, or
+        #    (at your option) any later version.
+        #
+        #    wms 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 General Public License for more details.
+        #
+        #    You should have received a copy of the GNU General Public License
+        #    along with this program.  If not, see [http://www.gnu.org/licenses/].
+        #
+        ##############################################################################
+
+        <record id="stock.act_draft" model="workflow.activity">
+            <field name="wkf_id" ref="stock.wkf_picking"/>
+            <field name="flow_start">True</field>
+            <field name="name">draft</field>
+            <field name="kind">function</field>
+            <field name="action">action_draft()</field>
+        </record>
+
+
+        <record id="trans_confirmed_draft" model="workflow.transition">
+            <field name="act_from" ref="stock.act_confirmed"/>
+            <field name="act_to" ref="stock.act_draft"/>
+            <field name="signal">button_draft</field>
+            <field name="condition">True</field>
+        </record>
 
     </data>
-</openerp>
 \ No newline at end of file
+</openerp>