X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Flunch%2Flunch_view.xml;h=c5fa52afe29e4072a1bd196867f2b389a1a08210;hb=ec30b2133680246d407ee75fd1fe8361100ca194;hp=6632cf7381e1e74531e5814f91a3ebb2e6521033;hpb=4b47e50d139de536b7bc80392bbdd0f3713e2ad9;p=odoo%2Fodoo.git

diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 6632cf7..c5fa52a 100644
--- 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="Order's Month" context="{'group_by':'date'}" help="Supplier Order's by Month"/>
+                        <filter name="group_by_date" string="Order Month" context="{'group_by':'date'}" help="Supplier Order by Month"/>
                     </group>
                 </search>
             </field>
@@ -85,6 +85,40 @@
             </field>
         </record>
 
+        <!--view for cashmove-->
+        <record model="ir.ui.view" id="casmove_tree_view">
+            <field name="name">cashmove tree</field>
+            <field name="model">lunch.cashmove</field>
+            <field name="arch" type="xml">
+                <tree string="cashmove tree">
+                    <field name="date"/>
+                    <field name="user_id"/>
+                    <field name="description"/>
+                    <field name="amount" sum="Total"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="casmove_form_view">
+            <field name="name">cashmove form</field>
+            <field name="model">lunch.cashmove</field>
+            <field name="arch" type="xml">
+                <form string="cashmove form" version="7.0">
+                    <sheet>
+                        <group>
+                            <field name="user_id"
+                                   context="{'default_groups_ref': ['base.group_user', 'lunch.group_lunch_user']}"/>
+                            <field name="date"/>
+                            <field name="amount"/>
+                        </group>
+                        <label for='description'/>
+                        <field name="description"/>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+
         <!--Action for Your Orders-->
         <record model="ir.actions.act_window" id="action_lunch_order_form">
             <field name="name">New Order</field>
@@ -111,6 +145,19 @@
             </field>
         </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">
+            <field name="name">cashmove tree</field>
+            <field name="model">lunch.cashmove</field>
+            <field name="arch" type="xml">
+                <tree string="cashmove tree" version="7.0" create='false'>
+                    <field name="date"/>
+                    <field name="user_id"/>
+                    <field name="description"/>
+                    <field name="amount" sum="Total"/>
+                </tree>
+            </field>
+        </record>
 
         <!--Action for Lunch cashmoves-->
         <record model="ir.actions.act_window" id="action_lunch_cashmove_form">
@@ -119,6 +166,7 @@
             <field name="view_mode">tree</field>
             <field name="search_view_id" ref="view_lunch_employee_payment_filter"/>
             <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.
@@ -175,6 +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="help" type="html">
                 <p class="oe_view_nocontent_create">
                 Click to create a new payment. 
@@ -196,6 +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="help" type="html">
                 <p class="oe_view_nocontent_create">
                 Click to create a payment. 
@@ -325,7 +375,7 @@
                         <group>
                             <group>
                                 <field name='user_id'
-                                context="{'default_groups_ref': ['base.group_user', 'lunch.group_lunch_user']}"/>
+                                context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'lunch.group_lunch_user']}"/>
                             </group>
                             <group> 
                                 <field name='date'/>
@@ -389,39 +439,6 @@
             </field>
         </record>
 
-        <!--view for cashmove-->
-        <record model="ir.ui.view" id="casmove_tree_view">
-            <field name="name">cashmove tree</field>
-            <field name="model">lunch.cashmove</field>
-            <field name="arch" type="xml">
-                <tree string="cashmove tree">
-                    <field name="date"/>
-                    <field name="user_id"/>
-                    <field name="description"/>
-                    <field name="amount" sum="Total"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="casmove_form_view">
-            <field name="name">cashmove form</field>
-            <field name="model">lunch.cashmove</field>
-            <field name="arch" type="xml">
-                <form string="cashmove form" version="7.0">
-                    <sheet>
-                        <group>
-                            <field name="user_id"
-                                context="{'default_groups_ref': ['base.group_user', 'lunch.group_lunch_user']}"/>
-                            <field name="date"/>
-                            <field name="amount"/>
-                        </group>
-                        <label for='description'/>
-                        <field name="description"/>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
         <!--view for alerts-->
         <record model="ir.ui.view" id="alert_tree_view">
             <field name="name">alert tree</field>