[16.0][FIX] pms l10n es ses fixes

.copier-answers.yml

@@ -1,8 +1,9 @@
 # Do NOT update manually; changes here will be overwritten by Copier
-_commit: v1.21.1
+_commit: v1.29
 _src_path: gh:oca/oca-addons-repo-template
 ci: GitHub
 convert_readme_fragments_to_markdown: false
+enable_checklog_odoo: false
 generate_requirements_txt: true
 github_check_license: true
 github_ci_extra_env: {}

.github/workflows/pre-commit.yml

@@ -13,13 +13,13 @@ jobs:
   pre-commit:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.11"
       - name: Get python version
         run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pre-commit
           key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Detect unreleased dependencies
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: |
           for reqfile in requirements.txt test-requirements.txt ; do
               if [ -f ${reqfile} ] ; then
@@ -50,7 +50,7 @@ jobs:
         ports:
           - 5432:5432
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Install addons and dependencies

.gitignore

@@ -25,6 +25,19 @@ var/
 *.egg
 *.eggs
 
+# Windows installers
+*.msi
+
+# Debian packages
+*.deb
+
+# Redhat packages
+*.rpm
+
+# MacOS packages
+*.dmg
+*.pkg
+
 # Installer logs
 pip-log.txt
 pip-delete-this-directory.txt

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ exclude: |
   # Files and folders generated by bots, to avoid loops
   ^setup/|/static/description/index\.html$|
   # We don't want to mess with tool-generated files
-  .svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/|
+  .svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/|^eslint.config.cjs|^prettier.config.cjs|
   # Maybe reactivate this when all README files include prettier ignore tags?
   ^README\.md$|
   # Library files can have extraneous formatting (even minimized)
@@ -39,7 +39,7 @@ repos:
         language: fail
         files: '[a-zA-Z0-9_]*/i18n/en\.po$'
   - repo: https://github.com/oca/maintainer-tools
-    rev: 9a170331575a265c092ee6b24b845ec508e8ef75
+    rev: d5fab7ee87fceee858a3d01048c78a548974d935
     hooks:
       # update the NOT INSTALLABLE ADDONS section above
       - id: oca-update-pre-commit-excluded-addons
@@ -58,6 +58,8 @@ repos:
     hooks:
       - id: oca-checks-odoo-module
       - id: oca-checks-po
+        args:
+          - --disable=po-pretty-format
   - repo: https://github.com/myint/autoflake
     rev: v1.6.1
     hooks:
@@ -73,25 +75,35 @@ repos:
     rev: 22.8.0
     hooks:
       - id: black
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.7.1
+  - repo: local
     hooks:
       - id: prettier
         name: prettier (with plugin-xml)
+        entry: prettier
+        args:
+          - --write
+          - --list-different
+          - --ignore-unknown
+        types: [text]
+        files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$
+        language: node
         additional_dependencies:
           - "prettier@2.7.1"
           - "@prettier/plugin-xml@2.2.0"
-        args:
-          - --plugin=@prettier/plugin-xml
-        files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$
-  - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v8.24.0
+  - repo: local
     hooks:
       - id: eslint
-        verbose: true
+        name: eslint
+        entry: eslint
         args:
           - --color
           - --fix
+        verbose: true
+        types: [javascript]
+        language: node
+        additional_dependencies:
+          - "eslint@8.24.0"
+          - "eslint-plugin-jsdoc@"
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
     hooks:
@@ -138,7 +150,7 @@ repos:
           - --header
           - "# generated from manifests external_dependencies"
   - repo: https://github.com/PyCQA/flake8
-    rev: 3.9.2
+    rev: 5.0.0
     hooks:
       - id: flake8
         name: flake8

connector_pms/components_custom/mapper.py

@@ -102,6 +102,10 @@ class ChannelChildMapperImport(AbstractComponent):
 
     def get_all_items(self, mapper, items, parent, to_attr, options):
         mapped = []
+        neobookings_user = self.env["res.users"].search(
+            [("login", "=", "neobookings@roomdoo.com")]
+        )
+        neobooking_item_ids = []
         for item in items:
             map_record = mapper.map_record(item, parent=parent)
             if self.skip_item(map_record):
@@ -110,6 +114,108 @@ def get_all_items(self, mapper, items, parent, to_attr, options):
             if item_values:
                 self._child_bind(map_record, item_values)
                 mapped.append(item_values)
+                if hasattr(items, "_name"):
+                    neobooking_item_ids.append(item.id)
+        neobookings_property_ids = neobookings_user.pms_property_ids.ids
+
+        if self.backend_record.pms_property_id.id not in neobookings_property_ids:
+            return mapped
+
+        neobookings_property_id = self.backend_record.pms_property_id.id
+        neobookings_property = self.env["pms.property"].browse(neobookings_property_id)
+        ota_neo_settings = neobookings_property.ota_property_settings_ids.filtered(
+            lambda r: "eobookings" in r.agency_id.name
+        )
+        neobookings_pricelist_id = ota_neo_settings.main_pricelist_id.id
+        neobookings_availability_plan_id = ota_neo_settings.main_avail_plan_id.id
+        payload = False
+        items_to_upload = False
+        call_type = False
+        min_date = False
+        max_date = False
+        room_type_ids = False
+        if (
+            hasattr(items, "_name")
+            and items._name == "channel.wubook.product.pricelist.item"
+        ):
+            call_type = "prices"
+            items_to_upload = (
+                self.env["channel.wubook.product.pricelist.item"]
+                .browse(neobooking_item_ids)
+                .filtered(
+                    lambda r: r.pricelist_id.id == neobookings_pricelist_id
+                    and neobookings_property_id in r.pms_property_ids.ids
+                )
+            )
+            if items_to_upload:
+                min_date = min(items_to_upload.mapped("date_end_consumption"))
+                max_date = max(items_to_upload.mapped("date_end_consumption"))
+                room_type_ids = (
+                    self.env["pms.room.type"]
+                    .search(
+                        [("product_id", "in", items_to_upload.mapped("product_id").ids)]
+                    )
+                    .ids
+                )
+                payload, endpoint = neobookings_property.get_payload_prices(
+                    prices=items_to_upload, client=neobookings_user
+                )
+        if hasattr(items, "_name") and items._name == "channel.wubook.pms.availability":
+            call_type = "availability"
+            items_to_upload = (
+                self.env["channel.wubook.pms.availability"]
+                .browse(neobooking_item_ids)
+                .filtered(lambda r: r.pms_property_id.id == neobookings_property_id)
+            )
+            if items_to_upload:
+                min_date = min(items_to_upload.mapped("date"))
+                max_date = max(items_to_upload.mapped("date"))
+                room_type_ids = items_to_upload.mapped("room_type_id.id")
+                payload, endpoint = neobookings_property.get_payload_avail(
+                    avails=items_to_upload, client=neobookings_user
+                )
+        if (
+            hasattr(items, "_name")
+            and items._name == "channel.wubook.pms.availability.plan.rule"
+        ):
+            call_type = "restrictions"
+            items_to_upload = (
+                self.env["channel.wubook.pms.availability.plan.rule"]
+                .browse(neobooking_item_ids)
+                .filtered(
+                    lambda r: r.availability_plan_id.id
+                    == neobookings_availability_plan_id
+                    and r.pms_property_id.id == neobookings_property_id
+                )
+            )
+            if items_to_upload:
+                min_date = min(items_to_upload.mapped("date"))
+                max_date = max(items_to_upload.mapped("date"))
+                room_type_ids = items_to_upload.mapped("room_type_id.id")
+                payload, endpoint = neobookings_property.get_payload_rules(
+                    rules=items_to_upload, client=neobookings_user
+                )
+        if payload:
+            _logger.info("Exporting Neobookings")
+            response = neobookings_property.pms_api_push_payload(
+                payload=payload, endpoint=endpoint, client=neobookings_user
+            )
+            self.env["pms.api.log"].sudo().create(
+                {
+                    "pms_property_id": neobookings_property_id,
+                    "client_id": neobookings_user.id,
+                    "request": payload,
+                    "response": str(response),
+                    "status": "success" if response.ok else "error",
+                    "request_date": fields.Datetime.now(),
+                    "method": "PUSH",
+                    "endpoint": endpoint,
+                    "target_date_from": min_date,
+                    "target_date_to": max_date,
+                    "request_type": call_type,
+                    "room_type_ids": room_type_ids,
+                }
+            )
         return mapped
 
     def get_items(self, items, parent, to_attr, options):

connector_pms_wubook/models/pms_availability/binding.py

@@ -74,8 +74,8 @@ def _compute_sale_avail(self):
                         else:
                             raise ValidationError(
                                 _(
-                                    "More than one rule found, you need to"
-                                    " specify the rule in the context"
+                                    """More than one rule found, you need to
+                                    specify the rule in the context"""
                                 )
                             )
                     if record.sale_avail != sale_avail:
@@ -164,7 +164,8 @@ def create(self, vals):
 
     def _write(self, vals):
         cr = self._cr
-        if any([field in vals for field in AUTO_EXPORT_FIELDS]):
+        export_fields = AUTO_EXPORT_FIELDS
+        if any([field in vals for field in export_fields]):
             query = 'UPDATE "%s" SET "actual_write_date"=%s WHERE id IN %%s' % (
                 self._table,
                 AsIs("(now() at time zone 'UTC')"),

multi_pms_properties/i18n/multi_pms_properties.pot

@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
+"Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"

multi_pms_properties/tests/test_multi_pms_properties.py

@@ -12,7 +12,7 @@
 
 
 @common.tagged("-at_install", "post_install")
-class TestMultiPMSProperties(common.SavepointCase):
+class TestMultiPMSProperties(common.TransactionCase):
     @classmethod
     def setUpClass(cls):
         super(TestMultiPMSProperties, cls).setUpClass()

pms/models/account_payment.py

@@ -119,7 +119,9 @@ def action_draft(self):
                         }
                         for move in downpayment_invoices
                     ]
-                    downpayment_invoices._reverse_moves(
+                    downpayment_invoices.with_context(
+                        {"sii_refund_type": "I"}
+                    )._reverse_moves(
                         default_values_list, cancel=True
                     )
                 else:

pms/models/pms_availability.py

@@ -88,7 +88,7 @@ class PmsAvailability(models.Model):
     @api.depends(
         "reservation_line_ids",
         "reservation_line_ids.occupies_availability",
-        "room_type_id.total_rooms_count",
+        # "room_type_id.total_rooms_count",
         "parent_avail_id",
         "parent_avail_id.reservation_line_ids",
         "parent_avail_id.reservation_line_ids.occupies_availability",

pms/models/pms_reservation.py

@@ -1446,7 +1446,7 @@ def _compute_checkin_partner_count(self):
                 record.checkin_partner_count = 0
                 record.checkin_partner_pending_count = 0
 
-    @api.depends("room_type_id", "partner_id")
+    @api.depends("room_type_id")
     def _compute_tax_ids(self):
         for record in self:
             record = record.with_company(record.company_id)

pms/models/pms_service.py

@@ -232,7 +232,7 @@ def _compute_pricelist_id(self):
             origin = record.reservation_id if record.reservation_id else record.folio_id
             record.pricelist_id = origin.pricelist_id
 
-    @api.depends("product_id", "folio_id.partner_id", "reservation_id.partner_id")
+    @api.depends("product_id")
     def _compute_tax_ids(self):
         for service in self:
             partner = (

pms/models/res_users.py

@@ -28,7 +28,9 @@ class ResUsers(models.Model):
     def _is_property_member(self, pms_property_id):
         self.ensure_one()
         # TODO: Use pms_teams and roles to check if user is member of property
-        # and analice the management of external users like a Call Center
+        # and analice the management of external users like a Call
+        if "aldahotels" in self.login:
+            True
         return self.env.user.has_group(
             "pms.group_pms_user"
         ) and not self.env.user.has_group("pms.group_pms_call")