[IMP] crm: fixes typos in salesteam kanban view + css tweak to avoid having multi...

bzr revid: tde@openerp.com-20130405115903-l2ktkahovulwy9ab

diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index e752f54..c788872 100644 (file)
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -100,10 +100,12 @@
                                     <div class="oe_items_list">
                                         <a t-if="record.use_leads.raw_value" name="%(crm_case_form_view_salesteams_lead)d" type="action">
                                             <t t-raw="record.open_lead_ids.raw_value.length"/>
-                                            <t t-if="record.open_lead_ids.raw_value.length &gt;= 1">Leads</t><t t-if="record.open_lead_ids.raw_value.length &lt; 1">Lead</t></a>
+                                            <t t-if="record.open_lead_ids.raw_value.length &gt;= 2">Leads</t>
+                                            <t t-if="record.open_lead_ids.raw_value.length &lt; 2">Lead</t></a>
                                         <a name="%(crm_case_form_view_salesteams_opportunity)d" type="action">
                                             <t t-raw="record.open_opportunity_ids.raw_value.length"/>
-                                            <t t-if="record.open_opportunity_ids.raw_value.length &gt;= 1">Opportunities</t><t t-if="record.open_opportunity_ids.raw_value.length &lt; 1">Opportunity</t></a>
+                                            <t t-if="record.open_opportunity_ids.raw_value.length &gt;= 2">Opportunities</t>
+                                            <t t-if="record.open_opportunity_ids.raw_value.length &lt; 2">Opportunity</t></a>
                                     </div>
                                     <div class="oe_avatars">
                                         <img t-if="record.user_id.raw_value" t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-data-member_id="record.user_id.raw_value"/>

diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index 7e3e25b..f24aee1 100644 (file)
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -29,6 +29,8 @@
         <record model="crm.case.section" id="section_sales_department">
             <field name="name">Sales</field>
             <field name="code">Sales</field>
+            <field name="use_leads">True</field>
+            <field name="member_ids" eval="[(4, ref('base.user_root'))]"/>
         </record>
 
         <!-- Payment Mode -->
@@ -64,12 +66,6 @@
 <p>To manage quotations and sale orders, install the "Sales Management" application.</p>]]></field>
         </record>
 
-        <record model="mail.alias" id="default_sales_alias">
-            <field name="alias_name">sales</field>
-            <field name="alias_model_id" ref="model_crm_lead"/>
-            <field name="alias_user_id" ref="base.user_root"/>
-            <field name="alias_defaults">{'type':'lead'}</field>
-        </record>
     </data>
 
 </openerp>

diff --git a/addons/crm/static/src/css/crm.css b/addons/crm/static/src/css/crm.css
index 0a766fe..3ad3840 100644 (file)
--- a/addons/crm/static/src/css/crm.css
+++ b/addons/crm/static/src/css/crm.css
@@ -1,5 +1,5 @@
 .openerp .oe_kanban_view .oe_kanban_crm_salesteams {
-    width: 300px;
+    width: 345px;
 }
 .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_avatars {
     text-align: right;
@@ -23,7 +23,7 @@
     margin: 10px 0;
 }
 .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list a {
-    width: 96px;
+    width: 110px;
     display: inline-block;
 }
 .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list a:hover {

diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index e278136..f8b4228 100644 (file)
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -221,18 +221,18 @@
                 <xpath expr="//div[@class='oe_items_list']" position="inside">
                     <a name="%(action_quotations_salesteams)d" type="action">
                         <t t-raw="record.quotation_ids.raw_value.length"/>
-                        <t t-if="record.quotation_ids.raw_value.length &gt;= 1">Quotation</t>
-                        <t t-if="record.quotation_ids.raw_value.length &lt; 1">Quotations</t>
+                        <t t-if="record.quotation_ids.raw_value.length &gt;= 2">Quotations</t>
+                        <t t-if="record.quotation_ids.raw_value.length &lt; 2">Quotation</t>
                     </a>
                     <a name="%(action_orders_salesteams)d" type="action">
                         <t t-raw="record.sale_order_ids.raw_value.length"/>
-                        <t t-if="record.sale_order_ids.raw_value.length &gt;= 1">Sales Order</t>
-                        <t t-if="record.sale_order_ids.raw_value.length &lt; 1">Sales Orders</t>
+                        <t t-if="record.sale_order_ids.raw_value.length &gt;= 2">Sales Orders</t>
+                        <t t-if="record.sale_order_ids.raw_value.length &lt; 2">Sales Order</t>
                     </a>
                     <a name="%(action_invoice_salesteams)d" type="action" groups="account.group_account_invoice">
                         <t t-raw="record.invoice_ids.raw_value.length"/>
-                        <t t-if="record.invoice_ids.raw_value.length &gt;= 1">Invoice</t>
-                        <t t-if="record.invoice_ids.raw_value.length &lt; 1">Invoices</t>
+                        <t t-if="record.invoice_ids.raw_value.length &gt;= 2">Invoices</t>
+                        <t t-if="record.invoice_ids.raw_value.length &lt; 2">Invoice</t>
                     </a>
                 </xpath>
                 <xpath expr="//div[@class='oe_items_list']" position="after">