[IMP]: view + Search view improvement

bzr revid: rpa@openerp.co.in-20100216130045-zip1nhehifaq3wfz

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 85adafd..03c5106 100644 (file)
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -65,7 +65,7 @@
                         <separator colspan="4"/>
                         <group col="8" colspan="4">
                             <field name="state" select="2"/>
-                            <button name="case_close" string="Done" states="open,draft,pending" type="object"  icon="gtk-close"/>
+                            <button name="case_close" string="Done" states="open,draft,pending" type="object"  icon="gtk-jump-to"/>
                             <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
                             <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
                             <button name="case_pending" string="Pending" states="draft,open" type="object"  icon="gtk-media-pause"/>
@@ -121,7 +121,7 @@
                 <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="Done" states="open,draft,pending" type="object"  icon="gtk-close"/>
+                <button name="case_close" string="Done" states="open,draft,pending" type="object"  icon="gtk-jump-to"/>
                 <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>

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 2b9831a..8061889 100644 (file)
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -63,7 +63,7 @@
                     <field name="email_from" colspan="2" string="Email"/>
                     <field name="partner_phone" colspan="2"/>
 
-                    <separator colspan="4" string="Status and Categarization"/>
+                    <separator colspan="4" string="Status and Categorization"/>
                     <group colspan="4" col="6">
                         <field name="user_id" select="2" string="Responsible"/>                        
                         <field name="stage_id" select="1" string="Sales Stage" required="1" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>                        

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 756ade6..65a5a60 100644 (file)
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -232,9 +232,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <group col='10' colspan='4'>
+                    <group col='11' colspan='4'>
                         <filter icon="terp-sale" string="Quotations" domain="[('state','=','draft')]"/>
                         <filter icon="terp-sale" string="Running" domain="[('state','in',('manual','progress'))]"/>
+                        <filter icon="terp-sale" string="Sales To Invoice" domain="[('state','=','manual')]"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="partner_id" select="1"/>
@@ -273,17 +274,6 @@
             <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
 
-        <record id="action_order_tree3" model="ir.actions.act_window">
-            <field name="name">Sales To Invoice</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sale.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('state','=','manual')]</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_sales_order_filter"/>
-        </record>
-
         <record id="action_order_tree4" model="ir.actions.act_window">
             <field name="name">Sales Order in Progress</field>
             <field name="type">ir.actions.act_window</field>
@@ -336,7 +326,6 @@
                 <tree string="Sales order lines">
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
-                    <field name="name"/>
                     <field name="product_id"/>
                     <field name="product_uom_qty" string="Qty"/>
                     <field name="product_uom" string="UoM"/>
@@ -377,7 +366,7 @@
                             <separator colspan="4" string="States"/>
                             <field name="state" select="2"/>
                             <group col="2" colspan="2">
-                                <button name="button_done" states="confirmed,exception" string="Done" type="object" icon="gtk-no"/>
+                                <button name="button_done" states="confirmed,exception" string="Done" type="object" icon="gtk-jump-to"/>
                                 <button name="button_cancel" states="confirmed,exception" string="Cancel" type="object" icon="gtk-cancel" />
                             </group>
                         </page>
@@ -447,7 +436,6 @@
         <act_window domain="[('product_id','=',active_id)]" id="action_order_line_product_tree" name="Product sales" res_model="sale.order.line" src_model="product.product"/>
 
         <menuitem id="menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="6"/>
-        <menuitem action="action_order_tree3" id="menu_invoicing_sales_order" parent="menu_invoiced" sequence="1"/>
         <menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2"/>
         <!-- configartion view -->