From bc1d66c8e075b4f5229c5f29eb9444c5775cd0e4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 29 Oct 2008 17:48:02 +0100
Subject: [PATCH] bugfix

bzr revid: fp@tinyerp.com-20081029164802-tu6eu1s1isg9pnv4
---
 addons/document/__terp__.py |  2 +-
 addons/mrp/mrp_view.xml     |  4 ++--
 addons/sale/sale.py         | 19 ++++++++++++++-----
 addons/stock/stock_view.xml |  6 +++---
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/addons/document/__terp__.py b/addons/document/__terp__.py
index 847649f2523..757421955d5 100644
--- a/addons/document/__terp__.py
+++ b/addons/document/__terp__.py
@@ -12,7 +12,7 @@
     * User Authentification
     * Document Indexation
 """,
-    "depends" : ["base"],
+    "depends" : ["base","process"],
     "init_xml" : ["document_data.xml"],
     "update_xml" : [
         "document_view.xml",
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index c385319f86a..c1a5dd334e5 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -3,6 +3,7 @@
     <data>
 
         <menuitem icon="terp-mrp" id="menu_mrp_root" name="Manufacturing"/>
+        <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
 
         <!--
     Property / Property Group
@@ -707,7 +708,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','exception')]</field>
         </record>
-        <menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_action5" parent="stock.menu_stock_root"/>
+        <menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_action5" parent="menu_mrp_reordering"/>
 
         <record id="mrp_procurement_action4" model="ir.actions.act_window">
             <field name="name">Exceptions Procurements to Fix</field>
@@ -780,7 +781,6 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_warehouse_orderpoint_tree"/>
         </record>
-        <menuitem id="menu_mrp_reordering" name="Reordering Policy" parent="stock.menu_stock_root" sequence="4"/>
         <menuitem action="action_orderpoint_form" id="menu_action_orderpoint_form" parent="menu_mrp_reordering"/>
 
         <act_window domain="[('warehouse_id', '=', active_id)]" id="act_stock_warehouse_2_stock_warehouse_orderpoint" name="Minimum Stock Rules" res_model="stock.warehouse.orderpoint" src_model="stock.warehouse"/>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 5feeb2cda46..c98e224a9f8 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -937,24 +937,33 @@ class sale_config_picking_policy(osv.osv_memory):
         'picking_policy': fields.selection([
             ('direct','Direct Delivery'),
             ('one','All at once')
-        ], 'Packing Policy', required=True ),
+        ], 'Packing Default Policy', required=True ),
         'order_policy': fields.selection([
             ('manual','Invoice based on Sales Orders'),
             ('picking','Invoice based on Deliveries'),
-        ], 'Shipping Policy', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        ], 'Shipping Default Policy', required=True),
+        'step': fields.selection([
+            ('one','Delivery Order Only'),
+            ('two','Packing List & Delivery Order')
+        ], 'Steps To Deliver a Sale Order', required=True)
     }
     _defaults={
         'picking_policy': lambda *a: 'direct',
-        'order_policy': lambda *a: 'picking'
+        'order_policy': lambda *a: 'picking',
+        'step': lambda *a: 'one'
     }
     def set_default(self, cr, uid, ids, context=None):
-        print context
         for o in self.browse(cr, uid, ids, context=context):
-            print o.picking_policy, o.order_policy
             ir_values_obj = self.pool.get('ir.values')
             ir_values_obj.set(cr,uid,'default',False,'picking_policy',['sale.order'],o.picking_policy)
             ir_values_obj = self.pool.get('ir.values')
             ir_values_obj.set(cr,uid,'default',False,'order_policy',['sale.order'],o.order_policy)
+
+            #id = self.pool.get('ir.model.data')._get_id
+
+
+            # base.group_no_one
+
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index db0c09fbb56..d4fbbfbe9d6 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -857,7 +857,7 @@
         </record>
 
         <record id="action_picking_tree" model="ir.actions.act_window">
-            <field name="name">Sending Products</field>
+            <field name="name">Outgoing Products</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1038,7 +1038,7 @@
 
 
         <record id="action_picking_tree4" model="ir.actions.act_window">
-            <field name="name">Getting Products</field>
+            <field name="name">Incoming Products</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1122,7 +1122,7 @@
         <menuitem action="action_picking_form" id="menu_action_picking_form" parent="menu_action_picking_tree4"/>
 
         <record id="action_picking_tree6" model="ir.actions.act_window">
-            <field name="name">Internal Packings</field>
+            <field name="name">Internal Moves</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>