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
This commit is contained in:
pinky 2007-01-10 05:32:48 +00:00
parent 84c4283c1d
commit 0651dcfe4d
2 changed files with 4 additions and 0 deletions

View File

@ -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):

View File

@ -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">