Merge lp:~angelmoya/account-payment/fix-account_payment_extension-install into lp:~account-payment-team/account-payment/6.1

[Angel Moya - Domatix]

FIX error installing account_payment_extension

account_payment_extension.action_create_payment_extension_order not found

[mikel (mikel-martin)]

It solves the problem.

Anyway, the code you move appears also in /account_payment_extension/payment_view.xml so it seems that something went wrong in a previous merge.

review: Approve

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

Good observation Mikel! Angel, could you remove the duplicate record?

[Angel Moya - Domatix (angelmoya)]

Ok, tomorrow morning I will fix it
El 24/11/2012 22:00, "Stefan Rijnhart (Therp)" <email address hidden> escribió:

> Good observation Mikel! Angel, could you remove the duplicate record?
> --
>
> https://code.launchpad.net/~angelmoya/account-payment/fix-account_payment_extension-install/+merge/135939
> You are the owner of
> lp:~angelmoya/account-payment/fix-account_payment_extension-install.
>

[lp:~angelmoya/account-payment/fix-account_payment_extension-install]

90. By Angel Moya - Domatix on 2012-11-25

[FIX] duplicated view_payment_order_form_ext1

[Angel Moya - Domatix (angelmoya)]

I removed duplicated view_payment_order_form_ext1, pending to merge.

> Ok, tomorrow morning I will fix it
> El 24/11/2012 22:00, "Stefan Rijnhart (Therp)" <email address hidden> escribió:
>
> > Good observation Mikel! Angel, could you remove the duplicate record?
> > --
> >
> > https://code.launchpad.net/~angelmoya/account-payment/fix-
> account_payment_extension-install/+merge/135939
> > You are the owner of
> > lp:~angelmoya/account-payment/fix-account_payment_extension-install.
> >

=== modified file 'account_payment_extension/wizard/account_payment_order_view.xml'
--- account_payment_extension/wizard/account_payment_order_view.xml	2012-11-01 21:49:33 +0000
+++ account_payment_extension/wizard/account_payment_order_view.xml	2012-11-25 08:02:22 +0000
@@ -1,25 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    <!-- FORM SEARCH-->
-
-    <record id="view_payment_order_form_ext1" model="ir.ui.view">
-        <field name="name">payment.order.form.ext1</field>
-        <field name="model">payment.order</field>
-        <field name="type">form</field>
-        <field name="inherit_id" ref="account_payment.view_payment_order_form"/>
-        <field name="arch" type="xml">
-            <button name="%(account_payment.action_create_payment_order)d" position="replace">
-                <field name="payment_type_name" invisible="1"/>
-                <field name="type"/>
-                <field name="create_account_moves"/>
-                <group colspan="2" col="1" attrs="{'invisible': [('create_account_moves', '=', 'bank-statement')]}">
-                    <field name="period_id" attrs="{'required': [('create_account_moves', '!=', 'bank-statement')]}"/>
-                </group>
-                <button colspan="2" name="%(action_create_payment_extension_order)d" string="Select invoices to pay/receive payment" type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
-            </button>
-        </field>
-    </record>
+    
 
 
         <record id="view_create_payment_extension_order" model="ir.ui.view">
@@ -52,6 +34,7 @@
             </field>
         </record>
 
+    
      <!-- ACCION -->
         <record id="action_create_payment_extension_order" model="ir.actions.act_window">
             <field name="name">Seleccionar facturas a Pagar/Cobrar</field>
@@ -62,5 +45,7 @@
             <field name="view_id" ref="view_create_payment_extension_order"/>
             <field name="target">new</field>
         </record>
+        
+    
     </data>
 </openerp>