[MERGE] forward port of branch 7.0 up to de07c64

[odoo/odoo.git] / addons / lunch / lunch_view.xml

diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 5cdc1f3..c5fa52a 100644 (file)
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -7,7 +7,7 @@
         <menuitem name="Administrate Orders" parent="menu_lunch" id="menu_lunch_admin" sequence="51" groups="group_lunch_manager"/>
         <menuitem name="Administrate Cash Moves" parent="menu_lunch" id="menu_lunch_cash" sequence="52" groups="group_lunch_manager"/>
         <menuitem name="Configuration" parent="menu_lunch" id="menu_lunch_config" sequence="53" groups="group_lunch_manager"/>
-        
+
          <!--View Search to group/filter by Supplier and time-->
         <record model="ir.ui.view" id="lunch_order_line_search_view">
             <field name="name">Search</field>
@@ -23,7 +23,7 @@
                     <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter name="group_by_supplier" string="By Supplier" context="{'group_by':'supplier'}"/>
-                        <filter name="group_by_date" string="By Date" context="{'group_by':'date'}"/>
+                        <filter name="group_by_date" string="Order Month" context="{'group_by':'date'}" help="Supplier Order by Month"/>
                     </group>
                 </search>
             </field>
@@ -39,7 +39,8 @@
                     <field name="user_id"/>
                     <filter name='is_payment' string="Payment" domain="[('state','=','payment')]"/>
                     <separator/>
-                    <filter name='is_mine' string="My Account" domain="[('user_id','=',uid)]"/>
+                    <filter name='is_mine_group' string="My Account grouped" domain="[('user_id','=',uid)]" context="{'group_by':'user_id'}"/>
+                    <filter name="group_by_user" string="By User" context="{'group_by':'user_id'}"/>
                 </search>
             </field>
         </record>
@@ -68,6 +69,7 @@
                     <field name="date"/>
                     <field name="order_line_ids"/>
                     <filter name='is_mine' string="My Orders" domain="[('user_id','=',uid)]"/>
+                    <filter name='by_users' string="Users" context="{'group_by':'user_id'}"/>
                 </search>
             </field>
         </record>
@@ -104,7 +106,8 @@
                 <form string="cashmove form" version="7.0">
                     <sheet>
                         <group>
-                            <field name="user_id"/>
+                            <field name="user_id"
+                                   context="{'default_groups_ref': ['base.group_user', 'lunch.group_lunch_user']}"/>
                             <field name="date"/>
                             <field name="amount"/>
                         </group>
@@ -143,7 +146,7 @@
         </record>
         <menuitem name="Previous Orders" parent="menu_lunch_title" id="menu_lunch_order_tree" action="action_lunch_order_tree" sequence="2"/>
                
-               <record model="ir.ui.view" id="casmove_tree">
+        <record model="ir.ui.view" id="casmove_tree">
             <field name="name">cashmove tree</field>
             <field name="model">lunch.cashmove</field>
             <field name="arch" type="xml">
@@ -162,8 +165,8 @@
             <field name="res_model">lunch.cashmove</field>
             <field name="view_mode">tree</field>
             <field name="search_view_id" ref="view_lunch_employee_payment_filter"/>
-            <field name="context">{"search_default_is_mine":1}</field>
-                       <field name="view_id" ref="casmove_tree"/>
+            <field name="context">{"search_default_is_mine_group":1}</field>
+            <field name="view_id" ref="casmove_tree"/>
             <field name="help" type="html">
               <p>
                 Here you can see your cash moves.<br/>A cash moves can be either an expense or a payment.
@@ -220,7 +223,7 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_lunch_cashmove_filter"/>
             <field name="context">{"search_default_group_by_user":1}</field>
-                       <field name="view_id" ref="casmove_tree_view"/>
+            <field name="view_id" ref="casmove_tree_view"/>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
                 Click to create a new payment. 
@@ -242,7 +245,7 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_lunch_employee_payment_filter"/>
             <field name="context">{"search_default_is_payment":1}</field>
-                       <field name="view_id" ref="casmove_tree_view"/>
+            <field name="view_id" ref="casmove_tree_view"/>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
                 Click to create a payment. 
@@ -330,7 +333,7 @@
             <field name="name">Order lines Tree</field>
             <field name="model">lunch.order.line</field>
             <field name="arch" type="xml">
-                <tree string="Order lines Tree"> 
+                <tree string="Order lines Tree" create="false" edit="false">
                     <field name='date'/>
                     <field name='user_id'/>
                     <field name='supplier' invisible='1'/> 
@@ -352,6 +355,7 @@
             <field name="arch" type="xml">
                 <tree string="Orders Tree">
                     <field name="date"/>
+                    <field name='user_id'/>
                     <field name="order_line_ids"/>
                     <field name="state" />
                     <field name="total" sum="Total"/>
@@ -370,7 +374,8 @@
                     <sheet>
                         <group>
                             <group>
-                                <field name='user_id'/>
+                                <field name='user_id'
+                                context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'lunch.group_lunch_user']}"/>
                             </group>
                             <group> 
                                 <field name='date'/>
@@ -434,7 +439,6 @@
             </field>
         </record>
 
-        
         <!--view for alerts-->
         <record model="ir.ui.view" id="alert_tree_view">
             <field name="name">alert tree</field>