[REM] completion in Gantt chart tasks and projects, not supported by OpenERP and...

[odoo/odoo.git] / addons / marketing_campaign / report / campaign_analysis_view.xml

diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index aa994fc..1bfdf69 100644 (file)
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -11,6 +11,7 @@
                 <field name="month" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="date" invisible="1"/>
+                <field name="state" invisible="1"/>
                 <field name="campaign_id" invisible="1"/>
                 <field name="activity_id" invisible="1"/>
                 <field name="segment_id" invisible="1"/>
@@ -31,12 +32,17 @@
         <field name="arch" type="xml">
             <search string="Campaign Analysis">
                    <group>
-                    <filter icon="terp-go-year"
-                            string="This Year"
+                    <filter icon="terp-go-year" name="year"
+                            string="Year"
                             domain="[('year','=',time.strftime('%%Y'))]"/>
+                    <separator orientation="vertical"/>
+
                     <filter icon="terp-go-month"
-                            string="This Month"
+                            string="Month" name="This Month"
                             domain="[('month','=',time.strftime('%%m'))]"/>
+                    <filter icon="terp-go-month" string="    Month-1    "
+                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"/>
+
                     <filter icon="terp-go-today"
                             string="Today"
                             domain="[('date','=',time.strftime('%%Y/%%m/%%d'))]"/>
@@ -44,7 +50,7 @@
                     <filter icon="terp-gtk-go-back-rtl"
                             string="To Do"
                             domain="[('state','=','todo')]"/>
-                    <filter icon="terp-camera_test"
+                    <filter icon="terp-dialog-close"
                             string="Done"
                             domain="[('state','=','done')]"/>
                     <filter icon="terp-emblem-important"
@@ -58,14 +64,14 @@
                     <field name="country_id"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Group By..." colspan="10" col="12">
+                <group expand="0" string="Group By...">
                     <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
                     <filter string="Segment" name ="Segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}" />
                     <filter string="Activity" name ="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}" />
                     <filter string="Resource" icon="terp-accessories-archiver" context="{'group_by':'res_id'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
@@ -80,12 +86,12 @@
         <field name="res_model">campaign.analysis</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree</field>
-        <field name="context">{'group_by': [], 'search_default_Campaign': 1, 'search_default_Segment': 1, 'group_by_no_leaf':1}</field>
+        <field name="context">{'search_default_year': 1,"search_default_This Month":1,'group_by': [], 'search_default_Campaign': 1, 'search_default_Segment': 1, 'group_by_no_leaf':1}</field>
         <field name="search_view_id" ref="view_campaign_analysis_search"/>
     </record>
 
-    <menuitem name="Reporting" id="base.menu_report_association" parent="base.marketing_menu"/>
-    <menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="base.menu_report_association" sequence="2"/>
+    <menuitem name="Reporting" id="base.menu_report_marketing" parent="base.marketing_menu"/>
+    <menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="base.menu_report_marketing" sequence="2"/>
 
     </data>
 </openerp>