← Back to team overview

account-payment-team team mailing list archive

[Merge] lp:~manuel-sanchez/account-payment/account-payment into lp:account-payment

 

Nelo Sánchez has proposed merging lp:~manuel-sanchez/account-payment/account-payment into lp:account-payment.

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

For more details, see:
https://code.launchpad.net/~manuel-sanchez/account-payment/account-payment/+merge/160140

[FIX] uncommented block Payments of file payment_view.xml in module account_payment_extension because in function fields_view_get in file account_move_line.py not find the items commented.
-- 
https://code.launchpad.net/~manuel-sanchez/account-payment/account-payment/+merge/160140
Your team Account Payment is requested to review the proposed merge of lp:~manuel-sanchez/account-payment/account-payment into lp:account-payment.
=== modified file 'account_payment_extension/payment_view.xml'
--- account_payment_extension/payment_view.xml	2012-12-31 10:14:41 +0000
+++ account_payment_extension/payment_view.xml	2013-04-22 15:18:42 +0000
@@ -342,7 +342,7 @@
     </record>
     <menuitem action="action_rec_payment_order_tree" id="menu_action_rec_payment_order_form" parent="account_payment.menu_main_payment" sequence="2"/>
 
-    <!--
+    
     =========================================================================================
      PAYMENTS
     =========================================================================================
@@ -407,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>
@@ -418,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>
@@ -429,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>


Follow ups