Merge lp:~therp-nl/openobject-addons/7.0-lp1207375-payment_order_amounts_visibility into lp:~openerp-dev/openobject-addons/7.0-opw-596134-dhr

[Stefan Rijnhart (Opener)]

[Stéphane Bidoul (Acsone) (sbi)]

review: Approve

Unmerged revisions

9353. By Stefan Rijnhart (Opener) on 2013-08-16

[FIX] Show payment order line amount in tree view, payment order amount in form view

=== modified file 'account_payment/account_payment_view.xml'
--- account_payment/account_payment_view.xml	2013-08-12 06:13:46 +0000
+++ account_payment/account_payment_view.xml	2013-08-16 14:26:37 +0000
@@ -102,6 +102,7 @@
                     </div>
                     <group>
                         <group>
+                            <field name="total"/>
                             <field name="user_id"/>
                             <field name="mode"/>
                         </group>
@@ -159,7 +160,7 @@
                             <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
                             <field name="ml_maturity_date"/>
                             <field name="date"/>
-                            <field name="amount_currency" string="Amount" groups="base.group_multi_currency"/>
+                            <field name="amount_currency" string="Amount"/>
                             <field name="currency" groups="base.group_multi_currency"/>
                             <field name="name"/>
                             <field name="amount" sum="Total in Company Currency" invisible="1"/>