From d088ecf469f2eb5207631387cb155eec19c4a9c9 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 25 Jun 2010 12:24:30 +0200
Subject: [PATCH] fix

bzr revid: fp@tinyerp.com-20100625102430-9u0ogutu0ogcbcjn
---
 .../report/account_invoice_report_view.xml    |   4 +-
 addons/crm/crm_phonecall_view.xml             |   1 -
 addons/crm/res_partner_view.xml               | 104 +++++++++---------
 3 files changed, 56 insertions(+), 53 deletions(-)

diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index c163d5073b7..e3f1321d02f 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -18,8 +18,6 @@
                 <field name="product_id" invisible="1"/>
                 <field name="uom_name" invisible="not context.get('set_visible',False)"/>
                 <field name="categ_id" invisible="1"/>
-                <field name="nbr" sum="# of Lines"/>
-                <field name="product_qty"/>
                 <field name="state" invisible="1"/>
                 <field name="period_id" invisible="1"/>
                 <field name="currency_id" invisible="1"/>
@@ -29,6 +27,8 @@
                 <field name="address_invoice_id" invisible="1"/>
                 <field name="partner_bank" invisible="1"/>
                 <field name="account_id" invisible="1"/>
+                <field name="nbr" sum="# of Lines"/>
+                <field name="product_qty"/>
                 <field name="reconciled"  sum="# Reconciled"/>
                 <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 790debb007f..ef068e122a3 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -38,7 +38,6 @@
         <field name="model">crm.phonecall</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-
             <tree string="Phone Calls" colors="grey:state in ('cancel','done');blue:state in ('pending',)">
                 <field name="date" string="Date"/>
                 <field name="name" string="Call Summary"/>
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 36719f8a2f2..5f3fa8472c0 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -4,22 +4,22 @@
 
          <!--  Partners inherited form -->
 
-		<record id="view_crm_partner_info_form1" model="ir.ui.view">
+        <record id="view_crm_partner_info_form1" model="ir.ui.view">
             <field name="name">res.partner.crm.info.inherit1</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <page string="History" position="inside">
-	       		    <field name="meeting_ids" colspan="4" nolabel="1" >
-	       			    <tree string="Meetings" colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
-			                <field name="name" string="Subject" />
-			                <field name="date" string="Start Date" />
-			                <field name="date_deadline" string="End Date"/>
-			                <field name="user_id" string="Responsible"/>
-			            </tree>
-			        </field>
-				</page>
+                    <field name="meeting_ids" colspan="4" nolabel="1" >
+                        <tree string="Meetings" colors="gray:state in ('draft', 'cancel','done','pending')">
+                            <field name="user_id" string="Responsible"/>
+                            <field name="name" string="Subject" />
+                            <field name="date" string="Start Date" />
+                            <field name="date_deadline" string="End Date"/>
+                        </tree>
+                    </field>
+                </page>
             </field>
         </record>
 
@@ -30,7 +30,19 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <page string="History" position="inside">
-                    <field name="phonecall_ids" colspan="4" nolabel="1" />
+                    <field name="phonecall_ids" colspan="4" nolabel="1">
+                        <tree string="Phone Calls" colors="gray:state in ('draft', 'cancel','done','pending')">
+                            <field name="date" string="Date"/>
+                            <field name="name" string="Call Summary"/>
+                            <field name="categ_id"/>
+                            <field name="user_id"/>
+                            <field name="state"/>
+                            <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                            <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+                            <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-media-pause"/>
+                            <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                        </tree>
+                    </field>
                 </page>
             </field>
         </record>
@@ -43,45 +55,37 @@
             <field name="arch" type="xml">
                 <page string="History" position="inside">
                     <field name="opportunity_ids" colspan="4" nolabel="1" domain="[('type', '=', 'opportunity')]">
-	                     <tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done')">
-	                         <field name="create_date"/>
-	                         <field name="partner_name"/>
-	                         <field name="name"/>
-	                         <field name="email_from"/>
-	                         <field name="phone"/>
-
-	                         <field name="categ_id" invisible="1"/>
-	                         <field name="type_id" invisible="1"/>
-	                         <field name="referred" invisible="1"/>
-
-	                         <field name="stage_id"/>
-	                         <button name="stage_previous" string="Previous"
-	                             states="open,pending" type="object" icon="gtk-go-back" />
-	                         <button name="stage_next" string="Next"
-	                             states="open,pending" type="object"
-	                             icon="gtk-go-forward" />
-	                         <field name="section_id"
-	                             invisible="context.get('invisible_section', True)" />
-	                         <field name="user_id" />
-	                         <field name="state" />
-	                         <button name="case_open" string="Open"
-	                             states="draft,pending" type="object"
-	                             icon="gtk-go-forward" />
-	                         <button name="case_close" string="Close"
-	                             states="open,draft,pending" type="object"
-	                             icon="gtk-close" />
-	                         <button string="Convert to Opportunity"
-	                             name="convert_opportunity"
-	                             states="draft,open,pending" icon="gtk-index"
-	                             type="object" />
-	                         <button name="case_escalate" string="Escalate"
-	                             states="open,draft,pending" type="object"
-	                             icon="gtk-go-up" />
-	                         <button name="case_cancel" string="Cancel"
-	                             states="draft,open,pending" type="object"
-	                             icon="gtk-cancel" />
-	                     </tree>
-	                 </field>
+                         <tree string="Opportunities"  colors="blue:state=='pending';grey:state=='cancel')">
+                             <field name="create_date"/>
+                             <field name="name"/>
+                             <field name="stage_id"/>
+                             <button name="stage_previous" string="Previous"
+                                 states="open,pending" type="object" icon="gtk-go-back" />
+                             <button name="stage_next" string="Next"
+                                 states="open,pending" type="object"
+                                 icon="gtk-go-forward" />
+                             <field name="section_id"
+                                 invisible="context.get('invisible_section', True)" />
+                             <field name="user_id" />
+                             <field name="state" />
+                             <button name="case_open" string="Open"
+                                 states="draft,pending" type="object"
+                                 icon="gtk-go-forward" />
+                             <button name="case_close" string="Close"
+                                 states="open,draft,pending" type="object"
+                                 icon="gtk-close" />
+                             <button string="Convert to Opportunity"
+                                 name="convert_opportunity"
+                                 states="draft,open,pending" icon="gtk-index"
+                                 type="object" />
+                             <button name="case_escalate" string="Escalate"
+                                 states="open,draft,pending" type="object"
+                                 icon="gtk-go-up" />
+                             <button name="case_cancel" string="Cancel"
+                                 states="draft,open,pending" type="object"
+                                 icon="gtk-cancel" />
+                         </tree>
+                     </field>
                 </page>
             </field>
         </record>