[MERGE] trunk

bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw

2 files changed, 8 insertions, 28 deletions

diff --git a/addons/membership/report/report_membership.py b/addons/membership/report/report_membership.py
index ef7b790aeca..273ec0db74f 100644
--- a/addons/membership/report/report_membership.py
+++ b/addons/membership/report/report_membership.py
@@ -59,7 +59,7 @@ class report_membership(osv.osv):
         'associate_member_id': fields.many2one('res.partner', 'Associate Member', readonly=True),
         'membership_id': fields.many2one('product.product', 'Membership Product', readonly=True),
         'membership_state': fields.selection(STATE, 'Current Membership State', readonly=True),
-        'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
+        'user_id': fields.many2one('res.users', 'Salesperson', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True)
         }
 
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index b0ac01ac89f..81e1a3db97c 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -7,7 +7,6 @@
         <record model="ir.ui.view" id="view_report_membership_tree1">
             <field name="name">report.membership.tree</field>
             <field name="model">report.membership</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:membership_state == 'draft';black:membership_state in ('open','free');gray:membership_state in ('done','cancel') " string="Membership">
                     <field name="partner_id"/>
@@ -32,43 +31,25 @@
         <record model="ir.ui.view" id="view_report_membership_search">
             <field name="name">report.membership.search</field>
             <field name="model">report.membership</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Membership">
-                    <group>
-                        <filter string="Year" icon="terp-go-year" name="year"
-                            domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_from','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Events created in current year"/>
-                        <separator orientation="vertical"/>
-                        <filter string="   Month   " icon="terp-go-month" name="this_month"
-                        domain="[('date_from','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Events created in current month"/>
-                        <filter icon="terp-go-month" string="    Month-1    "
-                        domain="[('date_from','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Events created in last month"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Forecast" icon="terp-gtk-jump-to-ltr" context="{'waiting_invoiced_totpending_visible':0}" help="This will display waiting, invoiced and total pending columns"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Revenue Done" name="Revenue" icon="terp-dolar" context="{'paid_old_totearned_visible':0}" help="This will display paid, old and total earned columns"/>
-                        <field name="partner_id"/>
-                        <field name="membership_id"/>
-                        <field name="user_id"/>
-                    </group>
-                    <newline/>
+                    <field name="date_from"/>
+                    <filter string="Forecast" icon="terp-gtk-jump-to-ltr" context="{'waiting_invoiced_totpending_visible':0}" help="This will display waiting, invoiced and total pending columns"/>
+                    <filter string="Revenue Done" name="Revenue" icon="terp-dolar" context="{'paid_old_totearned_visible':0}" help="This will display paid, old and total earned columns"/>
+                    <field name="partner_id"/>
+                    <field name="membership_id"/>
+                    <field name="user_id"/>
                     <group expand="1" string="Group By...">
-                        <filter string="Salesman" icon="terp-personal" name="salesman"
+                        <filter string="Salesperson" icon="terp-personal" name="salesman"
                             domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Associated Partner" icon="terp-partner" name="associate_member_id"
                             domain="[]" context="{'group_by':'associate_member_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Membership Product" icon="terp-accessories-archiver" name="product"
                             domain="[]" context="{'group_by':'membership_id'}"/>
                         <filter string="Current Membership State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'membership_state'}"/>
-                        <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Company" icon="terp-go-home"
                             domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <separator orientation="vertical"/>
                         <filter string="Year" name="year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'year'}"/>
                         <filter string="Month" name="month" icon="terp-go-month"
@@ -81,7 +62,6 @@
         <record model="ir.ui.view" id="view_report_membership_graph1">
             <field name="name">report.membership.graph1</field>
             <field name="model">report.membership</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Membership" type="bar">
                     <field name="year" />