From 0b23d2e43623f28ba6ed272b7670ee7be3b7b3ec Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 9 Sep 2010 18:17:30 +0200
Subject: [PATCH] merge

bzr revid: fp@tinyerp.com-20100909161730-3l6849ucufkd3zag
---
 addons/crm/crm_opportunity_view.xml | 2 +-
 addons/sale/sale_view.xml           | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 4e1fb80464d..c55199edd43 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -301,12 +301,12 @@
                         />
                         <separator orientation="vertical"/>
                         <field name="name" string="Opportunity"/>
+                        <field name="partner_id"/>
                         <field name="user_id">
                             <filter icon="terp-personal-"
                                 domain="[('user_id','=', False)]"
                                 help="Unassigned Opportunities" />
                         </field>
-                        <field name="email_from"/>
                         <field name="section_id"
                             default="context.get('section_id', False)"
                             context="{'invisible_section': False}"
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 6f21e925e1a..3de53f2ccf9 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -80,10 +80,9 @@
             <field name="arch" type="xml">
                 <tree string="Sales orders">
                     <field name="name"/>
+                    <field name="date_order"/>
                     <field name="partner_id"/>
                     <field name="user_id" />
-                    <field name="date_order"/>
-                    <field name="partner_shipping_id"/>
                     <field name="picked_rate" widget="progressbar"/>
                     <field name="invoiced_rate" widget="progressbar"/>
                     <field name="amount_untaxed" sum="Total Untaxed amount"/>
@@ -262,12 +261,11 @@
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sale Orders ready to be invoiced"/>
                     <separator orientation="vertical"/>
                     <field name="name" select="1"/>
+                    <field name="date_order" select="1" string="Order date" />
                     <field name="partner_id" select="1"/>
                     <field name="user_id" select="1">
-                          <filter domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>
+                        <filter domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>
                     </field>
-
-                    <field name="date_order" select="1" string="Order date" />
                     <newline/>
                     <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>