[MERGE/IMP]:portal_event:improved view and merged with trunk

bzr revid: apa@tinyerp.com-20120907073648-z4pfduxmzh6gzn11

addons/crm/crm_lead_view.xml

@@ -297,6 +297,7 @@
                     <field name="message_summary"/>
                     <field name="message_unread"/>
                     <templates>
+                        <field name="date_deadline"/>
                         <t t-name="kanban-box">
                             <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">

addons/portal_event/event_view.xml

@@ -3,16 +3,19 @@
     <data>
 
         <!-- add visibility field to the event form view -->
-        <record id="view_employee_form" model="ir.ui.view">
+        <record id="view_event_form_portal" model="ir.ui.view">
             <field name="name">portal.event.form</field>
             <field name="model">event.event</field>
             <field name="inherit_id" ref="event.view_event_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='active']" position="before">
-                    <field name="visibility"/>
+                <xpath expr="//page[last()]" position="after">
+                    <page string="Portal Settings">
+                       <group>
+                            <field name="visibility"/>
+                        </group>
+                    </page>
                 </xpath>
             </field>
         </record>
-
     </data>
 </openerp>