[MERGE] trunk-improve_portal-vta.

bzr revid: vta@openerp.com-20121129090801-mheiq7yb3h24onqf

diff --cc addons/account/account_invoice_view.xml
Simple merge

diff --cc addons/base_status/base_stage.py
Simple merge

diff --cc addons/event/event_view.xml
Simple merge

diff --cc addons/mail/mail_group_view.xml
Simple merge

diff --cc addons/portal/portal_view.xml
index a5b35a0,30a78d9..b7765e6
--- 1/addons/portal/portal_view.xml
--- 2/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@@ -6,20 -6,20 +6,20 @@@
          <menuitem name="Portal"
              id="portal_menu"
              groups="base.group_no_one,portal.group_portal"
 -            sequence="20"/>
 +            sequence="15"/>
  
-             <menuitem name="Our company" id="portal_company" parent="portal_menu" sequence="10"/>
-                 <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
-                 <menuitem name="Jobs" id="portal_jobs" parent="portal_company" sequence="20" action="action_jobs"/>
- 
-             <!--
-                 Create menu items that we'll leave empty for now - they'll be
-                 filled up by other portal modules.
-             -->
-             <menuitem name="Orders" id="portal_orders" parent="portal_menu" sequence="20"/>
-             <menuitem name="Invoices and Payments" id="portal_invoices_payements" parent="portal_menu" sequence="30"/>
-             <menuitem name="Projects" id="portal_projects" parent="portal_menu" sequence="40"/>
-             <menuitem name="After Sale Services" id="portal_after_sales" parent="portal_menu" sequence="50"/>
+         <menuitem name="Messaging" id="portal_messages" parent="portal_menu" sequence="10"/>
+         <menuitem name="About Us" id="portal_company" parent="portal_menu" sequence="200"/>
+         <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
+         <menuitem name="Jobs" id="portal_jobs" parent="portal_company" sequence="20" action="action_jobs"/>
+ 
+         <!--
+             Create menu items that we'll leave empty for now - they'll be
+             filled up by other portal modules.
+         -->
+         <menuitem name="Quotations and Sales Orders" id="portal_orders" parent="portal_menu" sequence="20"/>
+         <menuitem name="After Sale Services" id="portal_after_sales" parent="portal_menu" sequence="30"/>
+         <menuitem name="Projects" id="portal_projects" parent="portal_menu" sequence="40"/>        
  
          <!-- extend res.groups search view -->
          <record id="group_search_view" model="ir.ui.view">

diff --cc addons/portal_project_issue/portal_project_issue_view.xml
index c943bb3,3de7f1f..2750edf
--- 1/addons/portal_project_issue/portal_project_issue_view.xml
--- 2/addons/portal_project_issue/portal_project_issue_view.xml
+++ b/addons/portal_project_issue/portal_project_issue_view.xml
@@@ -18,13 -18,18 +18,24 @@@
                          <t t-name="kanban-box">
                              <div class="oe_kanban_card oe_kanban_global_click">
                                  <div class="oe_kanban_content">
+                                     <div class="oe_portal_project_issue">
+                                         <div><h1><field name="name"/></h1></div>
+                                         <div class="oe_kanban_footer_left">
+                                             <field name="partner_id" context="{'portal':1}"/> <br/>
+                                             <field name="version_id"/>                                            
+                                         </div>
+                                         <div><field name="categ_ids" widget="many2many_tags" class="oe_left"/></div>
+                                         <div class="oe_text_right">
+                                             <h1><field name="state" readonly="1"/></h1>
+                                         </div>
+                                     </div>
                                      <div>
 +                                        <h1><a type="open"><field name="name"/></a></h1>
 +                                        <field name="partner_id"/> <br/>
 +                                        <field name="version_id"/>
 +                                    </div>
 +                                    <div class="oe_kanban_footer_left">
 +                                        <field name="categ_ids"/>
                                          <div class="oe_right">
                                              Creation: <field name="create_date"/>
                                              <span class="oe_kanban_highlight">

diff --cc addons/project/project_view.xml
Simple merge

diff --cc addons/project_issue/project_issue_view.xml
index 7d026da,463cd8c..9e25fbc
--- 1/addons/project_issue/project_issue_view.xml
--- 2/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@@ -264,9 -264,11 +264,9 @@@
                                          <field name="version_id"/>
                                      </div>
                                      <div class="oe_kanban_footer_left">
 -                                        <div class="oe_left oe_tags">
 -                                            <field name="categ_ids"/>
 -                                        </div>
 +                                        <field name="categ_ids"/>
                                          <div class="oe_right">
-                                             <span class="oe_kanban_highlight">
+                                             <span class="oe_kanban_highlight" groups="base.group_user">
                                                  <t t-set="priority" t-value="record.priority.raw_value || 5"/>
                                                  <a type="object" name="set_priority" args="['3']" t-if="priority gt 3" title="Normal Priority">
                                                     <img src="/web/static/src/img/icons/star-off.png" width="16" height="16"/>

diff --cc addons/sale/sale_view.xml
Simple merge