From d93fa5077182e8627700cf978062fe5206938bd6 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 9 Apr 2010 01:29:00 +0200
Subject: [PATCH] [IMP] crm + misc views

bzr revid: fp@tinyerp.com-20100408232900-9kro0qhxx7c8mzso
---
 addons/crm/crm_claims_view.xml            | 2 +-
 addons/crm/crm_fund_view.xml              | 2 +-
 addons/crm/crm_helpdesk_view.xml          | 2 +-
 addons/crm/crm_lead_view.xml              | 2 +-
 addons/crm/crm_opportunity_view.xml       | 6 +++---
 addons/crm/crm_view.xml                   | 6 +++---
 addons/crm/wizard/crm_send_email.py       | 2 +-
 addons/crm/wizard/crm_send_email_view.xml | 1 +
 addons/product/partner_view.xml           | 2 +-
 addons/product/pricelist_view.xml         | 5 ++++-
 addons/purchase/partner_view.xml          | 2 +-
 addons/sale/sale_view.xml                 | 9 +++++----
 12 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index 08c0bd9b528..c7409006d78 100755
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -183,7 +183,7 @@
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
-                                       string="Reply to Last Email"
+                                       string="Reply to Email"
                                        name="%(action_crm_send_mail)d"
                                        context="{'mail':'reply', 'model': 'crm.claim'}"
                                        icon="gtk-undo" type="action" />
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index 536da9b7c77..8d315c14a6d 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -191,7 +191,7 @@
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
-                                       string="Reply to Last Email"
+                                       string="Reply to Email"
                                        name="%(action_crm_send_mail)d"
                                        context="{'mail':'reply', 'model': 'crm.fundraising'}"
                                        icon="gtk-undo" type="action" />
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index 803b306c1bb..bea0c3a894c 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -126,7 +126,7 @@
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
-                                       string="Reply to Last Email"
+                                       string="Reply to Email"
                                        name="%(action_crm_send_mail)d"
                                        context="{'mail':'reply', 'model': 'crm.helpdesk'}"
                                        icon="gtk-undo" type="action" />
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 8fcf34238f2..9dad22dba81 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -166,7 +166,7 @@
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
                             <button colspan="4"
-                                string="Reply to Last Email"
+                                string="Reply to Email"
                                 name="%(action_crm_send_mail)d"
                                 context="{'mail':'reply', 'model': 'crm.lead'}"
                                 icon="gtk-undo" type="action" />
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index e4837e933c9..44b439491e9 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -104,7 +104,7 @@
                             domain="[('object_id.model', '=', 'crm.opportunity')]" />
                     </group>
 
-                    <separator colspan="4" string="Details"/>
+                    <separator colspan="4" string="Notes"/>
                     <field name="description" nolabel="1" colspan="4"/>
 
                     <separator colspan="4"/>
@@ -215,9 +215,9 @@
                 <button name="stage_next" string="Next"
                     states="open,pending" type="object"
                     icon="gtk-go-forward" />
-                <field name="planned_revenue" sum="Total of Planned Revenue"/>
+                <field name="planned_revenue" sum="Expected Revenue"/>
                 <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
-                <field name="date_deadline" string="Excepted Closing"/>
+                <field name="date_deadline" string="Expected Closing"/>
                 <field name="section_id"/>
                 <field name="user_id"/>
                 <field name="priority"/>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index babacff497d..31dd875b7e0 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -364,7 +364,7 @@
                                     <separator colspan="4" string="Action Information"/>
                                     <field colspan="4" name="name"/>
                                     <field name="date" select="2"/>
-                                    <field name="user_id" select="2"/>                                    
+                                    <field name="user_id" select="2"/>
                                 </form>
                             </field>
                         </page>
@@ -377,7 +377,7 @@
                                    <group col="7" colspan="4">
                                        <field name="date"/>
                                        <field name="email_to"/>
-                                       <field name="email_from"/>                                       
+                                       <field name="email_from"/>
                                        <button
                                      string="Add a CC"
                                                name="%(crm.action_view_crm_email_add_cc_wizard)d"
@@ -386,7 +386,7 @@
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
-                                       string="Reply to Last Email"
+                                       string="Reply to Email"
                                        name="%(action_crm_send_mail)d"
                                        context="{'mail':'reply', 'model': 'crm.case'}"
                                        icon="gtk-undo" type="action" />
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index bcd8adefe43..93897246bf7 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -146,7 +146,7 @@ class crm_send_new_email(osv.osv_memory):
             if 'email_cc' in fields:
                 res.update({'email_cc': case.email_cc or ''})
             if 'text' in fields:
-                res.update({'text': '\n\n'+(case.user_id.signature or '') + '\n\n' +  (case.description or '')})
+                res.update({'text': '\n\n'+(case.user_id.signature or '')})
             if 'state' in fields:
                 res.update({'state': 'pending'})
         return res
diff --git a/addons/crm/wizard/crm_send_email_view.xml b/addons/crm/wizard/crm_send_email_view.xml
index 7b3392ef8fa..976e0578d05 100644
--- a/addons/crm/wizard/crm_send_email_view.xml
+++ b/addons/crm/wizard/crm_send_email_view.xml
@@ -15,6 +15,7 @@
                     <field name="subject" colspan="4"/>
                     <group colspan="4" string="Extended Options" expand="1">
                         <field name="email_from" />
+                        <newline/>
                         <field name="doc1" filename="doc1_fname"/>
                         <field name="doc1_fname"/>
                         <field name="doc2" filename="doc2_fname" />
diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml
index 66e4ba84c37..61ef58b8941 100644
--- a/addons/product/partner_view.xml
+++ b/addons/product/partner_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <page string="Sales &amp; Purchases" position="inside">
                     <newline/>
-                    <group col="2" colspan="2" name="sale_list">
+                    <group col="2" colspan="2" name="sale_list" groups="base.group_extended">
                         <separator string="Sales Properties" colspan="2"/>
                         <field name="property_product_pricelist"/>
                     </group>
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 1dbf110cd64..d4c6fbd6234 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -2,7 +2,10 @@
 <openerp>
     <data>
 
-        <menuitem groups="base.group_extended" id="menu_product_pricelist_main" name="Pricelists" parent="prod_config_main" sequence="50"/>
+        <menuitem groups="base.group_extended" id="menu_product_pricelist_main"
+            name="Pricelists" parent="prod_config_main" 
+            groups="base.group_extended"
+            sequence="50"/>
 
         <record id="product_pricelist_version_form_view" model="ir.ui.view">
             <field name="name">product.pricelist.version.form</field>
diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index 1fe67ab72aa..66337500234 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="priority">36</field>
             <field name="arch" type="xml">
-                <group name="sale_list" position="after">
+                <group name="sale_list" position="after" groups="base.group_extended">
                     <group colspan="2" col="2">
                         <separator string="Purchases Properties" colspan="2"/>
                         <field name="property_product_pricelist_purchase"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 22d8a52b74d..5b496586864 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -18,7 +18,7 @@
                     <field name="warehouse_id" required="1" select="1" widget="selection"/>
                     <separator colspan="4" string="Accounting"/>
                     <field name="payment_default_id"/>
-                    <field domain="[('type','=','sale')]" name="pricelist_id" select="1"/>
+                    <field domain="[('type','=','sale')]" name="pricelist_id" select="1" groups="base.group_extended"/>
                     <field name="project_id" select="1"/>
                 </form>
             </field>
@@ -31,7 +31,7 @@
                 <tree string="Sale Shop">
                     <field name="name"/>
                     <field name="warehouse_id"/>
-                    <field name="pricelist_id"/>
+                    <field name="pricelist_id" groups="base.group_extended"/>
                     <field name="project_id"/>
                 </tree>
             </field>
@@ -110,8 +110,9 @@
                             <field domain="[('partner_id','=',partner_id)]" name="partner_order_id"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id"/>
-                            <field domain="[('type','=','sale')]" name="pricelist_id"/>
-                            <field name="project_id" select="2" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"/>
+                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended"/>
+                            <field name="project_id" select="2" 
+                                context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"/>
                             <newline/>
                             <field colspan="4" mode="tree,form,graph" name="order_line" nolabel="1" widget="one2many_list">
                                 <form string="Sale Order Lines">