← Back to team overview

account-payment-team team mailing list archive

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

 

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

Requested reviews:
  Account Payment (account-payment-team)

For more details, see:
https://code.launchpad.net/~mileo/account-payment/7.0/+merge/141422
-- 
https://code.launchpad.net/~mileo/account-payment/7.0/+merge/141422
Your team Account Payment is requested to review the proposed merge of lp:~mileo/account-payment/7.0 into lp:account-payment.
=== modified file 'account_payment_extension/payment_view.xml' (properties changed: -x to +x)
--- account_payment_extension/payment_view.xml	2012-11-15 10:33:02 +0000
+++ account_payment_extension/payment_view.xml	2012-12-28 15:18:37 +0000
@@ -191,6 +191,7 @@
 
 
     <!--************ 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>
         <field name="model">account.move.line</field>
@@ -223,7 +224,7 @@
             </separator>
         </field>
     </record>
-
+	-->
 
     <!--
     ========================================================================================================
@@ -345,7 +346,7 @@
     =========================================================================================
      PAYMENTS
     =========================================================================================
-    -->
+    
     <record id="view_payments_tree" model="ir.ui.view">
         <field name="name">Payments</field>
         <field name="model">account.move.line</field>
@@ -406,8 +407,8 @@
            </search>
         </field>
     </record>
-
-    <!-- Invoice Payments -->
+	-->
+    <!-- Invoice Payments
     <record model="ir.actions.act_window" id="action_invoice_payments">
         <field name="name">Invoice payments</field>
         <field name="res_model">account.move.line</field>
@@ -417,8 +418,8 @@
         <field name="domain">[('account_id.type','in',['receivable','payable']),('invoice','&lt;&gt;',False)]</field>
     </record>
     <menuitem name="Invoice payments" parent="account_payment.menu_main_payment" action="action_invoice_payments" id="menu_action_invoice_payments" sequence="4"/>
-
-    <!-- Done Payments -->
+	-->
+    <!-- Done Payments
     <record model="ir.actions.act_window" id="action_done_payments">
         <field name="name">Done payments</field>
         <field name="res_model">account.move.line</field>
@@ -428,6 +429,6 @@
         <field name="domain">[('account_id.type','in',['receivable','payable']),('invoice','=',False)]</field>
     </record>
     <menuitem name="Done payments" parent="account_payment.menu_main_payment" action="action_done_payments" id="menu_action_done_payments" sequence="5"/>
-
+	-->
 </data>
 </openerp>
\ No newline at end of file


Follow ups