Launchpad automatic translations update.

[odoo/odoo.git] / addons / subscription / subscription_view.xml

diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index dac94e8..550240d 100644 (file)
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28"/>
         <menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="4"/>
 
         <!--
@@ -15,11 +14,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscriptions">
-                    <group colspan="4">
+                    <group col="6" colspan="4">
                         <field name="name" select="1"/>
-                        <field name="active" select="1" groups="base.group_extended"/>
-                        <field name="user_id" select="1"/>
                         <field name="partner_id" select="1"/>
+                        <field name="user_id" select="1"/>
+                        <field name="active" select="1" groups="base.group_extended"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Subsription Data">
@@ -76,19 +75,23 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Subscription">
-                    <group col="10" colspan="4">
+                    <group>
                         <filter icon="terp-check"
                         string="Running"
                         domain="[('state','=','running')]"/>
                         <separator orientation="vertical"/>
+                        <filter string="This Week" icon="terp-go-week" domain="[('date_init','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_init','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
+                        <filter icon="terp-go-today" string="Today"
+                    domain="[('date_init','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('date_init','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"/>
+                        <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="user_id" select="1"/>
+                        <field name="user_id"/>
                         <field name="partner_id"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="4">
+                    <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" name="User" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Partner" icon="terp-personal" name="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Partner" icon="terp-partner" name="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
@@ -97,7 +100,7 @@
         </record>
 
         <record id="action_subscription_form" model="ir.actions.act_window">
-            <field name="name">All Subscriptions</field>
+            <field name="name">Subscriptions</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">subscription.subscription</field>
             <field name="view_type">form</field>
@@ -136,9 +139,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscription Document">
-                    <field name="name" select="1"/>
-                    <field name="active" select="1"/>
-                    <field name="model" select="1"/>
+                    <group col="6" colspan="4">
+                        <field name="name" select="1"/>
+                        <field name="model" select="1"/>
+                        <field name="active" select="1"/>
+                    </group>
+                    <newline/>
                     <field colspan="4" name="field_ids" nolabel="1"/>
                 </form>
             </field>
@@ -163,7 +169,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Subscription Document">
-                    <group col="10" colspan="4">
+                    <group>
                         <field name="name"/>
                         <field name="model"/>
                     </group>
@@ -178,6 +184,7 @@
             <field name="arch" type="xml">
                 <form string="Subscription Document Fields">
                     <field name="field" select="1"/>
+                    <newline/>
                     <field name="value"/>
                 </form>
             </field>
@@ -204,7 +211,7 @@
             <field name="search_view_id" ref="view_subscription_document_filter" />
         </record>
         <menuitem name="Configuration" parent="base.menu_tools"
-              id="base.menu_lunch_survey_root" sequence="20" groups="base.group_system" />
+              id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager" />
         <menuitem id="config_recuuring_event" name="Recurring Events" parent="base.menu_lunch_survey_root" sequence="4"/>
         <menuitem action="action_document_form" id="menu_action_document_form" parent="config_recuuring_event"/>
     </data>