[MERGE] group POS fields in a group, rename action Sales Order Lines

bzr revid: rco@openerp.com-20110519095158-a0d2dsx0e1bfeazg

diff --cc addons/point_of_sale/point_of_sale_view.xml
index acc0a72,32cc6ba..bf21eca
--- 1/addons/point_of_sale/point_of_sale_view.xml
--- 2/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@@ -654,12 -654,15 +654,15 @@@
              <field name="type">form</field>
              <field name="inherit_id" ref="product.product_normal_form_view"/>
              <field name="arch" type="xml">
-                   <field name="active" position="after">
-                       <field name="income_pdt"/>
-                       <field name="expense_pdt"/>
-                       <field name="am_out"/>
-                       <field name="disc_controle"/>
-                   </field>
 -            <xpath expr="/form/notebook/page/group[@name='misc']" position="after">
++                <xpath expr="/form/notebook/page/group[@name='misc']" position="before">
+                     <group colspan="2" col="2">
 -                        <separator string="Point of Sale" colspan="4"/>
 -                            <field name="income_pdt"/>
 -                            <field name="expense_pdt"/>
 -                            <field name="am_out"/>
 -                            <field name="disc_controle"/>
++                        <separator string="Point of Sale" colspan="2"/>
++                        <field name="income_pdt"/>
++                        <field name="expense_pdt"/>
++                        <field name="am_out"/>
++                        <field name="disc_controle"/>
+                     </group>
 -            </xpath>
++                </xpath>
              </field>
          </record>