From fc0b6f756c8ef5dea53e055637e800982d939d2a Mon Sep 17 00:00:00 2001
From: Alexey Pelykh <alexey.pelykh@gmail.com>
Date: Sun, 29 Mar 2020 13:36:20 +0200
Subject: [PATCH] [FIX] account_bank_statement_import_paypal: lost wizard

---
 .../__manifest__.py                           |  2 +-
 ...t_bank_statement_import_paypal_mapping.xml | 44 +++++++++----------
 ...statement_import_paypal_mapping_wizard.xml | 19 ++++----
 3 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/account_statement_import_paypal/__manifest__.py b/account_statement_import_paypal/__manifest__.py
index 78e9b009..4e4c1ef5 100644
--- a/account_statement_import_paypal/__manifest__.py
+++ b/account_statement_import_paypal/__manifest__.py
@@ -6,7 +6,7 @@
 {
     'name': 'PayPal CSV Format Bank Statements Import',
     'summary': 'Import PayPal CSV files as Bank Statements in Odoo',
-    'version': '12.0.2.0.0',
+    'version': '12.0.2.0.1',
     'category': 'Accounting',
     'website': 'https://github.com/OCA/bank-statement-import',
     'author':
diff --git a/account_statement_import_paypal/views/account_bank_statement_import_paypal_mapping.xml b/account_statement_import_paypal/views/account_bank_statement_import_paypal_mapping.xml
index 05ed5fe2..7d81e680 100644
--- a/account_statement_import_paypal/views/account_bank_statement_import_paypal_mapping.xml
+++ b/account_statement_import_paypal/views/account_bank_statement_import_paypal_mapping.xml
@@ -30,37 +30,37 @@
                         <group>
                             <field name="float_thousands_sep"/>
                             <field name="float_decimal_sep"/>
+                        </group>
+                        <group>
                             <field name="date_format"/>
                             <field name="time_format"/>
                         </group>
-                        <group string="Columns">
-                            <field name="date_column"/>
-                            <field name="time_column"/>
-                            <field name="tz_column"/>
-                            <field name="name_column"/>
-                            <field name="currency_column"/>
-                            <field name="gross_column"/>
-                            <field name="fee_column"/>
-                            <field name="balance_column"/>
-                            <field name="transaction_id_column"/>
-                            <field name="description_column"/>
-                            <field name="type_column"/>
-                            <field name="from_email_address_column"/>
-                            <field name="to_email_address_column"/>
-                            <field name="invoice_id_column"/>
-                            <field name="subject_column"/>
-                            <field name="note_column"/>
-                            <field name="bank_name_column"/>
-                            <field name="bank_account_column"/>
-                        </group>
+                    </group>
+                    <group string="Columns">
+                        <field name="date_column"/>
+                        <field name="time_column"/>
+                        <field name="tz_column"/>
+                        <field name="name_column"/>
+                        <field name="currency_column"/>
+                        <field name="gross_column"/>
+                        <field name="fee_column"/>
+                        <field name="balance_column"/>
+                        <field name="transaction_id_column"/>
+                        <field name="description_column"/>
+                        <field name="type_column"/>
+                        <field name="from_email_address_column"/>
+                        <field name="to_email_address_column"/>
+                        <field name="invoice_id_column"/>
+                        <field name="subject_column"/>
+                        <field name="note_column"/>
+                        <field name="bank_name_column"/>
+                        <field name="bank_account_column"/>
                     </group>
                 </sheet>
             </form>
         </field>
     </record>
 
-    <!-- TODO: action that launches wizard that could import file header and assume columns by number and index of colums -->
-
     <record id="action_statement_import_paypal_report_mappings" model="ir.actions.act_window">
         <field name="name">PayPal Report Mappings</field>
         <field name="res_model">account.bank.statement.import.paypal.mapping</field>
diff --git a/account_statement_import_paypal/wizards/account_bank_statement_import_paypal_mapping_wizard.xml b/account_statement_import_paypal/wizards/account_bank_statement_import_paypal_mapping_wizard.xml
index 148e5b4a..19b8b3b5 100644
--- a/account_statement_import_paypal/wizards/account_bank_statement_import_paypal_mapping_wizard.xml
+++ b/account_statement_import_paypal/wizards/account_bank_statement_import_paypal_mapping_wizard.xml
@@ -22,13 +22,14 @@
         </field>
     </record>
 
-    <record id="action_account_bank_statement_import_paypal_mapping_wizard" model="ir.actions.act_window">
-        <field name="name">Import Mapping</field>
-        <field name="res_model">account.bank.statement.import.paypal.mapping.wizard</field>
-        <field name="src_model">account.bank.statement.import.paypal.mapping</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">form</field>
-        <field name="target">new</field>
-    </record>
+    <act_window
+        id="action_account_bank_statement_import_paypal_mapping_wizard"
+        name="Import Mapping"
+        res_model="account.bank.statement.import.paypal.mapping.wizard"
+        src_model="account.bank.statement.import.paypal.mapping"
+        view_mode="form"
+        target="new"
+        key2="client_action_multi"
+    />
 
-</odoo>
\ No newline at end of file
+</odoo>