Merge lp:~openerp-dev/openobject-addons/trunk-bug-865296-ara into lp:openobject-addons

[Ashvin Rathod (OpenERP)]

Hello,

Fix: form view is not able to open of product'Take money out ' and 'Take money in'

Thanks,
ara

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

=== modified file 'point_of_sale/point_of_sale_view.xml'
--- point_of_sale/point_of_sale_view.xml	2011-09-25 21:47:10 +0000
+++ point_of_sale/point_of_sale_view.xml	2011-10-04 05:17:23 +0000
@@ -624,7 +624,6 @@
                               <separator string="Miscelleanous" colspan="2"/>
                                   <field name="income_pdt"/>
                                   <field name="expense_pdt"/>
-                          <field name="disc_controle"/>
                                   <field name="company_id" groups="base.group_extended,base.group_multi_company"/>
                               </group>
                               <group colspan="2" col="2" name="Prices">