← Back to team overview

account-payment-team team mailing list archive

[Merge] lp:~mileo/account-payment/7.0 into lp:account-payment/7.0

 

Luis Felipe Miléo - http://www.akretion.com has proposed merging lp:~mileo/account-payment/7.0 into lp:account-payment/7.0.

Requested reviews:
  Raphaël Valyi - http://www.akretion.com (rvalyi)

For more details, see:
https://code.launchpad.net/~mileo/account-payment/7.0/+merge/141669

New Fixes
-- 
https://code.launchpad.net/~mileo/account-payment/7.0/+merge/141669
Your team Account Payment is subscribed to branch lp:account-payment/7.0.
=== modified file 'account_payment_extension/payment_view.xml'
--- account_payment_extension/payment_view.xml	2013-01-02 18:00:43 +0000
+++ account_payment_extension/payment_view.xml	2013-01-02 20:16:22 +0000
@@ -191,13 +191,15 @@
     </record>
    
 
-    <!--************ account.move.line extension to show additional fields **********-->
-    <record model="ir.ui.view" id="payments_move_line_tree">
-        <field name="name">account.payments.move.line.tree</field>
+    <!--************ account.move.line extension to show additional fields ********** -->
+    <record model="ir.ui.view" id="view_move_line_tree_wiz">
+        <field name="name">account.move.line.tree</field>
         <field name="model">account.move.line</field>
-        <field name="type">tree</field>
-        <field name="inherit_id" ref="account_payment.view_move_line_tree_wiz"/>
+        <field name="inherit_id" ref="account.view_move_line_tree"/>
         <field name="arch" type="xml">
+            <field name="reconcile" position="after">
+                <field name="amount_to_pay"/>
+            </field>
             <field name="currency_id" position="replace">
                 <field name="currency_id" groups="base.group_extended"/>
                 <field name="reconcile_id"/>
@@ -208,6 +210,17 @@
         </field>
     </record>
 
+
+<!--    <record model="ir.ui.view" id="payments_move_line_tree">
+        <field name="name">account.payments.move.line.tree</field>
+        <field name="model">account.move.line</field>
+        <field name="type">tree</field>
+        <field name="inherit_id" ref="account_payment.view_move_line_tree_wiz"/>
+        <field name="arch" type="xml">
+
+        </field>
+    </record>-->
+
     <record model="ir.ui.view" id="payments_move_line_form">
         <field name="name">account.payments.move.line.form</field>
         <field name="model">account.move.line</field>


Follow ups