From 265f5fd13ac99d863a222ddc44cc8f9058ec1b99 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Thu, 18 Oct 2012 09:56:08 +0200
Subject: [PATCH] [Conflict resolved after pull]

bzr revid: csn@openerp.com-20121018075608-9huwnmd0kev5193n
---
 addons/account/report/account_print_overdue.rml | 2 +-
 addons/event/event_view.xml                     | 2 +-
 addons/product/product_view.xml                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml
index 8b8238030fe..577cb9142a2 100644
--- a/addons/account/report/account_print_overdue.rml
+++ b/addons/account/report/account_print_overdue.rml
@@ -129,7 +129,7 @@
         </td>
         <td>
           <para style="terp_default_9">[[ o.title.name or '' ]] [[ o.name ]]</para>
-          <para style="terp_default_9">[[ display_address(o.partner_id) ]]</para>
+          <para style="terp_default_9">[[ display_address(o.partner_id)] ]]</para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index ccac74086ff..68742754166 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -133,7 +133,7 @@
                             </group>
                             <group>
                                 <field name="type" on_change="onchange_event_type(type,context)" />
-                                <field name="date_begin" on_change="onchange_start_date(date_begin,date_end)"/>
+                                <field name="date_begin"/>
                                 <field name="date_end"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
                             </group>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index b7fbcd560f7..748d6c5d7cf 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -13,7 +13,7 @@
                    <filter string="Consumable" name="consumable" icon="terp-accessories-archiver" domain="[('type','=','consu')]" help="Consumable products"/>
                    <separator/>
                    <filter string="Can be Sold" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
-                   <field name="categ_id"/>
+                   <field name="categ_id" operator="child_of"/>
                    <group expand="0" string="Context...">
                        <field name="pricelist_id" context="{'pricelist': self}" groups="product.group_sale_pricelist"/>
                        <field name="company_id" groups="base.group_multi_company"/>