From 7ac9c3e31e718dedb51345799c316bedcd56d3c1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 15 Jun 2008 14:59:23 +0000
Subject: [PATCH] Improvements and bugfixes

bzr revid: fp@tinyerp.com-fbb75888ca6f7bade138d7fb58fa5e961f42046c
---
 addons/product/pricelist.py       |  3 +++
 addons/product/pricelist_view.xml | 18 +++++++++++++++---
 addons/product/product_view.xml   |  6 +++---
 addons/stock/stock.py             |  2 ++
 addons/stock/stock_view.xml       |  1 +
 5 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index aabe02816e3..58cca97e248 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -249,6 +249,9 @@ class product_pricelist_version(osv.osv):
 		'active': lambda *a: 1,
 	}
 
+	#
+	# TODO: improve this function ?
+	#
 	def _check_date(self, cursor, user, ids):
 		for pricelist_version in self.browse(cursor, user, ids):
 			if not pricelist_version.active:
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 33de84d7dae..f67ba71bbca 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -2,7 +2,11 @@
 <terp>
 <data>
 
-	<menuitem name="Products/Pricelists" id="menu_product_pricelist_main" sequence="2"/>
+	<menuitem 
+		name="Products/Pricelists" 
+		id="menu_product_pricelist_main" 
+		sequence="2"
+		groups="base.group_extended"/>
 
 	<record model="ir.ui.view" id="product_pricelist_version_form_view">
 		<field name="name">product.pricelist.version.form</field>
@@ -161,7 +165,11 @@
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 	</record>
-	<menuitem name="Products/Configuration/Prices Types" id="menu_product_price_type_action" action="product_price_type_action"/>
+	<menuitem 
+		name="Products/Configuration/Prices Types" 
+		id="menu_product_price_type_action" 
+		action="product_price_type_action"
+		groups="base.group_extended"/>
 
 	<record model="ir.ui.view" id="product_pricelist_type_view">
 		<field name="name">product.pricelist.type.form</field>
@@ -180,7 +188,11 @@
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 	</record>
-	<menuitem name="Products/Configuration/Pricelists Types" id="menu_product_pricelist_type_action" action="product_pricelist_type_action"/>
+	<menuitem 
+		name="Products/Configuration/Pricelists Types" 
+		id="menu_product_pricelist_type_action" 
+		action="product_pricelist_type_action"
+		groups="base.group_extended"/>
 
 </data>
 </terp>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 1ee387540d4..1ce93d62ec4 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -312,11 +312,11 @@
 				<form string="Supplier Information">
 					<field name="name"/>
 					<field name="sequence"/>
-					<field name="product_name" />
-					<field name="product_code" />
+					<field name="product_name"/>
+					<field name="product_code"/>
 					<field name="delay"/>
 					<field name="qty"/>
-					<field name="pricelist_ids" widget="one2many_list" colspan="4" nolabel="1">
+					<field name="pricelist_ids" widget="one2many_list" colspan="4" nolabel="1" groups="base.group_extended">
 						<tree string="Pricelist" editable="bottom">
 							<field name="min_quantity" />
 							<field name="price" />
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 53bb1f069f3..74ca06d971f 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -86,6 +86,7 @@ class stock_location(osv.osv):
 		'chained_location_id': fields.many2one('stock.location', 'Chained Location If Fixed'),
 		'chained_location_type': fields.selection([('','None'),('customer', 'Customer'),('fixed','Fixed Location')], 'Chained Location Type'),
 		'chained_auto_packing': fields.boolean('Chained Auto-Packing'),
+		'chained_delay': fields.integer('Chained Delay (days)'),
 
 		'address_id': fields.many2one('res.partner.address', 'Location Address'),
 
@@ -461,6 +462,7 @@ class stock_picking(osv.osv):
 						'prodlot_id':False,
 						'tracking_id':False,
 						'move_history_ids':[],
+						'date_planned': DateTime.strptime(move.date_planned, '%Y-%m-%d') + DateTime.RelativeDateTime(days=move.location_dest_id.chained_delay or 0),
 						'move_history_ids2':[]}
 					)
 					self.pool.get('stock.move').write(cr, uid, [move.id], {
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index fde00df7ddc..a4ae5d5ef3b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -329,6 +329,7 @@
 						<field name="chained_location_type"/>
 						<field name="chained_location_id"/>
 						<field name="chained_auto_packing"/>
+						<field name="chained_delay"/>
 						<newline/>
 						<field name="comment" colspan="4"/>
 					</page>