From 4961d5b91c18553e230cdc82107a747af50ece41 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 5 Feb 2008 21:14:45 +0000
Subject: [PATCH] Small Improvements

bzr revid: fp@tinyerp.com-60fa73c6c2e6a3865c4df4c1a9c21fb0c2e77d18
---
 .../account_analytic_analysis.py              |  2 --
 addons/mrp/mrp_view.xml                       | 36 ++++++++++++++-----
 addons/sale/sale.py                           |  2 +-
 addons/stock/stock.py                         |  8 ++---
 addons/stock/stock_view.xml                   |  6 +++-
 5 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 953bd11c432..a4cdef0f03e 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -83,7 +83,6 @@ class account_analytic_account(osv.osv):
 					JOIN hr_timesheet_invoice_factor \
 						on hr_timesheet_invoice_factor.id = account_analytic_account.to_invoice \
 					WHERE account_analytic_account.id IN (%s) \
-						AND account_analytic_journal.type='general' \
 						AND account_analytic_line.invoice_id is null \
 						AND account_analytic_line.to_invoice IS NOT NULL \
 					GROUP BY account_analytic_account.id;"""%acc_set)
@@ -223,7 +222,6 @@ class account_analytic_account(osv.osv):
 					join hr_timesheet_invoice_factor hr \
 						on (hr.id=a.to_invoice) \
 				where account_analytic_line.account_id IN (%s) \
-					and account_analytic_journal.type = 'general' \
 					and a.to_invoice IS NOT NULL \
 				GROUP BY account_analytic_line.account_id"""%acc_set)
 			for account_id, sum in cr.fetchall():
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 1be2c360027..ee198cb76bc 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -638,15 +638,7 @@
 		<field name="domain">[('state','=','confirmed')]</field>
 	</record>
 	<menuitem name="Production Management/Procurement Orders/Unscheduled Procurements" id="menu_mrp_procurement_action3" action="mrp_procurement_action3"/>
-	<record model="ir.actions.act_window" id="mrp_procurement_action4">
-		<field name="name">Exceptions procurements to fix</field>
-		<field name="type">ir.actions.act_window</field>
-		<field name="res_model">mrp.procurement</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="domain">[('state','=','exception'), ('message', '&lt;&gt;', '')]</field>
-	</record>
-	<menuitem name="Production Management/Procurement Orders/All Exceptions/Exceptions to Fix" id="menu_mrp_procurement_action4" action="mrp_procurement_action4"/>
+
 	<record model="ir.actions.act_window" id="mrp_procurement_action5">
 		<field name="name">Exceptions procurements</field>
 		<field name="type">ir.actions.act_window</field>
@@ -657,6 +649,32 @@
 	</record>
 	<menuitem name="Production Management/Procurement Orders/All Exceptions" id="menu_mrp_procurement_action5" action="mrp_procurement_action5"/>
 
+	<record model="ir.actions.act_window" id="mrp_procurement_action4">
+		<field name="name">Exceptions procurements to fix</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="res_model">mrp.procurement</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('state','=','exception'), ('message', '&lt;&gt;', '')]</field>
+	</record>
+	<menuitem 
+		name="Production Management/Procurement Orders/All Exceptions/Exceptions to Fix" 
+		id="menu_mrp_procurement_action4" 
+		action="mrp_procurement_action4"/>
+
+	<record model="ir.actions.act_window" id="mrp_procurement_action11">
+		<field name="name">Temporary Procurement Exceptions</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="res_model">mrp.procurement</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('state','=','exception'), ('message', '=', '')]</field>
+	</record>
+	<menuitem 
+		name="Production Management/Procurement Orders/All Exceptions/Temporary Procurement Exceptions" 
+		id="menu_mrp_procurement_action11" 
+		action="mrp_procurement_action11"/>
+
 	=============================
 	Order Point
 	=============================
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index d497503b508..ea80b32afd1 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -168,7 +168,7 @@ class sale_order(osv.osv):
 		'incoterm': fields.selection(_incoterm_get, 'Incoterm',size=3),
 		'picking_policy': fields.selection([('direct','Direct Delivery'),('one','All at once')], 'Packing Policy', required=True ),
 		'order_policy': fields.selection([
-			('prepaid','Invoice before delivery'),
+			('prepaid','Payment before delivery'),
 			('manual','Shipping & Manual Invoice'),
 			('postpaid','Automatic Invoice after delivery'),
 			('picking','Invoice from the packings'),
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 626fab89a94..ae57bdb2a3d 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -475,8 +475,8 @@ class stock_picking(osv.osv):
 			if pick.move_type=='one' and pick.loc_move_id:
 				if pick.lot_id:
 					id = self.pool.get('stock.move.lot').create(cr, uid, {
-						'name': 'MOVE:'+pick.name,
-						'origin': 'PICK:'+str(pick.id),
+						'name': pick.name,
+						'origin': str(pick.origin or ''),
 						'lot_id': pick.lot_id.id,
 						'loc_dest_id': pick.loc_move_id.id,
 						'address_id': pick.address_id.id
@@ -502,8 +502,8 @@ class stock_picking(osv.osv):
 
 				if pick.move_type=='direct' and pick.loc_move_id:
 					id = self.pool.get('stock.move.lot').create(cr, uid, {
-						'name': 'MOVE:'+pick.name,
-						'origin': 'PICK:'+str(pick.id),
+						'name': pick.name,
+						'origin': str(pick.origin or ''),
 						'lot_id': lot_id,
 						'loc_dest_id': pick.loc_move_id.id,
 						'address_id': pick.address_id.id
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index d253fe069bc..3014359ad54 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -391,8 +391,9 @@
 		<field name="type">tree</field>
 		<field name="field_parent">child_ids</field>
 		<field name="arch" type="xml">
-			<tree string="Stock location tree">
+			<tree string="Stock location tree" color="grey:usage in ('procurement','inventory','production')">
 				<field name="name"/>
+				<field name="usage" visible="0"/>
 			</tree>
 		</field>
 	</record>
@@ -664,6 +665,7 @@
 				<field name="lot_id"/>
 				<field name="serial"/>
 				<field name="address_id"/>
+				<field name="origin"/>
 				<field name="state"/>
 			</tree>
 		</field>
@@ -699,6 +701,7 @@
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">form</field>
 		<field name="view_id" ref="view_move_lot_form"/>
+		<field name="context">{'contact_display': 'partner'}</field>
 	</record>
 	<menuitem name="Inventory Control/Delivery Order" id="menu_action_move_form" action="action_move_form"/>
 	<record model="ir.actions.act_window" id="action_move_tree">
@@ -708,6 +711,7 @@
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('state','=','draft')]</field>
+		<field name="context">{'contact_display': 'partner'}</field>
 	</record>
 	<menuitem name="Inventory Control/Delivery Order/Delivery Orders to Process" action="action_move_tree" id="menu_move_draft"/>