[USA] replaced red button class oe_form_button_active_flow to oe_highlight

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

diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index f40769c..457e221 100644 (file)
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -7,9 +7,9 @@
           <menuitem name="Reporting" parent="base.menu_tools"
               id="base.menu_lunch_reporting" sequence="6" groups="base.group_tool_manager"/>
 
-          <menuitem name="Lunch Orders"
-              parent="base.menu_lunch_reporting"
-              id="menu_lunch_reporting_order" sequence="1" />
+          <menuitem name="Lunch"
+              parent="base.menu_reporting"
+              id="menu_lunch_reporting_order" sequence="55" />
 
           <menuitem name="Configuration" parent="base.menu_tools"
               id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager"/>
@@ -23,17 +23,23 @@
             <field name="name">Order</field>
             <field name="model">lunch.order</field>
             <field name="arch" type="xml">
-                <form string="Order">
-                    <group colspan="2" col="4">
-                        <field name="user_id" select="1"/>
-                        <field name="date" select="1"/>
-                        <field name="product" select="1" on_change="onchange_product(product)"/>
+                <form 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" class="oe_form_button_return_flow"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed"/>
+                </header>
+                <sheet string="Order">
+                    <group col="4">
+                        <field name="user_id"/>
+                        <field name="date"/>
+                        <field name="product" on_change="onchange_product(product)"/>
                         <field name="category"/>
                         <field name="descript"/>
                         <field name="price"/>
                         <field name="cashmove"/>
-                        <field name="state"/>
                     </group>
+                </sheet>
                 </form>
             </field>
         </record>
@@ -45,7 +51,7 @@
             <field name="model">lunch.order</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('confirmed')" string="Order">
+                <tree colors="blue:state == 'draft';black:state == 'confirmed'" string="Order">
                     <field name="date"/>
                     <field name="user_id"/>
                     <field name="product"/>
@@ -53,16 +59,6 @@
                     <field name="category"/>
                     <field name="price" sum="Total price"/>
                     <field name="state"/>
-                    <button colspan="1"
-                              name="%(action_lunch_order_cancel)d"
-                              string="Cancel Order"
-                              type="action" states="confirmed"
-                              icon="gtk-cancel" />
-                    <button colspan="1"
-                              name="%(action_lunch_order_confirm)d"
-                              string="Confirm Order"
-                              type="action" states="draft"
-                              icon="terp-gtk-go-back-rtl" />
                 </tree>
             </field>
         </record>
@@ -83,7 +79,7 @@
                     <field name="user_id"/>
                     <field name="date"/>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20">
+                    <group expand="0" string="Group By...">
                         <filter string="Category" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'category'}"/>
                     </group>
                 </search>
@@ -109,9 +105,9 @@
             <field name="name">Cashboxes</field>
             <field name="model">lunch.cashbox</field>
             <field name="arch" type="xml">
-                <form string="Cashboxes">
-                    <field name="name" select="1"/>
-                    <field name="manager" select="1"/>
+                <form string="Cashboxes" version="7.0">
+                    <field name="name"/>
+                    <field name="manager"/>
                 </form>
             </field>
         </record>
@@ -124,9 +120,9 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Cashboxes" colors="red:sum_remain&lt;=0">
-                    <field name="name" select="1"/>
-                    <field name="manager" select="1"/>
-                    <field name="sum_remain" select="1"/>
+                    <field name="name"/>
+                    <field name="manager"/>
+                    <field name="sum_remain"/>
                 </tree>
             </field>
         </record>
@@ -149,13 +145,15 @@
             <field name="name">CashMove</field>
             <field name="model">lunch.cashmove</field>
             <field name="arch" type="xml">
-                <form string="CashMove">
-                    <field name="name" select="1"/>
-                    <field name="user_cashmove" select="1"/>
-                    <field name="amount"/>
-                    <field name="box" select="1"/>
-                    <field name="create_date" select="1"/>
-                    <field name="active" select="1"/>
+                <form string="CashMove" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="user_cashmove"/>
+                        <field name="amount"/>
+                        <field name="box"/>
+                        <field name="create_date"/>
+                        <field name="active"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -169,10 +167,10 @@
             <field name="arch" type="xml">
                 <tree string="CashMove" editable="top">
                     <field name="create_date"/>
-                    <field name="box" select="1"/>
-                    <field name="name" select="1" required="1"/>
-                    <field name="user_cashmove" select="1"/>
-                    <field name="amount" select="1" sum="Total amount"/>
+                    <field name="box"/>
+                    <field name="name" required="1"/>
+                    <field name="user_cashmove"/>
+                    <field name="amount" sum="Total amount"/>
                 </tree>
             </field>
         </record>
@@ -187,11 +185,10 @@
                 <search string="Search CashMove">
                     <filter icon="terp-go-today" name="Today" string="Today" domain="[('create_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59'))]"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="user_cashmove"/>
                     <field name="create_date"/>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20">
+                    <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" domain="[]"  context="{'group_by':'user_cashmove'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Box" icon="terp-dolar" domain="[]"  context="{'group_by':'box'}"/>
@@ -222,9 +219,9 @@
             <field name="name"> Category of product </field>
             <field name="model">lunch.category</field>
             <field name="arch" type="xml">
-                <form string="Category">
-                    <separator string="Category related to Products" colspan="4"/>
-                    <field name="name" select="1"/>
+                <form string="Category" version="7.0">
+                    <separator string="Category Related to Products" colspan="4"/>
+                    <field name="name"/>
                 </form>
             </field>
         </record>
@@ -237,7 +234,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Order">
-                    <field name="name" select="1"/>
+                    <field name="name"/>
                 </tree>
             </field>
         </record>
@@ -256,12 +253,19 @@
             <field name="type">form</field>
             <field name="model">lunch.product</field>
             <field name="arch" type="xml">
-                <form string="Products">
-                    <field name="name" select="1"/>
-                    <field name="category_id" widget="selection"/>
-                    <field name="description" />
-                    <field name="price" />
-                    <field name="active"/>
+                <form string="Products" version="7.0">
+                     <group col="6">
+                          <field name="name"/>
+                          <field name="category_id"/>
+                          <field name="price" />
+                     </group>
+                     <notebook colspan="4">
+                         <page string="General Information">
+                              <field name="active"/>
+                              <separator string="Description" colspan="4" />
+                              <field name="description" nolabel="1" colspan="4" />
+                          </page>
+                     </notebook>
                 </form>
             </field>
         </record>
@@ -276,8 +280,8 @@
                 <tree string="Products">
                     <field name="name"/>
                     <field name="category_id"/>
-                    <field name="description"/>
                     <field name="price"/>
+                    <field name="description"/>
                 </tree>
             </field>
         </record>
@@ -291,8 +295,7 @@
             <field name="arch" type="xml">
                 <search string="Products">
                     <field name="name" />
-                    <field name="category_id" widget="selection"/>
-                    <field name="description" />
+                    <field name="category_id"/>
                     <field name="price"/>
                 </search>
             </field>
@@ -328,13 +331,13 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Box Amount by User">
-                     <field name="date" invisible="1"/>
+                    <field name="date" invisible="1"/>
                     <field name="year" invisible="1"/>
                     <field name="day" invisible="1"/>
                     <field name="month" invisible="1"/>
-                    <field name="box" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="amount" select="1" sum="Total box" />
+                    <field name="box"/>
+                    <field name="user_id"/>
+                    <field name="amount" sum="Total box" />
                 </tree>
             </field>
         </record>
@@ -346,10 +349,14 @@
             <field name="model">report.lunch.amount</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Box Amount by User">
-                    <field name="user_id" select="1"/>
-                    <field name="box" select="1"/>
-                    <field name="amount" select="1"/>
+                <form string="Box Amount by User" version="7.0">
+                 <sheet>
+                    <group col="4">
+                        <field name="user_id"/>
+                        <field name="box"/>
+                        <field name="amount"/>
+                    </group>
+                 </sheet>   
                 </form>
             </field>
         </record>
@@ -363,9 +370,11 @@
             <field name="arch" type="xml">
                 <search string="Box Amount by User">
                     <group>
-                        <filter icon="terp-go-year" string="  Year  "
+                        <filter icon="terp-go-year" string="  Year  " name="year"
                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                         help="Box amount in current year"/>
+                    <separator orientation="vertical"/>
+
                         <filter icon="terp-go-month" string="   Month   "
                                 name="month"
                                 domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
@@ -375,12 +384,12 @@
                          domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                          help="Box amount in last month"/>
                     <separator orientation="vertical"/>
-                        <field name="user_id" select="1"/>
-                        <field name="box" select="1"/>
-                        <field name="amount" select="1"/>
+                        <field name="user_id"/>
+                        <field name="box"/>
+                        <field name="amount"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="4">
+                    <group expand="0" string="Group By...">
                         <filter string="Box" icon="terp-dolar" context="{'group_by':'box'}"/>
                     </group>
                 </search>
@@ -394,6 +403,7 @@
             <field name="res_model">report.lunch.amount</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_year': 1,"search_default_month":1}</field>
             <field name="search_view_id" ref="view_report_lunch_amount_search"/>
         </record>