Merge lp:~openerp-dev/openobject-addons/trunk-bug-1252683-cod into lp:openobject-addons

[Chirag Dodiya(OpenERP)]

Hello,

     I have fixed this bug: "point of sale: duplicate xml id in point_of_sale_view.xml."

Thanks,
Chirag Dodiya(cod).

Unmerged revisions

9067. By Chirag Dodiya(OpenERP) on 2014-01-29

[FIX]duplicate xml id in point_of_sale_view.xml

=== modified file 'point_of_sale/point_of_sale_view.xml'
--- point_of_sale/point_of_sale_view.xml	2014-01-27 16:09:46 +0000
+++ point_of_sale/point_of_sale_view.xml	2014-02-07 09:06:26 +0000
@@ -140,28 +140,6 @@
                 </tree>
             </field>
         </record>
-        <record id="view_pos_order_filter" model="ir.ui.view">
-            <field name="name">pos.order.list.select</field>
-            <field name="model">pos.order</field>
-            <field name="arch" type="xml">
-                <search string="Search Sales Order">
-                    <field name="name" string="Sales Order"/>
-                    <field name="date_order"/>
-                    <field name="pos_reference"/>
-                    <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
-                    <filter icon="gtk-apply" string="Done" domain="[('state','in',('paid','invoiced','done'))]"/>
-                    <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/>
-                    <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/>
-                    <field name="user_id"/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Order Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
 
         <menuitem name="Daily Operations" id="menu_point_of_sale" parent="menu_point_root" sequence="10"/>
         <menuitem parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="2" groups="group_pos_manager,group_pos_user"/>
@@ -999,6 +977,7 @@
                 <search string="Search Sales Order">
                     <field name="name"/>
                     <field name="date_order"/>
+                    <field name="pos_reference"/>
                     <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
                     <filter icon="gtk-apply" string="Done" domain="[('state','in',('paid','invoiced','done'))]"/>
                     <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/>