Merge lp:~openerp-dev/openobject-addons/7.0-opw-596134-dhr into lp:openobject-addons/7.0

[Dharti Ratani(OpenERP)]

Hello Sir,

Made amount field visible in payment order without multi currency group, as in some case there is no requirement of multi currency, but need to enter the amount in payment lines while manually registering payment lines instead of importing invoices.

Thanks
dhr

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

Hello,

This looks good.

To be complete, can you also make a similar change in the tree view showing the payment order lines (about 40 lines below in the same file)?

-sbi

review: Needs Fixing

[Stefan Rijnhart (Opener) (stefan-opener)]

Hi,

I am proposing a branch into this branch here:

https://code.launchpad.net/~therp-nl/openobject-addons/7.0-lp1207375-payment_order_amounts_visibility/+merge/180578

It makes the line amount visible in the tree view, and it also adds the order amount in the order's form view.

Dharti Ratani, please have a look to see if it is acceptable to merge into your own branch.

[lp:~openerp-dev/openobject-addons/7.0-opw-596134-dhr]

9353. By Dharti Ratani(OpenERP) on 2013-08-22

[MERGE]Merged with latest 7.0

9354. By Dharti Ratani(OpenERP) on 2013-08-22

[IMP]Also made amount field visible in payment line tree view in payment order

[Dharti Ratani(OpenERP) (dhr-openerp)]

Hello,

Also made change to the tree view of payment lines in payment order to make the amount field visible without multi currency group.

Thanks
dhr

Unmerged revisions

9354. By Dharti Ratani(OpenERP) on 2013-08-22

[IMP]Also made amount field visible in payment line tree view in payment order

9353. By Dharti Ratani(OpenERP) on 2013-08-22

[MERGE]Merged with latest 7.0

9352. By Dharti Ratani(OpenERP) on 2013-08-12

[IMP]Made amount field in payment order visible without multi currency group to enter amount manually in payment orders, as in some case there is no requirement of multi currency, but need to enter the amount in payment lines

9351. By Dharti Ratani(OpenERP) on 2013-08-08

[IMP]Making 'Amount in Company Currency' visible in payment order to know the amount in case of manually creating bank statement lines rather then importing from wizard

=== modified file 'account_payment/account_payment_view.xml'
--- account_payment/account_payment_view.xml	2013-02-25 13:38:04 +0000
+++ account_payment/account_payment_view.xml	2013-08-22 06:32:38 +0000
@@ -119,10 +119,10 @@
                                         <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_scheduled,currency,company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/>
                                         <separator colspan="4" string="Transaction Information"/>
                                         <field name="date"/>
-                                        <label for="amount_currency" groups="base.group_multi_currency"/>
-                                        <div groups="base.group_multi_currency">
+                                        <label for="amount_currency"/>
+                                        <div>
                                             <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_inline"/>
-                                            <field name="currency" nolabel="1" class="oe_inline"/>
+                                            <field name="currency" nolabel="1" class="oe_inline" groups="base.group_multi_currency"/>
                                         </div>
                                         <field name="partner_id" on_change="onchange_partner(partner_id,parent.mode)"/>
                                         <field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
@@ -159,7 +159,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"/>