diff --git a/packing.py b/packing.py
index d992070205..0cbc17af5f 100644
--- a/packing.py
+++ b/packing.py
@@ -265,15 +265,8 @@ class PackingOut(OSV):
     def __init__(self):
         super(PackingOut, self).__init__()
         self._rpc_allowed += [
-            'set_state_done',
-            'set_state_waiting',
-            'set_state_draft',
-            'set_state_cancel',
-            'set_state_assigned',
-            'set_state_ready',
-            'assign_try',
-            'assign_force',
-            ]
+            'button_draft',
+        ]
         self._order[0] = ('id', 'DESC')
 
     def default_state(self, cursor, user, context=None):
@@ -480,6 +473,8 @@ class PackingOut(OSV):
         if context is None:
             context = {}
 
+        cursor.execute('LOCK TABLE stock_move')
+
         packing = self.browse(cursor, user, id, context=context)
         parent_to_locations = {}
         inventory_moves = []
@@ -566,6 +561,11 @@ class PackingOut(OSV):
             {'state':'assigned'})
         return True
 
+    def button_draft(self, cursor, user, ids, context=None):
+        workflow_service = LocalService('workflow')
+        for packing in self.browse(cursor, user, ids, context=context):
+            workflow_service.trg_create(user, self._name, packing.id, cursor)
+
 PackingOut()
 
 
diff --git a/packing.xml b/packing.xml
index fb7a16ed52..69be873e3e 100644
--- a/packing.xml
+++ b/packing.xml
@@ -175,7 +175,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <![CDATA[
-                    <form string="Supplier Packing" col="4">
+                    <form string="Customer Packing" col="4">
                         <label name="code"/>
                         <field name="code"/>
                         <label name="effective_date"/>
@@ -195,26 +195,29 @@
                         <group col="4" colspan="4">
                             <label name="state"/>
                             <field name="state"/>
-                            <group col="6" colspan="2">
-                                <button string="Cancel" name="signal_cancel"
+                            <group col="7" colspan="2">
+                                <button string="Cancel" name="cancel"
                                         states="{'invisible': '''state in
                                         ('cancel','done') '''}"/>
-                                <button string="Set Done" name="signal_done"
+                                <button string="Set Done" name="done"
                                         states="{'invisible': '''state !=
                                         'ready' '''}"/>
-                                <button string="Set Waiting" name="signal_waiting"
+                                <button string="Set Waiting" name="waiting"
                                         states="{'invisible': '''state !=
                                         'draft' '''}"/>
                                 <button string="Force Assign"
-                                        name="signal_force_assign"
+                                        name="force_assign"
                                         states="{'invisible': '''state !=
                                         'waiting' '''}"/>
-                                <button string="Assign" name="signal_assign"
+                                <button string="Assign" name="assign"
                                         states="{'invisible': '''state !=
                                         'waiting' '''}"/>
-                                <button string="Set ready" name="signal_ready"
+                                <button string="Set ready" name="ready"
                                         states="{'invisible': '''state !=
                                         'assigned' '''}"/>
+                                <button string="Reset to Draft" name="button_draft"
+                                    type="object"
+                                    states="{'invisible': '''state != 'cancel' '''}"/>
                             </group>
                         </group>
                     </form>
@@ -439,57 +442,57 @@
                 id="packingout_trans_waiting_assigned">
             <field name="act_from" ref="packingout_act_waiting"/>
             <field name="act_to" ref="packingout_act_assigned"/>
-            <field name="signal">signal_assign</field>
+            <field name="signal">assign</field>
             <field name="condition">assign_try()</field>
         </record>
         <record model="workflow.transition"
                 id="packingout_trans_waiting_assigned_force">
             <field name="act_from" ref="packingout_act_waiting"/>
             <field name="act_to" ref="packingout_act_assigned"/>
-            <field name="signal">signal_force_assign</field>
+            <field name="signal">force_assign</field>
             <field name="condition">assign_force()</field>
         </record>
         <record model="workflow.transition"
                 id="packingout_trans_draft_waiting">
             <field name="act_from" ref="packingout_act_draft"/>
             <field name="act_to" ref="packingout_act_waiting"/>
-            <field name="signal">signal_waiting</field>
+            <field name="signal">waiting</field>
         </record>
         <record model="workflow.transition"
                 id="packingout_trans_waiting_cancel">
             <field name="act_from" ref="packingout_act_waiting"/>
             <field name="act_to" ref="packingout_act_cancel"/>
-            <field name="signal">signal_cancel</field>
+            <field name="signal">cancel</field>
         </record>
         <record model="workflow.transition"
                 id="packingout_trans_draft_cancel">
             <field name="act_from" ref="packingout_act_draft"/>
             <field name="act_to" ref="packingout_act_cancel"/>
-            <field name="signal">signal_cancel</field>
+            <field name="signal">cancel</field>
         </record>
         <record model="workflow.transition"
                 id="packingout_trans_assigned_ready">
             <field name="act_from" ref="packingout_act_assigned"/>
             <field name="act_to" ref="packingout_act_ready"/>
-            <field name="signal">signal_ready</field>
+            <field name="signal">ready</field>
         </record>
         <record model="workflow.transition"
                 id="packingout_trans_ready_done">
             <field name="act_from" ref="packingout_act_ready"/>
             <field name="act_to" ref="packingout_act_done"/>
-            <field name="signal">signal_done</field>
+            <field name="signal">done</field>
         </record>
         <record model="workflow.transition"
                 id="packingout_trans_assigned_cancel">
             <field name="act_from" ref="packingout_act_assigned"/>
             <field name="act_to" ref="packingout_act_cancel"/>
-            <field name="signal">signal_cancel</field>
+            <field name="signal">cancel</field>
         </record>
         <record model="workflow.transition"
                 id="packingout_trans_ready_cancel">
             <field name="act_from" ref="packingout_act_ready"/>
             <field name="act_to" ref="packingout_act_cancel"/>
-            <field name="signal">signal_cancel</field>
+            <field name="signal">cancel</field>
         </record>
 
     </data>