[MRG] merge with lp:openobejct-addons contains changes on justguage and sparklinebar...

bzr revid: tpa@tinyerp.com-20130916070618-l59jaz9tbrmv5y6r

diff --cc addons/crm/crm.py
Simple merge

diff --cc addons/crm/crm_case_section_view.xml
index c8d4cb0,99b3296..b5e23fe
--- 1/addons/crm/crm_case_section_view.xml
--- 2/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@@ -144,11 -99,11 +144,11 @@@
                                      <div class="oe_items_list">
                                          <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_salesteam)d" type="action" class="oe_sparkline_bar_link"><field name="monthly_open_leads" widget="sparkline_bar">Open Leads per Month<br/>Click to see a detailed analysis of leads.</field></a>
 -                                            <a name="%(action_report_crm_lead)d" type="action" class="oe_sparkline_bar_link"><field name="monthly_open_leads" widget="sparkline_bar" options="{'height': '20px', 'barWidth': 4, 'barSpacing': 1}">Open Leads per Month<br/>Click to see a detailed analysis of leads.</field></a>
++                                            <a name="%(action_report_crm_lead_salesteam)d" type="action" class="oe_sparkline_bar_link"><field name="monthly_open_leads" widget="sparkline_bar" options="{'height': '20px', 'barWidth': 4, 'barSpacing': 1}">Open Leads per Month<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>
-                                             <a name="%(action_report_crm_opportunity_salesteam)d" type="action"><field name="monthly_planned_revenue" widget="sparkline_bar">Planned Revenue per Month<br/>Click to see a detailed analysis of opportunities.</field></a>
 -                                            <a name="%(action_report_crm_opportunity)d" type="action"><field name="monthly_planned_revenue" widget="sparkline_bar" height="20px" barWidth="4" barSpacing="1">Planned Revenue per Month<br/>Click to see a detailed analysis of opportunities.</field></a>
++                                            <a name="%(action_report_crm_opportunity_salesteam)d" type="action"><field name="monthly_planned_revenue" widget="sparkline_bar" height="20px" barWidth="4" barSpacing="1">Planned Revenue per Month<br/>Click to see a detailed analysis of opportunities.</field></a>
                                          </div>
                                      </div>
                                  </div>
@@@ -346,4 -301,4 +346,4 @@@
              parent="base.menu_sales"
              groups="base.group_multi_salesteams"/>
    </data>
--</openerp>
++</openerp>

diff --cc addons/sale_crm/__openerp__.py
index 25b1fb5,7a57484..9c227e3
--- 1/addons/sale_crm/__openerp__.py
--- 2/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@@ -46,10 -46,8 +46,9 @@@ modules
          'security/sale_crm_security.xml',
          'security/ir.model.access.csv',
          'report/sale_crm_account_invoice_report_view.xml',
 +        'report/sale_report_view.xml',
      ],
      'js': [
-         'static/lib/justgage.js',
          'static/src/js/sale_crm.js',
      ],
      'demo': ['sale_crm_demo.xml'],

diff --cc addons/sale_crm/sale_crm_view.xml
index c3458f3,a1e201d..c7d3dc4
--- 1/addons/sale_crm/sale_crm_view.xml
--- 2/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@@ -297,11 -267,11 +297,11 @@@
                      </div>
                  </xpath>
                  <xpath expr="//div[@class='oe_items_list']" position="after">
 -                    <div class="oe_center" t-if="record.invoiced_target.raw_value">
 -                        <field name="monthly_invoiced" widget="gauge" style="width:160px; height: 120px;" options="{'max_field': 'invoiced_target'}">Invoiced</field>
 -                        <field name="invoiced_forecast" widget="gauge" style="width:160px; height: 120px;" options="{'max_field': 'invoiced_target', 'action_change': 'action_forecast'}">Forecast</field>
 +                    <div class="oe_center oe_salesteams_justgage" t-if="record.user_currency_invoiced_target.raw_value">
-                         <field name="monthly_invoiced" widget="gage" style="width:160px; height: 120px;" options="{'max_field': 'user_currency_invoiced_target'}">Invoiced</field>
-                         <field name="user_currency_invoiced_forecast" widget="gage" style="width:160px; height: 120px; cursor: pointer;" options="{'max_field': 'user_currency_invoiced_target', 'action_change': 'action_forecast'}">Forecast</field>
++                        <field name="monthly_invoiced" widget="gauge" style="width:160px; height: 120px;" options="{'max_field': 'user_currency_invoiced_target'}">Invoiced</field>
++                        <field name="user_currency_invoiced_forecast" widget="gauge" style="width:160px; height: 120px; cursor: pointer;" options="{'max_field': 'user_currency_invoiced_target', 'action_change': 'action_forecast'}">Forecast</field>
                      </div>
 -                    <div class="oe_center" style="color:#bbbbbb;" t-if="!record.invoiced_target.raw_value">
 +                    <div class="oe_center oe_salesteams_help" style="color:#bbbbbb;" t-if="!record.user_currency_invoiced_target.raw_value">
                          <br/>Define an invoicing target in the sales team settings to see the period's achievement and forecast at a glance.
                      </div>
                  </xpath>