[MERGE] Merged with addons/trunk.

bzr revid: tde@openerp.com-20120814152634-ix63oxwcyrfkku4t

5 files changed, 1 insertions, 18 deletions

diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index d953dfbd1a9..bf438a538f9 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -23,7 +23,7 @@
             <field name="name">Order</field>
             <field name="model">lunch.order</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Lunch Order" version="7.0">
                 <header>
                     <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" states="draft" class="oe_highlight"/>
                     <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action" states="confirmed" />
@@ -53,7 +53,6 @@
         <record model="ir.ui.view" id="view_lunch_order_tree">
             <field name="name">Order</field>
             <field name="model">lunch.order</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';black:state == 'confirmed'" string="Order">
                     <field name="date"/>
@@ -72,7 +71,6 @@
         <record id="view_lunch_order_filter" model="ir.ui.view">
             <field name="name">lunch.order.list.select</field>
             <field name="model">lunch.order</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Lunch Order">
                     <field name="date"/>
@@ -119,7 +117,6 @@
         <record model="ir.ui.view" id="view_lunch_cashbox_tree">
             <field name="name">Cashboxes</field>
             <field name="model">lunch.cashbox</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Cashboxes" colors="red:sum_remain&lt;=0">
                     <field name="name"/>
@@ -167,7 +164,6 @@
         <record model="ir.ui.view" id="view_lunch_cashmove_tree">
             <field name="name">CashMove</field>
             <field name="model">lunch.cashmove</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="CashMove" editable="top">
                     <field name="create_date"/>
@@ -184,7 +180,6 @@
         <record id="view_lunch_cashmove_filter" model="ir.ui.view">
             <field name="name">lunch.cashmove.list.select</field>
             <field name="model">lunch.cashmove</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search CashMove">
                     <field name="create_date"/>
@@ -230,7 +225,6 @@
         <record model="ir.ui.view" id="view_lunch_category_tree">
             <field name="name">Category</field>
             <field name="model">lunch.category</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Order">
                     <field name="name"/>
@@ -249,7 +243,6 @@
 
         <record model="ir.ui.view" id="view_lunch_product_form">
             <field name="name">Products</field>
-            <field name="type">form</field>
             <field name="model">lunch.product</field>
             <field name="arch" type="xml">
                 <form string="Products" version="7.0">
@@ -275,7 +268,6 @@
         <record model="ir.ui.view" id="view_lunch_product_tree">
             <field name="name">Products</field>
             <field name="model">lunch.product</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Products">
                     <field name="name"/>
@@ -291,7 +283,6 @@
         <record model="ir.ui.view" id="view_lunch_product_search">
             <field name="name">Products</field>
             <field name="model">lunch.product</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Products">
                     <field name="name" string="Product"/>
@@ -328,7 +319,6 @@
         <record model="ir.ui.view" id="view_report_lunch_amount_tree">
             <field name="name">Lunch amount</field>
             <field name="model">report.lunch.amount</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Box Amount by User">
                     <field name="date" invisible="1"/>
@@ -347,7 +337,6 @@
         <record model="ir.ui.view" id="view_report_lunch_amount_form">
             <field name="name">Lunch amount</field>
             <field name="model">report.lunch.amount</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Box Amount by User" version="7.0">
                  <sheet>
@@ -366,7 +355,6 @@
         <record model="ir.ui.view" id="view_report_lunch_amount_search">
             <field name="name">Lunch amount</field>
             <field name="model">report.lunch.amount</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Box Amount by User">
                     <field name="date"/>
diff --git a/addons/lunch/report/report_lunch_order_view.xml b/addons/lunch/report/report_lunch_order_view.xml
index 717573687df..e92007592ac 100644
--- a/addons/lunch/report/report_lunch_order_view.xml
+++ b/addons/lunch/report/report_lunch_order_view.xml
@@ -5,7 +5,6 @@
        <record id="view_report_lunch_order_tree" model="ir.ui.view">
         <field name="name">report.lunch.order.tree</field>
         <field name="model">report.lunch.order</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Sales Analysis">
                 <field name="date" invisible="1"/>
@@ -22,7 +21,6 @@
     <record id="view_report_lunch_order_search" model="ir.ui.view">
         <field name="name">report.lunch.order.search</field>
         <field name="model">report.lunch.order</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Lunch Order Analysis">
                 <field name="date"/>
diff --git a/addons/lunch/wizard/lunch_cashbox_clean_view.xml b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
index eb05c0dc304..5ba2a6ff3bf 100644
--- a/addons/lunch/wizard/lunch_cashbox_clean_view.xml
+++ b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
@@ -7,7 +7,6 @@
           <record id="view_lunch_cashbox_clean" model="ir.ui.view">
             <field name="name">lunch.cashbox.clean.form</field>
             <field name="model">lunch.cashbox.clean</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reset cashbox" version="7.0">
                     <group>
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index cb10eb57fd0..8421dd74f9b 100644
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -7,7 +7,6 @@
         <record id="view_lunch_order_cancel" model="ir.ui.view">
             <field name="name">lunch.order.cancel.form</field>
             <field name="model">lunch.order.cancel</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Cancel Order" version="7.0">
                     <group col="4" >
diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
index 282b79539f8..dadde4ed089 100644
--- a/addons/lunch/wizard/lunch_order_confirm_view.xml
+++ b/addons/lunch/wizard/lunch_order_confirm_view.xml
@@ -7,7 +7,6 @@
         <record id="view_lunch_order_confirm" model="ir.ui.view">
             <field name="name">lunch.order.confirm.form</field>
             <field name="model">lunch.order.confirm</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Confirm" version="7.0">
                     <group col="4">