DO NOT MERGE [12.0]AFR extensions

account_financial_report/__manifest__.py

@@ -1,16 +1,17 @@
 # Author: Damien Crier
 # Author: Julien Coux
 # Copyright 2016 Camptocamp SA
+# Copyright 2020 ForgeFlow S.L. (https://www.forgeflow.com)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     'name': 'Account Financial Reports',
-    'version': '12.0.1.2.2',
+    'version': '12.0.2.0.0',
     'category': 'Reporting',
     'summary': 'OCA Financial Reports',
     'author': 'Camptocamp SA,'
               'initOS GmbH,'
               'redCOR AG,'
-              'Eficent,'
+              'ForgeFlow,'
               'Odoo Community Association (OCA)',
     "website": "https://odoo-community.org/",
     'depends': [

account_financial_report/models/account_group.py

@@ -23,6 +23,28 @@ class AccountGroup(models.Model):
         'account.account',
         compute='_compute_group_accounts',
         string="Compute accounts", store=True)
+    complete_name = fields.Char("Full Name",
+                                compute='_compute_complete_name')
+    complete_code = fields.Char("Full Code",
+                                compute='_compute_complete_code')
+
+    @api.depends('name', 'parent_id.complete_name')
+    def _compute_complete_name(self):
+        """ Forms complete name of location from parent location to child location. """
+        if self.parent_id.complete_name:
+            self.complete_name = '%s/%s' % (self.parent_id.complete_name,
+                                            self.name)
+        else:
+            self.complete_name = self.name
+
+    @api.depends('code_prefix', 'parent_id.complete_code')
+    def _compute_complete_code(self):
+        """ Forms complete code of location from parent location to child location. """
+        if self.parent_id.complete_code:
+            self.complete_code = '%s/%s' % (self.parent_id.complete_code,
+                                            self.code_prefix)
+        else:
+            self.complete_code = self.code_prefix
 
     @api.multi
     @api.depends('parent_id', 'parent_id.level')

account_financial_report/readme/CONTRIBUTORS.rst

@@ -1,4 +1,4 @@
-* Jordi Ballester <jordi.ballester@eficient.com>
+* Jordi Ballester <jordi.ballester@forgeflow.com>
 * Yannick Vaucher <[email protected]>
 * Simone Orsi <[email protected]>
 * Leonardo Pistone <[email protected]>
@@ -14,7 +14,8 @@
 * Akim Juillerat <[email protected]>
 * Alexis de Lattre <[email protected]>
 * Mihai Fekete <[email protected]>
-* Miquel Raïch <[email protected]>
+* Miquel Raïch <[email protected]>
+* Joan Sisquella <[email protected]>
 * `Tecnativa <https://www.tecnativa.com>`__:
 
   * Pedro M. Baeza

account_financial_report/report/__init__.py

@@ -3,7 +3,6 @@
 # © 2016 Julien Coux (Camptocamp)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).-
 
-from . import abstract_report
 from . import abstract_report_xlsx
 from . import aged_partner_balance
 from . import aged_partner_balance_xlsx