Merge branch '16.0-mig-pms' of https://github.com/commitsun/pms into …

…16.0-pms_l10n_es_sii
Comunitea · Oct 14, 2024 · 341f03b · 341f03b
2 parents 06ff90e + 863c1be
commit 341f03b
Show file tree

Hide file tree

Showing 22 changed files with 265 additions and 317 deletions.
diff --git a/pms/__manifest__.py b/pms/__manifest__.py
@@ -73,7 +73,7 @@
         "views/pms_room_closure_reason_views.xml",
         "views/account_payment_views.xml",
         "views/account_move_views.xml",
-        "views/account_bank_statement_views.xml",
+        # "views/account_bank_statement_views.xml",
         "views/res_users_views.xml",
         "views/pms_room_type_class_views.xml",
         "views/pms_availability_plan_views.xml",
@@ -83,13 +83,13 @@
         "views/product_pricelist_item_views.xml",
         "views/pms_sale_channel.xml",
         "views/product_template_views.xml",
-        "views/webclient_templates.xml",
+        # "views/webclient_templates.xml",
         "views/account_journal_views.xml",
         "views/folio_portal_templates.xml",
         "views/reservation_portal_templates.xml",
         "views/res_company_views.xml",
         "views/traveller_report_template.xml",
-        "views/assets.xml",
+        # "views/assets.xml",
         "wizards/wizard_split_join_swap_reservation.xml",
         "views/precheckin_portal_templates.xml",
         "wizards/wizard_massive_changes.xml",
@@ -100,8 +100,8 @@
         "report/proforma_report.xml",
         "views/account_portal_templates.xml",
         "views/payment_acquirer_views.xml",
-        "views/account_analytic_distribution_views.xml",
-        "views/account_analytic_line_views.xml",
+        # "views/account_analytic_distribution_views.xml",
+        # "views/account_analytic_line_views.xml",
         "views/res_partner_category.xml",
         "views/res_partner_id_category_views.xml",
         "views/res_partner_id_number_views.xml",

diff --git a/pms/controllers/pms_portal.py b/pms/controllers/pms_portal.py
@@ -3,7 +3,8 @@
 from odoo.http import request
 
 from odoo.addons.account.controllers.portal import PortalAccount
-from odoo.addons.payment.controllers.portal import PaymentProcessing
+
+# from odoo.addons.payment.controllers.portal import PaymentProcessing
 from odoo.addons.portal.controllers.portal import CustomerPortal, pager as portal_pager
 from odoo.addons.portal.models.portal_mixin import PortalMixin
 
@@ -28,7 +29,7 @@ def _prepare_home_portal_values(self, counters):
     def _folio_get_page_view_values(self, folio, access_token, **kwargs):
         values = {"folio": folio, "token": access_token}
         payment_inputs = (
-            request.env["payment.acquirer"]
+            request.env["payment.provider"]
             .sudo()
             ._get_available_payment_input(
                 partner=folio.partner_id, company=folio.company_id
@@ -105,7 +106,7 @@ def folio_pay_form(
         if save_token:
             vals["type"] = "form_save"
         transaction = folio_sudo._create_payment_transaction(vals)
-        PaymentProcessing.add_payment_transaction(transaction)
+        # PaymentProcessing.add_payment_transaction(transaction)
         if not transaction:
             return False
         tx_ids_list = set(request.session.get("__payment_tx_ids__", [])) | set(

diff --git a/pms/models/account_analytic_line.py b/pms/models/account_analytic_line.py
@@ -1,4 +1,4 @@
-from odoo import api, fields, models
+from odoo import fields, models
 
 
 class AccountAnalyticLine(models.Model):
@@ -15,7 +15,6 @@ class AccountAnalyticLine(models.Model):
         index=True,
     )
 
-    @api.depends("move_id")
     def _compute_pms_property_id(self):
         for rec in self:
             if rec.move_id and rec.move_id.pms_property_id:
@@ -25,7 +24,7 @@ def _compute_pms_property_id(self):
 
 
 class AccountAnalyticDistribution(models.Model):
-    _inherit = "account.analytic.distribution"
+    _inherit = "account.analytic.distribution.model"
 
     pms_property_id = fields.Many2one(
         name="Property",