From 0651dcfe4d4966fc848ab7da317eaa989a8796af Mon Sep 17 00:00:00 2001
From: pinky <>
Date: Wed, 10 Jan 2007 05:32:48 +0000
Subject: [PATCH] ORM: 	If select unactive ressources: show all ressources,
 not only 	unactive ones SALE: 	View small bugfix to not show the pos
 view Purchase Group Wizard: 	Bugfix that prevented some grouping of PO

bzr revid: pinky-18ce5b4bc6019ffe1820bf6c7d4dd4f89f44f56b
---
 addons/purchase/wizard/wizard_group.py | 3 +++
 addons/sale/sale_view.xml              | 1 +
 2 files changed, 4 insertions(+)

diff --git a/addons/purchase/wizard/wizard_group.py b/addons/purchase/wizard/wizard_group.py
index 8ebca0e223b..b07fd83c853 100644
--- a/addons/purchase/wizard/wizard_group.py
+++ b/addons/purchase/wizard/wizard_group.py
@@ -59,6 +59,9 @@ def _mergeOrders(self, cr, uid, data, context):
 		list_key = []
 		for field in fields:
 			field_val = getattr(br, field)
+			if field in ('product_id','move_dest_id'):
+				if not field_val:
+					field_val = False
 			if isinstance(field_val, browse_record):
 				field_val = field_val.id
 			elif isinstance(field_val, list):
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 5040e418860..e147b520647 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -269,6 +269,7 @@
 	<record model="ir.ui.view" id="view_order_pos_form">
 		<field name="name">sale.order.pos</field>
 		<field name="model">sale.order</field>
+		<field name="priority">25</field>
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Sales Order POS">