[11] migrating split payment

OCA · Jul 6, 2018 · 1f41484 · 1f41484
1 parent 3278d3e
commit 1f41484
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 23 deletions.
diff --git a/l10n_it_split_payment/README.rst b/l10n_it_split_payment/README.rst
@@ -64,6 +64,7 @@ Contributors
 * Davide Corio <[email protected]>
 * Lorenzo Battistini <[email protected]>
 * Alessio Gerace <[email protected]>
+* Giacomo Grasso <[email protected]>
 
 Maintainer
 ----------

diff --git a/l10n_it_split_payment/__init__.py b/l10n_it_split_payment/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2015  Davide Corio <[email protected]>
 # Copyright 2015  Lorenzo Battistini - Agile Business Group
 # Copyright 2016  Alessio Gerace - Agile Business Group

diff --git a/l10n_it_split_payment/__manifest__.py b/l10n_it_split_payment/__manifest__.py
@@ -1,19 +1,20 @@
-# -*- coding: utf-8 -*-
 # Copyright 2015  Davide Corio <[email protected]>
 # Copyright 2015-2016  Lorenzo Battistini - Agile Business Group
 # Copyright 2016  Alessio Gerace - Agile Business Group
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
     'name': 'Split Payment',
-    'version': '10.0.1.0.0',
+    'version': '11.0.1.0.0',
     'category': 'Localization/Italy',
     'summary': 'Split Payment',
     'author': 'Abstract, Agile Business Group, '
               'Odoo Community Association (OCA)',
-    'website': 'http://www.abstract.it',
+    'website': 'https://github.com/OCA/l10n-italy',
     'license': 'AGPL-3',
-    'depends': ['account'],
+    'depends': [
+        'account',
+        'account_invoicing'],
     'data': [
         'views/account_view.xml',
         'views/config_view.xml',

diff --git a/l10n_it_split_payment/models/__init__.py b/l10n_it_split_payment/models/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2015  Davide Corio <[email protected]>
 # Copyright 2015  Lorenzo Battistini - Agile Business Group
 # Copyright 2016  Alessio Gerace - Agile Business Group

diff --git a/l10n_it_split_payment/models/account.py b/l10n_it_split_payment/models/account.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2015  Davide Corio <[email protected]>
 # Copyright 2015-2016  Lorenzo Battistini - Agile Business Group
 # Copyright 2016  Alessio Gerace - Agile Business Group

diff --git a/l10n_it_split_payment/models/config.py b/l10n_it_split_payment/models/config.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2015  Davide Corio <[email protected]>
 # Copyright 2015  Lorenzo Battistini - Agile Business Group
 # Copyright 2016  Alessio Gerace - Agile Business Group
@@ -16,7 +15,7 @@ class ResCompany(models.Model):
 
 
 class AccountConfigSettings(models.TransientModel):
-    _inherit = 'account.config.settings'
+    _inherit = 'res.config.settings'
 
     sp_account_id = fields.Many2one(
         related='company_id.sp_account_id',

diff --git a/l10n_it_split_payment/tests/__init__.py b/l10n_it_split_payment/tests/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2015  Davide Corio <[email protected]>
 # Copyright 2015  Lorenzo Battistini - Agile Business Group
 # Copyright 2016  Alessio Gerace - Agile Business Group

diff --git a/l10n_it_split_payment/tests/test_splitpayment.py b/l10n_it_split_payment/tests/test_splitpayment.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2015  Davide Corio <[email protected]>
 # Copyright 2015-2016  Lorenzo Battistini - Agile Business Group
 # Copyright 2016  Alessio Gerace - Agile Business Group

diff --git a/l10n_it_split_payment/views/config_view.xml b/l10n_it_split_payment/views/config_view.xml
@@ -3,21 +3,31 @@
 
     <record id="view_account_config_settings" model="ir.ui.view">
         <field name="name">view_account_config_settings</field>
-        <field name="model">account.config.settings</field>
-        <field name="inherit_id" ref="account.view_account_config_settings"/>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
         <field name="arch" type="xml">
-            <xpath expr="/form/group[6]" position="after">
-                <separator string="Split Payment"/>
-                <group name="Split Payment">
-                    <label for="id" string="Configuration"/>
-                    <div>
-                        <div>
-                            <label for="sp_account_id"/>
-                            <field name="sp_account_id" class="oe_inline"/>
+            <div id="eu_service" position="after">
+                <div class="col-xs-12 col-md-6 o_setting_box"
+                     title="Configuration for Split Payment module">
+                    <div class="o_setting_left_pane"/>
+                    <div class="o_setting_right_pane">
+                        <label for="sp_account_id"/>
+                        <span class="fa fa-lg fa-building-o"
+                              title="Configuration for Split Payment module."
+                              groups="base.group_multi_company"/>
+                        <div class="text-muted">
+                           Configuration for Split Payment module.
+                        </div>
+                        <div class="content-group">
+                            <div class="row mt16">
+                                <label string="Account" for="sp_account_id" class="col-md-3 o_light_label"/>
+                                <field name="sp_account_id"/>
+                            </div>
                         </div>
                     </div>
-                </group>
-            </xpath>
+                </div>
+            </div>
+
         </field>
     </record>