From a51698af798dfa0201ff1f8ebae0b40c893d5264 Mon Sep 17 00:00:00 2001
From: Bertrand Chenal <bch@b2ck.com>
Date: Tue, 20 May 2008 19:21:36 +0200
Subject: [PATCH] Customer Packing: ready state changed to packed state.

---
 packing.py  | 10 +++++-----
 packing.xml | 26 +++++++++++++-------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/packing.py b/packing.py
index 20f12d7356..b88af63b0c 100644
--- a/packing.py
+++ b/packing.py
@@ -255,14 +255,14 @@ class PackingOut(OSV):
             relation='stock.move', string='Outgoing Moves',
             fnct_inv='set_outgoing_moves',
             states={
-                'readonly':"state != 'ready'",
+                'readonly':"state != 'packed'",
             }, context="{'warehouse': warehouse, "\
                     "'packing_state': state, 'type':'outgoing',}")
     inventory_moves = fields.Function('get_inventory_moves', type='one2many',
             relation='stock.move', string='Inventory Moves',
             fnct_inv='set_inventory_moves',
             states={
-                'readonly':"state in ('ready', 'done')",
+                'readonly':"state in ('packed', 'done')",
             }, context="{'warehouse': warehouse, "\
                     "'packing_state': state, 'type':'inventory_out',}")
     moves = fields.One2Many('stock.move', 'packing_out', 'Moves',
@@ -273,7 +273,7 @@ class PackingOut(OSV):
         ('done', 'Done'),
         ('cancel', 'Cancel'),
         ('assigned', 'Assigned'),
-        ('ready', 'Ready'),
+        ('packed', 'Packed'),
         ('waiting', 'Waiting'),
         ], 'State', readonly=True)
 
@@ -401,13 +401,13 @@ class PackingOut(OSV):
              'effective_date': time.strftime('%Y-%m-%d %H:%M:%S')},
             context=context)
 
-    def set_state_ready(self, cursor, user, packing_id, context=None):
+    def set_state_packed(self, cursor, user, packing_id, context=None):
         move_obj = self.pool.get('stock.move')
         packing = self.browse(cursor, user, packing_id, context=context)
         move_obj.set_state_done(
             cursor, user, [m.id for m in packing.inventory_moves],
             context=context)
-        self.write(cursor, user, packing_id, {'state':'ready'},
+        self.write(cursor, user, packing_id, {'state':'packed'},
                    context=context)
         for move in packing.inventory_moves:
             move_obj.create(cursor, user, {
diff --git a/packing.xml b/packing.xml
index 325783601e..3065605905 100644
--- a/packing.xml
+++ b/packing.xml
@@ -209,7 +209,7 @@
                                         ('cancel','done') '''}"/>
                                 <button string="Set Done" name="done"
                                         states="{'invisible': '''state !=
-                                        'ready' '''}"/>
+                                        'packed' '''}"/>
                                 <button string="Set Waiting" name="waiting"
                                         states="{'invisible': '''state !=
                                         'draft' '''}"/>
@@ -220,7 +220,7 @@
                                 <button string="Assign" name="assign"
                                         states="{'invisible': '''state !=
                                         'waiting' '''}"/>
-                                <button string="Set ready" name="ready"
+                                <button string="Make packing" name="packed"
                                         states="{'invisible': '''state !=
                                         'assigned' '''}"/>
                                 <button string="Reset to Draft" name="button_draft"
@@ -316,7 +316,7 @@
             <field name="name">Customer Packings Ready for Shipping</field>
             <field name="res_model">stock.packing.out</field>
             <field name="view_type">form</field>
-            <field name="domain">[('state', '=', 'ready')]</field>
+            <field name="domain">[('state', '=', 'packed')]</field>
         </record>
         <record model="ir.action.act_window.view"
                 id="act_packing_out_ready_form_view1">
@@ -441,11 +441,11 @@
             <field name="workflow" ref="wkf_packingout"/>
             <field name="action">set_state_assigned()</field>
         </record>
-        <record model="workflow.activity" id="packingout_act_ready">
-            <field name="name">Ready</field>
+        <record model="workflow.activity" id="packingout_act_packed">
+            <field name="name">Packed</field>
             <field name="kind">function</field>
             <field name="workflow" ref="wkf_packingout"/>
-            <field name="action">set_state_ready()</field>
+            <field name="action">set_state_packed()</field>
         </record>
 
         <record model="workflow.transition"
@@ -481,14 +481,14 @@
             <field name="signal">cancel</field>
         </record>
         <record model="workflow.transition"
-                id="packingout_trans_assigned_ready">
+                id="packingout_trans_assigned_packed">
             <field name="act_from" ref="packingout_act_assigned"/>
-            <field name="act_to" ref="packingout_act_ready"/>
-            <field name="signal">ready</field>
+            <field name="act_to" ref="packingout_act_packed"/>
+            <field name="signal">packed</field>
         </record>
         <record model="workflow.transition"
-                id="packingout_trans_ready_done">
-            <field name="act_from" ref="packingout_act_ready"/>
+                id="packingout_trans_packed_done">
+            <field name="act_from" ref="packingout_act_packed"/>
             <field name="act_to" ref="packingout_act_done"/>
             <field name="signal">done</field>
         </record>
@@ -499,8 +499,8 @@
             <field name="signal">cancel</field>
         </record>
         <record model="workflow.transition"
-                id="packingout_trans_ready_cancel">
-            <field name="act_from" ref="packingout_act_ready"/>
+                id="packingout_trans_packed_cancel">
+            <field name="act_from" ref="packingout_act_packed"/>
             <field name="act_to" ref="packingout_act_cancel"/>
             <field name="signal">cancel</field>
         </record>