[IMP] salesteams: view

bzr revid: chm@openerp.com-20130521111717-m38hgfi2sevhzy5h

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 153ccb3..3841c25 100644 (file)
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -191,7 +191,7 @@ class crm_case_section(osv.osv):
             help="The first contact you get with a potential customer is a lead you qualify before converting it into a real business opportunity. Check this box to manage leads in this sales team."),
 
         'target_duration': fields.selection([("monthly", "Monthly"), ("quarterly", "Quarterly"), ("semesterly", "Semesterly"), ("annually", "Annually")],
-            string='Report Duration View', required=True),
+            string='Report Duration', required=True),
         'target_duration_txt': fields.function(_get_target_duration_txt,
             string='Duration',
             type="string", readonly=True),

diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index 3ff6bae..11c68bc 100644 (file)
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -99,8 +99,8 @@
                                         <small><span class="oe_e" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small>
                                     </div>
                                     <div class="oe_items_list">
-                                        <div class="oe_salesteams_leads">
-                                            <a t-if="record.use_leads.raw_value" name="%(crm_case_form_view_salesteams_lead)d" type="action">Leads</a>
+                                        <div class="oe_salesteams_leads" t-if="record.use_leads.raw_value">
+                                            <a name="%(crm_case_form_view_salesteams_lead)d" type="action">Leads</a>
                                             <a name="%(action_report_crm_lead)d" type="action" class="oe_sparkline_bar_link"><field name="open_lead_per_duration" widget="sparkline_bar">Number of opening leads per duration.<br/>(last one is <t t-esc="record.target_duration_txt.value"/>).<br/>Click to see a detailed analysis of leads.</field></a>
                                         </div><div class="oe_salesteams_opportunities">
                                             <a name="%(crm_case_form_view_salesteams_opportunity)d" type="action">Opportunities</a>
@@ -161,9 +161,9 @@
                 <form string="Sales Team" version="7.0">
                     <sheet>
                         <div class="oe_title">
-                            <label for="name" class="oe_edit_only" string="Project Name"/>
+                            <label for="name" class="oe_edit_only" string="Sales team"/>
                             <h1>
-                                <field name="name" string="Project Name"/>
+                                <field name="name" string="Sales team"/>
                             </h1>
                             <div name="group_alias"
                                     attrs="{'invisible': [('alias_domain', '=', False)]}">
@@ -183,12 +183,11 @@
                         <group>
                             <group>
                                 <field name="parent_id"/>
-                                <field name="resource_calendar_id"/>
                                 <field name="active"/>
                             </group>
                             <group>
                                 <field name="user_id"/>
-                                <field name="code"/>
+                                <field name="change_responsible"/>
                             </group>
                             <group colspan="4" col="2">
                                 <field name="target_duration" widget="radio"/>
@@ -198,11 +197,7 @@
                             </group>
                         </group>
                         <notebook colspan="4">
-                            <page string="Sales Team">
-                               <group>
-                                    <field name="change_responsible"/>
-                                </group>
-                                <separator string="Team Members"/>
+                            <page string="Team Members">
                                 <field name="member_ids" widget="many2many_kanban">
                                     <kanban quick_create="false" create="true">
                                         <field name="name"/>

diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index c65f26b..a1758ef 100644 (file)
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -232,22 +232,17 @@
                     <field name="forecast"/>
                     <field name="target_invoice"/>
                 </xpath>
-                <xpath expr="//div[@class='oe_salesteams_leads']" position="after">
-                    <div class="oe_salesteams_orders">
+                <xpath expr="//div[@class='oe_salesteams_leads']" position="after"><div class="oe_salesteams_orders">
                         <a name="%(action_orders_salesteams)d" type="action">Sales Orders</a>
                         <a name="%(sale.action_order_report_all)d" type="action" class="oe_sparkline_bar_link"><field name="validate_saleorder_per_duration" widget="sparkline_bar">Revenue of confirmed sales orders per <t t-esc="record.target_duration_txt.value"/>).<br/>Click the acces to Sales Analysis</field></a>
-                    </div>
-                </xpath>
-                <xpath expr="//div[@class='oe_salesteams_opportunities']" position="after">
-                    <div class="oe_salesteams_invoices">
+                    </div></xpath>
+                <xpath expr="//div[@class='oe_salesteams_opportunities']" position="after"><div class="oe_salesteams_invoices">
                         <a name="%(action_invoice_salesteams)d" type="action" groups="account.group_account_invoice">Invoices</a>
                         <a name="%(account.action_account_invoice_report_all)d" type="action" class="oe_sparkline_bar_link"><field name="sent_invoice_per_duration" widget="sparkline_bar">Revenue of sent invoices per <t t-esc="record.target_duration_txt.value"/>.<br/>Click to see a detailed analysis of invoices.</field></a>
-                    </div>
-                    <div class="oe_salesteams_quotations">
+                    </div><div class="oe_salesteams_quotations">
                         <a name="%(action_quotations_salesteams)d" type="action" class="oe_sparkline_bar_link">Quotations</a>
                         <a name="%(sale.action_order_report_all)d" type="action" class="oe_sparkline_bar_link"><field name="created_quotation_per_duration" widget="sparkline_bar">Revenue of created quotation per <t t-esc="record.target_duration_txt.value"/>.<br/>Click to see a detailed analysis of sales.</field></a>
-                    </div>
-                </xpath>
+                    </div></xpath>
                 <xpath expr="//div[@class='oe_items_list']" position="after">
                     <div class="oe_center" t-if="record.target_invoice.raw_value">
                         <field name="sent_invoice_per_duration" widget="gage" style="width:160px; height: 120px;" options="{'max_field': 'target_invoice', 'label_field': 'target_duration_txt'}">Invoiced</field>