[FIX]some changes

bzr revid: api@openerp.com-20121106155523-vhpbuw6lfniqqgeu

5 files changed, 35 insertions, 184 deletions

diff --git a/addons/lunch/lunch_demo.xml b/addons/lunch/lunch_demo.xml
index dedd6af8fed..4f38760b64a 100644
--- a/addons/lunch/lunch_demo.xml
+++ b/addons/lunch/lunch_demo.xml
@@ -26,44 +26,44 @@
             <field name="supplier_lunch">True</field>
         </record>
 
-        <record model="lunch.product" id="product_club">
-            <field name="name">Club</field>
+        <record model="lunch.product" id="product_cheese_ham">
+            <field name="name">Cheese And Ham</field>
             <field name="category_id" eval="str(ref('categ_sandwich'))"/>
             <field name="price">3.30</field>
             <field name="supplier" eval="str(ref('partner_coin_gourmand'))"/>
-            <field name="descrîption">Jambon, Fromage, Salade, Tomates, comcombres, oeufs</field>
+            <field name="description">Cheese, Ham, Salad, Tomatoes, cucumbers, eggs</field>
         </record>
 
-        <record model="lunch.product" id="product_campagnard">
-            <field name="name">Le Campagnard</field>
+        <record model="lunch.product" id="product_country">
+            <field name="name">The Country</field>
             <field name="category_id" eval="str(ref('categ_sandwich'))"/>
             <field name="price">3.30</field>
             <field name="supplier" eval="str(ref('partner_coin_gourmand'))"/>
-            <field name="descrîption">Brie, Miel, Cerneaux de noix</field>
+            <field name="description">Brie, Honey, Walnut Kernels</field>
         </record>
 
-        <record model="lunch.product" id="product_pate_creme">
-            <field name="name">Le Pâté Crème</field>
+        <record model="lunch.product" id="product_tuna">
+            <field name="name">Tuna</field>
             <field name="category_id" eval="str(ref('categ_sandwich'))"/>
             <field name="price">2.50</field>
             <field name="supplier" eval="str(ref('partner_coin_gourmand'))"/>
-            <field name="descrîption"></field>
+            <field name="description">Tuna, Mayonnaise</field>
         </record>
 
         <record model="lunch.product" id="product_gouda">
-            <field name="name">Fromage Gouda</field>
+            <field name="name">Gouda Cheese</field>
             <field name="category_id" eval="str(ref('categ_sandwich'))"/>
             <field name="price">2.50</field>
             <field name="supplier" eval="str(ref('partner_coin_gourmand'))"/>
-            <field name="descrîption"></field>
+            <field name="description"></field>
         </record>
 
-        <record model="lunch.product" id="product_poulet_curry">
-            <field name="name">Poulet Curry</field>
+        <record model="lunch.product" id="product_chicken_curry">
+            <field name="name">Chicken Curry</field>
             <field name="category_id" eval="str(ref('categ_sandwich'))"/>
             <field name="price">2.60</field>
             <field name="supplier" eval="str(ref('partner_coin_gourmand'))"/>
-            <field name="descrîption"></field>
+            <field name="description"></field>
         </record>
 
         <record model="lunch.product" id="product_margherita">
@@ -71,7 +71,7 @@
             <field name="category_id" eval="str(ref('categ_pizza'))"/>
             <field name="price">6.90</field>
             <field name="supplier" eval="str(ref('partner_pizza_inn'))"/>
-            <field name="descrîption">Tomates, Mozzarella</field>
+            <field name="description">Tomatoes, Mozzarella</field>
         </record>
 
         <record model="lunch.product" id="product_italiana">
@@ -79,23 +79,23 @@
             <field name="category_id" eval="str(ref('categ_pizza'))"/>
             <field name="price">7.40</field>
             <field name="supplier" eval="str(ref('partner_pizza_inn'))"/>
-            <field name="descrîption">Tomates fraiches, Basilic, Mozzarella</field>
+            <field name="description">Fresh Tomatoes, Basil, Mozzarella</field>
         </record>
 
         <record model="lunch.product" id="product_Bolognese">
-            <field name="name">Pâtes Bolognese</field>
+            <field name="name">Bolognese Pasta</field>
             <field name="category_id" eval="str(ref('categ_pasta'))"/>
             <field name="price">7.70</field>
             <field name="supplier" eval="str(ref('partner_pizza_inn'))"/>
-            <field name="descrîption"></field>
+            <field name="description"></field>
         </record>
 
          <record model="lunch.product" id="product_Napoli">
-            <field name="name">Pâtes Napoli</field>
+            <field name="name">Napoli Pasta</field>
             <field name="category_id" eval="str(ref('categ_pasta'))"/>
             <field name="price">7.70</field>
             <field name="supplier" eval="str(ref('partner_pizza_inn'))"/>
-            <field name="descrîption">Tomates, Basilic</field>
+            <field name="description">Tomatoes, Basil</field>
         </record>
 
         <record model="lunch.order" id="order_1">
@@ -138,7 +138,7 @@
             <field name="date" eval="time.strftime('2012-10-22')"/>
             <field name="state">confirmed</field>
             <field name="supplier" ref="partner_pizza_inn"/>
-            <field name="note">+Champignons</field>
+            <field name="note">+Mushrooms</field>
             <field name="order_id" ref="order_2"/>
         </record>
 
@@ -148,7 +148,7 @@
             <field name="date" eval="time.strftime('2012-10-24')"/>
             <field name="state">cancelled</field>
             <field name="supplier" ref="partner_coin_gourmand"/>
-            <field name="note">+Salade +Tomates +Comcombres</field>
+            <field name="note">+Salad +Tomatoes +Cucumbers</field>
             <field name="order_id" ref="order_3"/>
         </record>
 
diff --git a/addons/lunch/report/groups.xml b/addons/lunch/report/groups.xml
new file mode 100644
index 00000000000..75ab0836b12
--- /dev/null
+++ b/addons/lunch/report/groups.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+        <record id="group_lunch_manager" model="res.groups">
+            <field name="name">Lunch / Manager</field>
+        </record>
+        <record id="group_lunch_user" model="res.groups">
+            <field name="name">Lunch / User</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml
index b09b59bb96b..1ab52a88bda 100644
--- a/addons/lunch/report/order.rml
+++ b/addons/lunch/report/order.rml
@@ -149,10 +149,10 @@
               <para style="terp_default_9_left9">[[ formatLang(lines.date,date='True') ]]</para>
             </td>
             <td>
-              <para style="terp_default_9">[[ (lines.product and lines.product.name) or '' ]]</para>
+              <para style="terp_default_9">[[ (lines.product_id and lines.product_id.name) or '' ]]</para>
             </td>
             <td>
-              <para style="terp_default_9">[[ lines.descript]]</para>
+              <para style="terp_default_9">[[ lines.note]]</para>
             </td>
             <td>
               <para style="terp_default_9_right">[[ lines.price ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para>
diff --git a/addons/lunch/report/report_lunch_order_view.xml b/addons/lunch/report/report_lunch_order_view.xml
index b916cab79f9..f7bfdcd7395 100644
--- a/addons/lunch/report/report_lunch_order_view.xml
+++ b/addons/lunch/report/report_lunch_order_view.xml
@@ -2,47 +2,6 @@
 <openerp>
     <data>
 
-       <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.line</field>
-        <field name="arch" type="xml">
-            <tree string="Sales Analysis">
-                <field name="date" invisible="1"/>
-                <field name="year" invisible="1"/>
-                <field name="day" invisible="1"/>
-                <field name="month" invisible="1"/>
-                <field name="user_id" />
-                <field name="note" />
-                <field name="price_total"/>
-            </tree>
-        </field>
-    </record>
-
-    <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.line</field>
-        <field name="arch" type="xml">
-            <search string="Lunch Order Analysis">
-                <field name="date"/>
-                <group expand="0" string="Group By...">
-                    <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                    <filter string="Box" icon="terp-dolar" context="{'group_by':'box_name'}"/>
-                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
-                </group>
-            </search>
-        </field>
-    </record>
-
-    <record id="action_report_lunch_order_all" model="ir.actions.act_window">
-        <field name="name">Lunch Order Analysis</field>
-        <field name="res_model">report.lunch.order.line</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree</field>
-        <field name="search_view_id" ref="view_report_lunch_order_search"/>
-        <field name="context">{'search_default_month':1,'search_default_User':1}</field>
-    </record>
 
     </data>
 </openerp>
diff --git a/addons/lunch/security/groups.xml b/addons/lunch/security/groups.xml
deleted file mode 100644
index bf6fb63ad30..00000000000
--- a/addons/lunch/security/groups.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data>
-        <record id="group_lunch_manager" model="res.groups">
-            <field name="name">Lunch / Manager</field>
-        </record>
-        <record id="group_lunch_user" model="res.groups">
-            <field name="name">Lunch / User</field>
-        </record>
-        <record id="ir_model_access_lunchorders0" model="ir.model.access">
-            <field name="model_id" ref="model_lunch_order"/>
-            <field eval="1" name="perm_read"/>
-            <field name="name">lunch orders</field>
-            <field eval="1" name="perm_unlink"/>
-            <field eval="1" name="perm_write"/>
-            <field eval="1" name="perm_create"/>
-            <field model="res.groups" name="group_id" search="[('full_name', '=', u'lunch / Manager')]"/>
-        </record>
-        <record id="ir_model_access_lunchorders1" model="ir.model.access">
-            <field name="model_id" ref="model_lunch_order"/>
-            <field eval="1" name="perm_read"/>
-            <field name="name">lunch orders</field>
-            <field eval="0" name="perm_unlink"/>
-            <field eval="1" name="perm_write"/>
-            <field eval="1" name="perm_create"/>
-            <field model="res.groups" name="group_id" search="[('full_name', '=', u'lunch / User')]"/>
-        </record>
-        <record id="ir_model_access_lunchorder_lines0" model="ir.model.access">
-            <field name="model_id" ref="model_lunch_order_line"/>
-            <field eval="1" name="perm_read"/>
-            <field name="name">lunch order lines</field>
-            <field eval="1" name="perm_unlink"/>
-            <field eval="1" name="perm_write"/>
-            <field eval="1" name="perm_create"/>
-            <field model="res.groups" name="group_id" search="[('full_name', '=', u'lunch / Manager')]"/>
-        </record>
-        <record id="ir_model_access_lunchorder_lines1" model="ir.model.access">
-            <field name="model_id" ref="model_lunch_order_line"/>
-            <field eval="1" name="perm_read"/>
-            <field name="name">lunch order lines</field>
-            <field eval="1" name="perm_unlink"/>
-            <field eval="1" name="perm_write"/>
-            <field eval="1" name="perm_create"/>
-            <field model="res.groups" name="group_id" search="[('full_name', '=', u'lunch / User')]"/>
-        </record>
-        <record id="ir_model_access_lunchcashmoves0" model="ir.model.access">
-            <field name="model_id" ref="model_lunch_cashmove"/>
-            <field eval="1" name="perm_read"/>
-            <field name="name">lunch cashmoves</field>
-            <field eval="1" name="perm_unlink"/>
-            <field eval="1" name="perm_write"/>
-            <field eval="1" name="perm_create"/>
-            <field model="res.groups" name="group_id" search="[('full_name', '=', u'lunch / Manager')]"/>
-        </record>
-        <record id="ir_model_access_lunchcashmoves1" model="ir.model.access">
-            <field name="model_id" ref="model_lunch_cashmove"/>
-            <field eval="1" name="perm_read"/>
-            <field name="name">lunch cashmoves</field>
-            <field eval="0" name="perm_unlink"/>
-            <field eval="0" name="perm_write"/>
-            <field eval="0" name="perm_create"/>
-            <field model="res.groups" name="group_id" search="[('full_name', '=', u'lunch / User')]"/>
-        </record>
-        <record id="ir_model_access_lunchproducts0" model="ir.model.access">
-            <field name="model_id" ref="model_lunch_product"/>
-            <field eval="1" name="perm_read"/>
-            <field name="name">lunch products</field>
-            <field eval="1" name="perm_unlink"/>
-            <field eval="1" name="perm_write"/>
-            <field eval="1" name="perm_create"/>
-            <field model="res.groups" name="group_id" search="[('full_name', '=', u'lunch / Manager')]"/>
-        </record>
-        <record id="ir_model_access_lunchproducts1" model="ir.model.access">
-            <field name="model_id" ref="model_lunch_product"/>
-            <field eval="1" name="perm_read"/>
-            <field name="name">lunch products</field>
-            <field eval="0" name="perm_unlink"/>
-            <field eval="0" name="perm_write"/>
-            <field eval="0" name="perm_create"/>
-            <field model="res.groups" name="group_id" search="[('full_name', '=', u'lunch / User')]"/>
-        </record>
-        <record id="ir_model_access_lunchproductcategories0" model="ir.model.access">
-            <field name="model_id" ref="model_lunch_product_category"/>
-            <field eval="1" name="perm_read"/>
-            <field name="name">lunch products</field>
-            <field eval="1" name="perm_unlink"/>
-            <field eval="1" name="perm_write"/>
-            <field eval="1" name="perm_create"/>
-            <field model="res.groups" name="group_id" search="[('full_name', '=', u'lunch / Manager')]"/>
-        </record>
-        <record id="ir_model_access_lunchproductcategories1" model="ir.model.access">
-            <field name="model_id" ref="model_lunch_product_category"/>
-            <field eval="1" name="perm_read"/>
-            <field name="name">lunch products</field>
-            <field eval="0" name="perm_unlink"/>
-            <field eval="0" name="perm_write"/>
-            <field eval="0" name="perm_create"/>
-            <field model="res.groups" name="group_id" search="[('full_name', '=', u'lunch / User')]"/>
-        </record>
-        <record id="ir_model_access_lunchalerts0" model="ir.model.access">
-            <field name="model_id" ref="model_lunch_alert"/>
-            <field eval="1" name="perm_read"/>
-            <field name="name">lunch alerts</field>
-            <field eval="1" name="perm_unlink"/>
-            <field eval="1" name="perm_write"/>
-            <field eval="1" name="perm_create"/>
-            <field model="res.groups" name="group_id" search="[('full_name', '=', u'lunch / Manager')]"/>
-        </record>
-        <record id="ir_model_access_lunchalerts1" model="ir.model.access">
-            <field name="model_id" ref="model_lunch_alert"/>
-            <field eval="1" name="perm_read"/>
-            <field name="name">lunch alerts</field>
-            <field eval="0" name="perm_unlink"/>
-            <field eval="0" name="perm_write"/>
-            <field eval="0" name="perm_create"/>
-            <field model="res.groups" name="group_id" search="[('full_name', '=', u'lunch / User')]"/>
-        </record>
-    </data>
-</openerp>