Merge lp:~mileo/account-payment/7.0 into lp:~account-payment-team/account-payment/6.1

[Luis Felipe Miléo - http://www.kmee.com.br]

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

95. By Luis Felipe Miléo - http://www.kmee.com.br on 2012-12-28

[MIGR][account_payment_extension][FIX] Disabled views for module install on 7.0; Work in progress

96. By Luis Felipe Miléo - http://www.kmee.com.br on 2012-12-28

[MIGR][account_payment_extension][FIX] Account Invoice Views

[Niels Huylebroeck (red15)]

I'm seeing a little bit of trailing whitespace here and there being added, not a big deal but you might want to check your editor settings to minimize these occurances (see line 16-19 on the diff)

review: Approve

[Niels Huylebroeck (red15)]

I've merged the diff and edited the whitespace at the same time.
You also had set an executing bit on the xml file (removed that as well).

=== 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 17:06:22 +0000
@@ -153,6 +153,7 @@
     =================================================================================================
     -->
     <!--Field partner_bank_id in client invoices has a strange domain: domain="[('partner_id.ref_companies', 'in', [company_id])]"-->
+    
     <record model="ir.ui.view" id="invoice_form3">
         <field name="name">account.invoice.form3.payment_type</field>
         <field name="model">account.invoice</field>
@@ -163,15 +164,15 @@
                 <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
             </field>
         </field>
-    </record>
-
+    </record>   
+    
     <record model="ir.ui.view" id="invoice_form4">
         <field name="name">account.invoice.form4.payment_type</field>
         <field name="model">account.invoice</field>
         <field name="type">form</field>
         <field name="inherit_id" ref="account.invoice_form"/>
         <field name="arch" type="xml">
-            <field name="address_invoice_id" position="after">
+            <field name="fiscal_position" position="after">
                 <field domain="[('company_id', '=', company_id)]" name="payment_type" on_change="onchange_payment_type(payment_type, partner_id)" />
             </field>
         </field>
@@ -183,14 +184,15 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="account.invoice_supplier_form"/>
         <field name="arch" type="xml">
-            <field name="address_invoice_id" position="after">
+            <field name="fiscal_position" position="after">
                 <field domain="[('company_id', '=', company_id)]" name="payment_type" on_change="onchange_payment_type(payment_type, partner_id)" />
             </field>
         </field>
     </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>
         <field name="model">account.move.line</field>
@@ -223,7 +225,7 @@
             </separator>
         </field>
     </record>
-
+	-->
 
     <!--
     ========================================================================================================
@@ -345,7 +347,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 +408,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 +419,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 +430,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