diff --git a/account_operating_unit/README.rst b/account_operating_unit/README.rst
index 4e802b1e8e..1d3a847ee0 100644
--- a/account_operating_unit/README.rst
+++ b/account_operating_unit/README.rst
@@ -85,7 +85,7 @@ Usage
 
 .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
    :alt: Try me on Runbot
-   :target: https://runbot.odoo-community.org/runbot/213/10.0
+   :target: https://runbot.odoo-community.org/runbot/213/11.0
 
 Known issues / Roadmap
 ======================
@@ -119,6 +119,8 @@ Contributors
 * Jordi Ballester Alomar <jordi.ballester@eficent.com>
 * Aarón Henríquez <ahenriquez@eficent.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+* WilldooIT Pty Ltd <info@willdooit.com>
+* Michael Villamar <michael.villamar@willdooit.com>
 
 Maintainer
 ----------
diff --git a/account_operating_unit/__init__.py b/account_operating_unit/__init__.py
index a647cd034c..06448aae56 100644
--- a/account_operating_unit/__init__.py
+++ b/account_operating_unit/__init__.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-# © 2016-17 Eficent Business and IT Consulting Services S.L.
-# © 2016 Serpent Consulting Services Pvt. Ltd.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
+
 from . import models
 from . import wizard
 from . import report
diff --git a/account_operating_unit/__manifest__.py b/account_operating_unit/__manifest__.py
index 9eaee8e0ac..179f15cdc8 100644
--- a/account_operating_unit/__manifest__.py
+++ b/account_operating_unit/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # © 2016-17 Eficent Business and IT Consulting Services S.L.
 # © 2016 Serpent Consulting Services Pvt. Ltd.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
@@ -6,9 +5,10 @@
     "name": 'Accounting with Operating Units',
     "summary": "Introduces Operating Unit fields in invoices and "
                "Accounting Entries with clearing account",
-    "version": "10.0.1.1.0",
+    "version": "11.0.1.0.0",
     "author": "Eficent, "
               "Serpent Consulting Services Pvt. Ltd.,"
+              "WilldooIT Pty Ltd,"
               "Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/operating-unit",
     "category": "Accounting & Finance",
@@ -24,7 +24,6 @@
         "views/account_invoice_report_view.xml",
         "views/report_financial.xml",
         "views/report_trialbalance.xml",
-        "views/report_agedpartnerbalance.xml",
         "wizard/account_report_common_view.xml",
         "wizard/account_financial_report_view.xml",
         "wizard/account_report_trial_balance_view.xml",
diff --git a/account_operating_unit/models/__init__.py b/account_operating_unit/models/__init__.py
index f1237de449..a3df860d0f 100644
--- a/account_operating_unit/models/__init__.py
+++ b/account_operating_unit/models/__init__.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-# © 2016-17 Eficent Business and IT Consulting Services S.L.
-# © 2016 Serpent Consulting Services Pvt. Ltd.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
+
 from . import company
 from . import account_journal
 from . import account_move
diff --git a/account_operating_unit/models/account_journal.py b/account_operating_unit/models/account_journal.py
index aac87cb468..cfe8c9fbbb 100644
--- a/account_operating_unit/models/account_journal.py
+++ b/account_operating_unit/models/account_journal.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-# © 2016-17 Eficent Business and IT Consulting Services S.L.
-# © 2016 Serpent Consulting Services Pvt. Ltd.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
+
 from odoo import api, fields, models, _
 from odoo.exceptions import UserError
 
diff --git a/account_operating_unit/models/account_move.py b/account_operating_unit/models/account_move.py
index c59c190df4..a6e75b185c 100644
--- a/account_operating_unit/models/account_move.py
+++ b/account_operating_unit/models/account_move.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-# © 2016-17 Eficent Business and IT Consulting Services S.L.
-# © 2016 Serpent Consulting Services Pvt. Ltd.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
+
 from odoo.tools.translate import _
 from odoo import api, fields, models
 from odoo.exceptions import UserError
@@ -114,7 +112,7 @@ def post(self):
             # Create balancing entries for un-balanced OU's.
             ou_balances = self._check_ou_balance(move)
             amls = []
-            for ou_id in ou_balances.keys():
+            for ou_id in list(ou_balances.keys()):
                 # If the OU is already balanced, then do not continue
                 if move.company_id.currency_id.is_zero(ou_balances[ou_id]):
                     continue
diff --git a/account_operating_unit/models/account_payment.py b/account_operating_unit/models/account_payment.py
index 3dc2d1dcf1..c466f445a3 100644
--- a/account_operating_unit/models/account_payment.py
+++ b/account_operating_unit/models/account_payment.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-# © 2016-17 Eficent Business and IT Consulting Services S.L.
-# © 2016 Serpent Consulting Services Pvt. Ltd.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
+
 from odoo import api, fields, models, _
 
 
@@ -47,7 +45,7 @@ def _get_dst_liquidity_aml_dict_vals(self):
         if self.currency_id != self.company_id.currency_id:
             dst_liquidity_aml_dict.update({
                 'currency_id': self.currency_id.id,
-                'amount_currency': self.amount,
+                'amount_currency': -self.amount,
             })
 
         dst_liquidity_aml_dict.update({
@@ -62,11 +60,6 @@ def _get_transfer_debit_aml_dict_vals(self):
             'account_id': self.company_id.transfer_account_id.id,
             'journal_id': self.destination_journal_id.id
         }
-        if self.currency_id != self.company_id.currency_id:
-            transfer_debit_aml_dict.update({
-                'currency_id': self.currency_id.id,
-                'amount_currency': -self.amount,
-            })
         transfer_debit_aml_dict.update({
             'operating_unit_id':
                 self.journal_id.operating_unit_id.id or False
diff --git a/account_operating_unit/models/company.py b/account_operating_unit/models/company.py
index f3c2b8ee0b..f007bb419f 100644
--- a/account_operating_unit/models/company.py
+++ b/account_operating_unit/models/company.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-# © 2016-17 Eficent Business and IT Consulting Services S.L.
-# © 2016 Serpent Consulting Services Pvt. Ltd.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
+
 from odoo import api, fields, models
 from odoo.tools.translate import _
 from odoo.exceptions import UserError
diff --git a/account_operating_unit/models/invoice.py b/account_operating_unit/models/invoice.py
index 44b96c2f16..e6c6f9f7cd 100644
--- a/account_operating_unit/models/invoice.py
+++ b/account_operating_unit/models/invoice.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-# © 2016-17 Eficent Business and IT Consulting Services S.L.
-# © 2016 Serpent Consulting Services Pvt. Ltd.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
+
 from odoo import api, fields, models
 from odoo.exceptions import ValidationError
 from odoo.tools.translate import _
diff --git a/account_operating_unit/report/__init__.py b/account_operating_unit/report/__init__.py
index 5be7018e74..828ca7dd4d 100644
--- a/account_operating_unit/report/__init__.py
+++ b/account_operating_unit/report/__init__.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-# © 2016-17 Eficent Business and IT Consulting Services S.L.
-# © 2016 Serpent Consulting Services Pvt. Ltd.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
+
 from . import account_invoice_report
diff --git a/account_operating_unit/report/account_invoice_report.py b/account_operating_unit/report/account_invoice_report.py
index c61958213a..8eec126a27 100644
--- a/account_operating_unit/report/account_invoice_report.py
+++ b/account_operating_unit/report/account_invoice_report.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-# © 2016-17 Eficent Business and IT Consulting Services S.L.
-# © 2016 Serpent Consulting Services Pvt. Ltd.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
+
 from odoo import fields, models
 
 
diff --git a/account_operating_unit/tests/__init__.py b/account_operating_unit/tests/__init__.py
index 9ef001663c..071cbac008 100644
--- a/account_operating_unit/tests/__init__.py
+++ b/account_operating_unit/tests/__init__.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-# © 2016-17 Eficent Business and IT Consulting Services S.L.
-# © 2016 Serpent Consulting Services Pvt. Ltd.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
+
 from . import test_account_operating_unit
 from . import test_invoice_operating_unit
 from . import test_cross_ou_journal_entry
diff --git a/account_operating_unit/tests/test_account_operating_unit.py b/account_operating_unit/tests/test_account_operating_unit.py
index e73ac94d56..c347d251c6 100644
--- a/account_operating_unit/tests/test_account_operating_unit.py
+++ b/account_operating_unit/tests/test_account_operating_unit.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-# © 2016-17 Eficent Business and IT Consulting Services S.L.
-# © 2016 Serpent Consulting Services Pvt. Ltd.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
+
 from odoo.addons.account.tests.account_test_classes import AccountingTestCase
 
 
diff --git a/account_operating_unit/tests/test_cross_ou_journal_entry.py b/account_operating_unit/tests/test_cross_ou_journal_entry.py
index 566cbab64c..6f03dfb686 100644
--- a/account_operating_unit/tests/test_cross_ou_journal_entry.py
+++ b/account_operating_unit/tests/test_cross_ou_journal_entry.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-# © 2016-17 Eficent Business and IT Consulting Services S.L.
-# © 2016 Serpent Consulting Services Pvt. Ltd.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
+
 from . import test_account_operating_unit as test_ou
 
 
diff --git a/account_operating_unit/tests/test_invoice_operating_unit.py b/account_operating_unit/tests/test_invoice_operating_unit.py
index b7f7a3b10a..9a8ca988f8 100644
--- a/account_operating_unit/tests/test_invoice_operating_unit.py
+++ b/account_operating_unit/tests/test_invoice_operating_unit.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-# © 2016-17 Eficent Business and IT Consulting Services S.L.
-# © 2016 Serpent Consulting Services Pvt. Ltd.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
+
 from . import test_account_operating_unit as test_ou
 
 
diff --git a/account_operating_unit/tests/test_operating_unit_security.py b/account_operating_unit/tests/test_operating_unit_security.py
index 17cd77b0cc..8cfc5ab232 100644
--- a/account_operating_unit/tests/test_operating_unit_security.py
+++ b/account_operating_unit/tests/test_operating_unit_security.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-# © 2016-17 Eficent Business and IT Consulting Services S.L.
-# © 2016 Serpent Consulting Services Pvt. Ltd.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
+
 from . import test_account_operating_unit as test_ou
 
 
diff --git a/account_operating_unit/tests/test_payment_operating_unit.py b/account_operating_unit/tests/test_payment_operating_unit.py
index 13f9cf6a11..ed957457af 100644
--- a/account_operating_unit/tests/test_payment_operating_unit.py
+++ b/account_operating_unit/tests/test_payment_operating_unit.py
@@ -1,10 +1,7 @@
-# -*- coding: utf-8 -*-
-# © 2016-17 Eficent Business and IT Consulting Services S.L.
-# © 2016 Serpent Consulting Services Pvt. Ltd.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
-from odoo.addons.account_operating_unit.tests import (
+
+from odoo.addons.account_operating_unit.tests import\
     test_account_operating_unit as test_ou
-    )  # noqa
 import time
 
 
@@ -29,9 +26,9 @@ def test_payment_from_invoice(self):
                 'payment_method_id': self.payment_method_manual_in.id
             })
 
-        register_payments.create_payment()
+        register_payments.create_payments()
         payment = self.payment_model.search([], order="id desc", limit=1)
 
-        self.assertAlmostEquals(payment.amount, 115000)
+        self.assertAlmostEqual(payment.amount, 115000)
         self.assertEqual(payment.state, 'posted')
         self.assertEqual(self.invoice.state, 'paid')
diff --git a/account_operating_unit/views/account_journal_view.xml b/account_operating_unit/views/account_journal_view.xml
index a97bd68ff2..3893eff179 100644
--- a/account_operating_unit/views/account_journal_view.xml
+++ b/account_operating_unit/views/account_journal_view.xml
@@ -9,7 +9,8 @@
             <field name="company_id" position="after">
                 <field name="operating_unit_id"
                        options="{'no_create': True}"
-                       groups="operating_unit.group_multi_operating_unit"/>
+                       groups="operating_unit.group_multi_operating_unit"
+                       attrs="{'invisible':[('type','not in', ['bank', 'cash'])]}"/>
             </field>
         </field>
     </record>
diff --git a/account_operating_unit/views/account_move_view.xml b/account_operating_unit/views/account_move_view.xml
index d881f0408a..22fd12770b 100644
--- a/account_operating_unit/views/account_move_view.xml
+++ b/account_operating_unit/views/account_move_view.xml
@@ -14,19 +14,6 @@
         </field>
     </record>
 
-    <record id="view_move_line_form2" model="ir.ui.view">
-        <field name="name">account.move.line.form2</field>
-        <field name="model">account.move.line</field>
-        <field name="inherit_id" ref="account.view_move_line_form2"/>
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='account_id']" position="after">
-                <field name="operating_unit_id"
-                       options="{'no_create': True}"
-                       groups="operating_unit.group_multi_operating_unit"/>
-            </xpath>
-        </field>
-    </record>
-
     <record id="view_move_line_tree" model="ir.ui.view">
         <field name="name">account.move.line.tree</field>
         <field name="model">account.move.line</field>
diff --git a/account_operating_unit/views/invoice_view.xml b/account_operating_unit/views/invoice_view.xml
index b9bd6e866a..c6ebfd981f 100644
--- a/account_operating_unit/views/invoice_view.xml
+++ b/account_operating_unit/views/invoice_view.xml
@@ -46,7 +46,7 @@
             </xpath>
             <xpath expr="//field[@name='invoice_line_ids']/tree/field[@name='account_analytic_id']"
                    position="attributes">
-                <attribute name="domain">[('company_id', '=', parent.company_id), '|', ('operating_unit_ids', 'in', [operating_unit]), ('operating_unit_ids', '=', False)]</attribute>
+                <attribute name="domain">[('company_id', '=', parent.company_id), '|', ('operating_unit_ids', '=', context.get('operating_unit', False)), ('operating_unit_ids', '=', False)]</attribute>
             </xpath>
             <xpath  expr="//field[@name='tax_line_ids']"
                     position="attributes">
@@ -54,7 +54,7 @@
             </xpath>
             <xpath expr="//field[@name='tax_line_ids']/tree/field[@name='account_analytic_id']"
                    position="attributes">
-                <attribute name="domain">[('company_id', '=', parent.company_id), '|', ('operating_unit_ids', 'in', [operating_unit]), ('operating_unit_ids', '=', False)]</attribute>
+                <attribute name="domain">[('company_id', '=', parent.company_id), '|', ('operating_unit_ids', '=', context.get('operating_unit', False)), ('operating_unit_ids', '=', False)]</attribute>
             </xpath>
         </field>
     </record>
@@ -75,7 +75,7 @@
             </xpath>
             <xpath expr="//field[@name='invoice_line_ids']/tree/field[@name='account_analytic_id']"
                    position="attributes">
-                <attribute name="domain">[('company_id', '=', parent.company_id), '|', ('operating_unit_ids', 'in', [operating_unit]), ('operating_unit_ids', '=', False)]</attribute>
+                <attribute name="domain">[('company_id', '=', parent.company_id), '|', ('operating_unit_ids', '=', context.get('operating_unit', False)), ('operating_unit_ids', '=', False)]</attribute>
             </xpath>
         </field>
     </record>
diff --git a/account_operating_unit/views/report_agedpartnerbalance.xml b/account_operating_unit/views/report_agedpartnerbalance.xml
index d8c6eced3d..0d3a36aa0a 100644
--- a/account_operating_unit/views/report_agedpartnerbalance.xml
+++ b/account_operating_unit/views/report_agedpartnerbalance.xml
@@ -3,8 +3,8 @@
 
     <template id="report_agedpartnerbalance_operating_units"
               inherit_id="account.report_agedpartnerbalance">
-        <xpath expr="//div[@class='row mt32']" position="inside">
-            <div class="col-xs-4" t-if="data['operating_units']">
+        <xpath expr="//div[hasclass('row', 'mt32')]" position="inside">
+            <div class="col-xs-3" t-if="data['operating_units']">
                 <strong>Operating Units:</strong>
                   <p t-esc="data['operating_units']"/>
             </div>
diff --git a/account_operating_unit/views/report_financial.xml b/account_operating_unit/views/report_financial.xml
index 13221c85f1..3ebcdbfb3c 100644
--- a/account_operating_unit/views/report_financial.xml
+++ b/account_operating_unit/views/report_financial.xml
@@ -3,7 +3,7 @@
 
     <template id="report_financial_operating_units"
               inherit_id="account.report_financial">
-        <xpath expr="//div[@class='row mt32 mb32']" position="inside">
+        <xpath expr="//div[hasclass('row', 'mt32', 'mb32')]" position="inside">
             <div class="col-xs-4" t-if="data['operating_units']">
                 <strong>Operating Units:</strong>
                   <p t-esc="data['operating_units']"/>
diff --git a/account_operating_unit/views/report_trialbalance.xml b/account_operating_unit/views/report_trialbalance.xml
index e7891c537e..ef5a208134 100644
--- a/account_operating_unit/views/report_trialbalance.xml
+++ b/account_operating_unit/views/report_trialbalance.xml
@@ -3,7 +3,7 @@
 
     <template id="report_trialbalance_operating_units"
               inherit_id="account.report_trialbalance">
-        <xpath expr="//div[@class='row mt32']" position="inside">
+        <xpath expr="//div[hasclass('row', 'mt32')]" position="inside">
             <div class="col-xs-4" t-if="data['operating_units']">
                 <strong>Operating Units:</strong>
                   <p t-esc="data['operating_units']"/>
diff --git a/account_operating_unit/wizard/__init__.py b/account_operating_unit/wizard/__init__.py
index 39014534b2..407c677547 100644
--- a/account_operating_unit/wizard/__init__.py
+++ b/account_operating_unit/wizard/__init__.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-# © 2016-17 Eficent Business and IT Consulting Services S.L.
-# © 2016 Serpent Consulting Services Pvt. Ltd.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
+
 from . import account_report_common
 from . import account_financial_report
 from . import account_report_trial_balance
diff --git a/account_operating_unit/wizard/account_financial_report.py b/account_operating_unit/wizard/account_financial_report.py
index defd7e4844..91a676a9b8 100644
--- a/account_operating_unit/wizard/account_financial_report.py
+++ b/account_operating_unit/wizard/account_financial_report.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-# © 2016-17 Eficent Business and IT Consulting Services S.L.
-# © 2016 Serpent Consulting Services Pvt. Ltd.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
+
 from odoo import fields, models
 
 
diff --git a/account_operating_unit/wizard/account_report_common.py b/account_operating_unit/wizard/account_report_common.py
index 835e8f5ba8..3478f92d86 100644
--- a/account_operating_unit/wizard/account_report_common.py
+++ b/account_operating_unit/wizard/account_report_common.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-# © 2016-17 Eficent Business and IT Consulting Services S.L.
-# © 2016 Serpent Consulting Services Pvt. Ltd.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
+
 from odoo import fields, models
 
 
diff --git a/account_operating_unit/wizard/account_report_trial_balance.py b/account_operating_unit/wizard/account_report_trial_balance.py
index b8bf6a31ac..216d4be1d7 100644
--- a/account_operating_unit/wizard/account_report_trial_balance.py
+++ b/account_operating_unit/wizard/account_report_trial_balance.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-# © 2016-17 Eficent Business and IT Consulting Services S.L.
-# © 2016 Serpent Consulting Services Pvt. Ltd.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
+
 from odoo import fields, models