[IMP] pms: The property now has a related analytical account and distribution model for setting the analytic account by default in the property's journal entry lines. Thus, we can analyze financial data with the analytical filters that exist by default in all financial reports.

Author: omar7r

pms/__manifest__.py

@@ -4,7 +4,7 @@
 {
     "name": "PMS (Property Management System)",
     "summary": "A property management system",
-    "version": "16.0.0.1.0",
+    "version": "16.0.0.2.0",
     "development_status": "Beta",
     "category": "Generic Modules/Property Management System",
     "website": "https://github.com/OCA/pms",
@@ -25,7 +25,6 @@
         "partner_contact_gender",
         "partner_contact_birthdate",
         "partner_contact_nationality",
-        # "account_reconcile_oca",
         # "partner_identification_unique_by_category",
         "queue_job",
         "web_timeline",
@@ -116,7 +115,6 @@
     "qweb": [
         "static/src/xml/pms_base_templates.xml",
         "static/src/xml/reservation_group_button_views.xml",
-        "static/src/xml/account_reconciliation.xml",
     ],
     "pre_init_hook": "pre_init_hook",
 }

pms/data/pms_data.xml

@@ -64,6 +64,11 @@
             <field name="name">Agency</field>
             <field name="channel_type">indirect</field>
         </record>
+        <!-- account.analytic.plan -->
+        <record id="main_pms_analytic_plan" model="account.analytic.plan">
+            <field name="name">Properties</field>
+            <field name="company_id" eval="False" />
+        </record>
         <!--res.partner_category_id-->
         <record id="document_type_passport" model="res.partner.id_category">
             <field name="name">Passport</field>

pms/migrations/14.0.2.22.1/post-migration.py

@@ -0,0 +1,50 @@
+from openupgradelib import openupgrade
+
+
+def populate_properties_analytic_data(env):
+    properties = env['pms.property'].search([])
+    for pms_property in properties:
+        analytic_acc_id = env["account.analytic.account"].create(
+            {
+                "name": pms_property.name,
+                "code": pms_property.ref,
+                "plan_id": env.ref("pms.main_pms_analytic_plan").id,
+                "company_id": pms_property.company_id.id,
+            }
+        )
+        pms_property.analytic_account_id = analytic_acc_id.id
+
+        env['account.analytic.distribution.model'].create({
+            "pms_property_id": pms_property.id,
+            "analytic_distribution": {analytic_acc_id.id: 100},
+            "company_id": pms_property.company_id.id
+        })
+
+
+def recompute_analytic_lines(env):
+    properties = env['pms.property'].search([])
+    cont = 1
+    total = len(properties)
+    for pms_property in properties:
+        cont += 1
+        result = env['account.move.line']._read_group(
+            domain=[('pms_property_id', '=', pms_property.id),
+                    ('account_id.account_type', 'in', ('income', 'expense'))],
+            fields=['analytic_distribution', 'ids:array_agg(id)'],
+            groupby=['analytic_distribution'],
+        )
+        for res in result:
+            distribution_dict = res['analytic_distribution'] or {}
+            distribution_dict.update({pms_property.analytic_account_id.id: 100})
+            lines = env['account.move.line'].\
+                with_context(skip_account_move_synchronization=True, check_move_validity=False).\
+                browse(res['ids'])
+            lines.write({'analytic_distribution': distribution_dict})
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    populate_properties_analytic_data(env)
+
+    # with a lot of data maybe will be better to run this manually in other moment
+    # recompute_analytic_lines(env)

pms/migrations/14.0.2.35.1/post-migration.py

@@ -50,7 +50,7 @@
 from . import ir_pms_property
 from . import payment_acquirer
 
-# from . import account_analytic_line
+from . import account_analytic_line
 from . import res_partner_category
 from . import res_country
 from . import res_partner_id_category

pms/migrations/14.0.2.36.2/post-migration.py

@@ -1,28 +1,6 @@
 from odoo import fields, models
 
 
-class AccountAnalyticLine(models.Model):
-    _inherit = "account.analytic.line"
-    _check_pms_properties_auto = True
-
-    pms_property_id = fields.Many2one(
-        name="Property",
-        comodel_name="pms.property",
-        compute="_compute_pms_property_id",
-        store=True,
-        readonly=False,
-        check_pms_properties=True,
-        index=True,
-    )
-
-    def _compute_pms_property_id(self):
-        for rec in self:
-            if rec.move_id and rec.move_id.pms_property_id:
-                rec.pms_property_id = rec.move_id.pms_property_id
-            elif not rec.pms_property_id:
-                rec.pms_property_id = False
-
-
 class AccountAnalyticDistribution(models.Model):
     _inherit = "account.analytic.distribution.model"
 
@@ -32,3 +10,10 @@ class AccountAnalyticDistribution(models.Model):
         check_pms_properties=True,
         index=True,
     )
+
+    def _get_distribution(self, vals):
+        pms_property_id = self.env.context.get("pms_property_id")
+        if pms_property_id:
+            vals["pms_property_id"] = pms_property_id
+        res = super()._get_distribution(vals)
+        return res

pms/migrations/14.0.2.36.2/pre-migration.py

@@ -51,11 +51,12 @@ class AccountMove(models.Model):
     @api.onchange("pms_property_id")
     def _onchange_pms_property_id(self):
         for move in self:
-            journals = self.env["account.journal"].search(
-                [
-                    ("pms_property_ids", "=", move.pms_property_id.id),
-                ]
-            )
+            domain = [("pms_property_ids", "=", move.pms_property_id.id)]
+            if move.move_type in ("out_invoice", "out_refund", "out_receipt"):
+                domain.append(("type", "=", "sale"))
+            elif move.move_type in ("in_invoice", "in_refund", "in_receipt"):
+                domain.append(("type", "=", "purchase"))
+            journals = self.env["account.journal"].search(domain)
             if journals:
                 move.journal_id = journals[0]
             else:
@@ -193,6 +194,7 @@ def _search_default_journal(self):
         journal = super(AccountMove, self)._search_default_journal()
         company_id = self._context.get("default_company_id", self.env.company.id)
         company = self.env["res.company"].browse(company_id)
+        journal_type = self._context.get("default_journal_type", journal.type)
         pms_property_id = self.env.context.get(
             "default_pms_property_id", self.pms_property_id.id
         ) or (
@@ -204,18 +206,21 @@ def _search_default_journal(self):
             domain = [
                 ("company_id", "=", pms_property.company_id.id),
                 ("pms_property_ids", "in", pms_property.id),
+                ("type", "=", journal_type),
             ]
             journal = self.env["account.journal"].search(domain, limit=1)
             if not journal:
                 domain = [
                     ("company_id", "=", pms_property.company_id.id),
                     ("pms_property_ids", "=", False),
+                    ("type", "=", journal_type),
                 ]
                 journal = self.env["account.journal"].search(domain, limit=1)
         else:
             domain = [
                 ("company_id", "=", company_id),
                 ("pms_property_ids", "=", False),
+                ("type", "=", journal_type),
             ]
             journal = self.env["account.journal"].search(domain, limit=1)
         if not journal:

pms/migrations/16.0.0.2.0/post-migration.py

@@ -59,6 +59,17 @@ class AccountMoveLine(models.Model):
     )
     move_id = fields.Many2one(check_pms_properties=True)
 
+    @api.depends("account_id", "partner_id", "product_id", "pms_property_id")
+    def _compute_analytic_distribution(self):
+        properties = self.mapped("pms_property_id")
+        if not properties:
+            super()._compute_analytic_distribution()
+        for pms_property in properties:
+            records = self.filtered(lambda x: x.pms_property_id == pms_property)
+            super(
+                AccountMoveLine, records.with_context(pms_property_id=pms_property.id)
+            )._compute_analytic_distribution()
+
     @api.depends("move_id.payment_reference", "quantity")
     def _compute_name(self):
         res = super()._compute_name()
@@ -113,22 +124,6 @@ def _compute_origin_agency_id(self):
             if agencies:
                 line.origin_agency_id = agencies[0]
 
-    def _prepare_analytic_distribution_line(self, distribution):
-        vals = super()._prepare_analytic_distribution_line(distribution)
-        if distribution.pms_property_id:
-            vals["pms_property_id"] = distribution.pms_property_id.id
-        return vals
-
-    def _prepare_analytic_line(self):
-        result = super()._prepare_analytic_line()
-        for move_line in result:
-            move = self.browse(move_line["move_id"])
-            if move.pms_property_id or move.move_id.pms_property_id:
-                move_line["pms_property_id"] = (
-                    move.pms_property_id.id or move.move_id.pms_property_id.id
-                )
-        return result
-
     def reconcile(self):
         """
         Reconcile the account move

pms/models/__init__.py

@@ -237,6 +237,9 @@ class PmsProperty(models.Model):
         string="Image in checkin",
         default=get_default_logo(),
     )
+    analytic_account_id = fields.Many2one(
+        "account.analytic.account", readonly=True, copy=False
+    )
 
     @api.depends_context(
         "checkin",
@@ -615,7 +618,27 @@ def create(self, vals):
                 }
             )
             vals.update({"checkin_sequence_id": checkin_sequence.id})
-        record = super(PmsProperty, self).create(vals)
+        # create analytic account
+        analytic_account = self.env["account.analytic.account"].create(
+            {
+                "name": name,
+                "code": vals.get("ref"),
+                "plan_id": self.env.ref("pms.main_pms_analytic_plan").id,
+                "company_id": vals.get("company_id"),
+            }
+        )
+        vals.update({"analytic_account_id": analytic_account.id})
+        record = super(
+            PmsProperty, self.with_context(avoid_document_restriction=True)
+        ).create(vals)
+        # analityc distribution by default
+        self.env["account.analytic.distribution.model"].create(
+            {
+                "pms_property_id": record.id,
+                "analytic_distribution": {analytic_account.id: 100},
+                "company_id": record.company_id.id,
+            }
+        )
         return record
 
     @api.model