[IMP] crm, project: fixed css issues preventing alias to be displayed in readonly...

bzr revid: tde@openerp.com-20130404115627-3vw1uv4xrmeu13k2

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 6f670b2..97a4bb8 100644 (file)
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -267,7 +267,7 @@
             </field>
         </record>
         <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
-        <menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="7" parent="base.menu_sales"/>
+        <menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="8" parent="base.menu_sales"/>
 
         <!-- Action Sales/Invoicing/Time and Material to Invoice -->
         <record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">

diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index 000fcdb..2559d94 100644 (file)
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -151,6 +151,15 @@
                             <h1>
                                 <field name="name" string="Project Name"/>
                             </h1>
+                            <div name="group_alias">
+                                <label for="alias_id" string="Email Alias"/>
+                                <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
+                                <span class="oe_edit_only" name="edit_alias">
+                                    <field name="alias_name" class="oe_inline" attrs="{'required': [('use_leads', '=', True), ('alias_id', '!=', False)]}"/>
+                                    @
+                                    <field name="alias_domain" class="oe_inline" readonly="1"/>
+                                </span>
+                            </div>
                             <div name="options_active">
                                 <field name="use_leads" class="oe_inline"/><label for="use_leads"/>
                             </div>
@@ -166,13 +175,7 @@
                                 <field name="code"/>
                             </group>
                             <group colspan="4" attrs="{'invisible': [('use_leads', '=', False)]}">
-                                <label for="alias_id"/>
-                                <div class="oe_inline">
-                                    <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
-                                    <span class="oe_edit_only" name="edit_alias">
-                                        <field name="alias_name" class="oe_inline" attrs="{'required': [('use_leads', '=', True), ('alias_id', '!=', False)]}"/>@<field class="oe_inline" name="alias_domain" readonly="1"/>
-                                    </span>
-                                 </div>
+                                
                             </group>
                         </group>
                         <notebook colspan="4">
@@ -278,9 +281,8 @@
             </field>
         </record>
 
-        <menuitem
+        <menuitem id="crm.menu_crm_case_section_act"
             action="crm_case_section_salesteams_act"
-            id="crm.menu_crm_case_section_act"
             sequence="1"
             parent="base.menu_sales"
             groups="base.group_multi_salesteams"/>

diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 4e263d6..2226b4a 100644 (file)
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -77,10 +77,10 @@
     </record>
 
     <menuitem name="Sales" id="base.menu_sales" parent="base.menu_base_partner" sequence="1"/>
-    <menuitem name="Leads" id="menu_crm_leads" parent="base.menu_sales" sequence="2"
+    <menuitem name="Leads" id="menu_crm_leads" parent="base.menu_sales" sequence="3"
             action="crm_case_category_act_leads_all"
             groups="base.group_mono_salesteams,base.group_sale_manager"/>
-    <menuitem name="Opportunities" id="menu_crm_opportunities" parent="base.menu_sales" sequence="3"
+    <menuitem name="Opportunities" id="menu_crm_opportunities" parent="base.menu_sales" sequence="4"
             action="crm_case_category_act_oppor11"
             groups="base.group_mono_salesteams,base.group_sale_manager"/>
 

diff --git a/addons/crm/static/src/css/crm.css b/addons/crm/static/src/css/crm.css
index 2815ed3..0f509a2 100644 (file)
--- a/addons/crm/static/src/css/crm.css
+++ b/addons/crm/static/src/css/crm.css
@@ -20,7 +20,7 @@
 }
 
 .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_alias {
-    margin: -8px 0 8px 0;
+    margin: 0px 0 8px 0;
 }
 
 .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_alias .oe_e {
@@ -53,6 +53,3 @@
 .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_center .oe_subsum {
     font-size: 10px;
 }
-.openerp .oe_form_editable .oe_form .oe_read_only {
-    display: none;
-}
\ No newline at end of file

diff --git a/addons/crm_todo/crm_todo_view.xml b/addons/crm_todo/crm_todo_view.xml
index 0b3de33..851c2ab 100644 (file)
--- a/addons/crm_todo/crm_todo_view.xml
+++ b/addons/crm_todo/crm_todo_view.xml
@@ -52,11 +52,10 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form,calendar,gantt,graph,kanban</field>
     </record>
-    <menuitem
-        id="menu_crm_todo"
-        parent="base.menu_sales"
-        action="crm_todo_action"
-        sequence="6"/>
+    <menuitem id="menu_crm_todo"
+            parent="base.menu_sales"
+            action="crm_todo_action"
+            sequence="7"/>
 
 
     </data>

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 183bc9a..44447c8 100644 (file)
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -88,6 +88,15 @@
                         <h1>
                             <field name="name" string="Project Name"/>
                         </h1>
+                        <div name="group_alias">
+                            <label for="alias_id"/>
+                            <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
+                            <span class="oe_edit_only" name="edit_alias">
+                                <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>
+                                @
+                                <field class="oe_inline" name="alias_domain"/>
+                            </span>
+                        </div>
                         <div name="options_active">
                             <field name="use_tasks" class="oe_inline"/>
                             <label for="use_tasks"/>
@@ -112,15 +121,6 @@
                             </p>
                         </group>
                     </group>
-                    <group colspan="4" name="group_alias">
-                        <label for="alias_id"/>
-                        <div class="oe_inline">
-                            <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
-                            <span class="oe_edit_only oe_edit_alias" name="edit_alias">
-                                <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field class="oe_inline" name="alias_domain"/>
-                            </span>
-                         </div>
-                    </group>
                     <notebook>
                         <page string="Team" name="team">
                             <field colspan="4" name="members" widget="many2many_kanban">

diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index e4d2196..9c516b2 100644 (file)
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -63,7 +63,7 @@
 }
 
 .oe_kanban_project_alias {
-    margin: -8px 0 8px 0;
+    margin: 0px 0 8px 0;
 }
 
 .oe_kanban_project_alias .oe_e {

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index c0132bc..a4051e4 100644 (file)
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -335,19 +335,15 @@
                 <field name="priority" position="before">
                     <field name="project_escalation_id"/>
                 </field>
-                <xpath expr='//group[@name="group_alias"]' position='replace'>
-                    <group colspan="4" name="group_alias" attrs="{'invisible': [('use_issues', '!=', True), ('use_tasks', '!=', True)]}">
-                        <label for="alias_id"/>
-                        <div class="oe_inline">
-                            <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
-                            <span class="oe_edit_only" style="vertical-align: middle;line-height: 21px;" name="edit_alias">
-                                <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field class="oe_inline" name="alias_domain"/>
-                                <span attrs="{'invisible': ['|', ('use_issues', '!=', True), ('use_tasks', '!=', True)]}">
-                                    creates <field name="alias_model" class="oe_inline" widget="radio"/>
-                                </span>
-                            </span>
-                         </div>
-                    </group>
+                <xpath expr='//span[@name="edit_alias"]' position='replace'>
+                    <span class="oe_edit_only" name="edit_alias">
+                        <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>
+                        @
+                        <field class="oe_inline" name="alias_domain"/>
+                        <span attrs="{'invisible': ['|', ('use_issues', '!=', True), ('use_tasks', '!=', True)]}">
+                            creates <field name="alias_model" class="oe_inline" widget="radio"/>
+                        </span>
+                    </span>
                 </xpath>
             </field>
        </record>

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 9766b5f..9a4866d 100644 (file)
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -345,7 +345,7 @@
             </field>
         </record>
 
-        <menuitem action="action_orders" id="menu_sale_order" parent="base.menu_sales" sequence="5" groups="base.group_sale_salesman,base.group_sale_manager"/>
+        <menuitem action="action_orders" id="menu_sale_order" parent="base.menu_sales" sequence="6" groups="base.group_sale_salesman,base.group_sale_manager"/>
 
         <record id="action_orders_exception" model="ir.actions.act_window">
             <field name="name">Sales in Exception</field>
@@ -395,8 +395,8 @@
         </record>
 
         <menuitem id="menu_sale_quotations"
-        action="action_quotations" parent="base.menu_sales"
-        sequence="4"/>
+                action="action_quotations" parent="base.menu_sales"
+                sequence="5"/>
 
         <record id="action_order_tree" model="ir.actions.act_window">
             <field name="name">Old Quotations</field>