odoo-addon-pms 16.0.0.15.0.10__py3-none-any.whl → 16.0.0.24.0.1__py3-none-any.whl

odoo/addons/pms/models/pms_reservation_line.py

@@ -73,7 +73,7 @@ class PmsReservationLine(models.Model):
     pricelist_item_id = fields.Many2one(
         comodel_name="product.pricelist.item", compute="_compute_pricelist_item_id"
     )
-    price = fields.Float(
+    price = fields.Monetary(
         help="The price in a reservation line",
         store=True,
         readonly=False,
@@ -105,7 +105,7 @@ class PmsReservationLine(models.Model):
         default=0.0,
         digits=("Discount"),
     )
-    price_day_total = fields.Float(
+    price_day_total = fields.Monetary(
         string="Final price",
         help="Get the price with discount applied",
         store=True,

odoo/addons/pms/models/pms_service.py

@@ -183,7 +183,7 @@ class PmsService(models.Model):
         store=True,
         compute="_compute_amount_service",
     )
-    price_tax = fields.Float(
+    price_tax = fields.Monetary(
         string="Taxes Amount",
         help="Total of taxes in service",
         readonly=True,
@@ -191,7 +191,7 @@ class PmsService(models.Model):
         compute="_compute_amount_service",
     )
 
-    discount = fields.Float(
+    discount = fields.Monetary(
         help="Discount of total price",
         readonly=False,
         store=True,
@@ -232,24 +232,16 @@ class PmsService(models.Model):
             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", "folio_id.fiscal_position_id")
     def _compute_tax_ids(self):
         for service in self:
-            partner = (
-                service.reservation_id.partner_id
-                if service.reservation_id
-                else service.folio_id.partner_id
-            )
-            if (
-                partner == service.company_id.partner_id
-                and service.company_id.self_billed_tax_ids
-            ):
-                service.tax_ids = service.company_id.self_billed_tax_ids
-            else:
-                service.tax_ids = service.product_id.taxes_id.filtered(
+            fiscal_position = service.folio_id.fiscal_position_id
+            service.tax_ids = fiscal_position.map_tax(
+                service.product_id.taxes_id.filtered(
                     lambda r, s=service: not s.company_id
                     or r.company_id == s.company_id
                 )
+            )
 
     @api.depends("service_line_ids", "service_line_ids.day_qty")
     def _compute_product_qty(self):

odoo/addons/pms/models/pms_service_line.py

@@ -70,7 +70,7 @@ class PmsServiceLine(models.Model):
         string="Units",
         help="Amount to be consumed per day",
     )
-    price_unit = fields.Float(
+    price_unit = fields.Monetary(
         string="Unit Price",
         help="Price per unit of service",
         digits=("Product Price"),
@@ -89,7 +89,7 @@ class PmsServiceLine(models.Model):
         store=True,
         compute="_compute_day_amount_service",
     )
-    price_day_tax = fields.Float(
+    price_day_tax = fields.Monetary(
         string="Taxes Amount",
         help="",
         readonly=True,

odoo/addons/pms/models/res_company.py

@@ -56,20 +56,3 @@ class ResCompany(models.Model):
         index=True,
         ondelete="restrict",
     )
-
-    self_billed_journal_id = fields.Many2one(
-        string="Self billed journal",
-        help="Journal used to create self billing",
-        comodel_name="account.journal",
-        index=True,
-        ondelete="restrict",
-    )
-    self_billed_tax_ids = fields.Many2many(
-        string="Self billed taxes",
-        help="Taxes used to create self billing",
-        comodel_name="account.tax",
-        relation="company_autoinvoicing_tax_rel",
-        column1="company_id",
-        column2="tax_id",
-        domain="[('company_id', '=', id)]",
-    )

odoo/addons/pms/static/description/index.html

@@ -372,7 +372,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:1932d20cb515244c940884a7573b46a3b589228ee1ebb94ad7f300612769a869
+!! source digest: sha256:88334a9c85056b26b4f5f89e9ce6f476579984c113c68111c6d106f7c2ce2903
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/pms/tree/16.0/pms"><img alt="OCA/pms" src="https://img.shields.io/badge/github-OCA%2Fpms-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/pms-16-0/pms-16-0-pms"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/pms&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module is an all-in-one property management system (PMS) focused on medium-sized properties

odoo/addons/pms/tests/test_pms_folio.py

@@ -1479,3 +1479,86 @@ class TestPmsFolio(TestPms, AccountTestInvoicingCommon):
     def test_pms_folio_form_creation(self):
         folio_form = Form(self.env["pms.folio"])
         self.assertFalse(folio_form.possible_existing_customer_ids)
+
+    def test_pms_folio_fiscal_position_id(self):
+        """
+        Check that the fiscal_position_id field of the folio is correctly
+        set when a partner is assigned to the folio.
+        """
+        fiscal_position = self.env["account.fiscal.position"].create(
+            {"name": "Fiscal Position Test"}
+        )
+        partner = (
+            self.env["res.partner"]
+            .with_company(self.pms_property1.company_id)
+            .create(
+                {
+                    "name": "Fiscal Partner",
+                    "property_account_position_id": fiscal_position.id,
+                }
+            )
+        )
+        folio = self.env["pms.folio"].create(
+            {
+                "pms_property_id": self.pms_property1.id,
+                "partner_name": partner.name,
+                "partner_id": partner.id,
+            }
+        )
+        folio.env.invalidate_all()
+        self.assertEqual(
+            folio.fiscal_position_id.id,
+            fiscal_position.id,
+            "The fiscal_position_id of the folio was not "
+            "set correctly from the partner",
+        )
+
+    def test_pms_folio_priority_fiscal_position_property(self):
+        """
+        Check that the fiscal_position_id field of the folio
+        takes precedence from automatic assignation.
+        """
+        fiscal_position_property = self.env["account.fiscal.position"].create(
+            {"name": "Fiscal Position Property"}
+        )
+        # automatic fiscal position for US country
+        self.env["account.fiscal.position"].create(
+            {
+                "name": "Automatic Fiscal Position",
+                "auto_apply": True,
+                "country_id": self.env.ref("base.us").id,
+            }
+        )
+        pms_propert_1 = self.env["pms.property"].create(
+            {
+                "name": "Property with Fiscal Position",
+                "company_id": self.env.ref("base.main_company").id,
+            }
+        )
+        pms_propert_1.partner_id.property_account_position_id = (
+            fiscal_position_property.id
+        )
+        partner = (
+            self.env["res.partner"]
+            .with_company(pms_propert_1.company_id)
+            .create(
+                {
+                    "name": "Fiscal Partner",
+                    "country_id": self.env.ref("base.us").id,
+                }
+            )
+        )
+        folio = self.env["pms.folio"].create(
+            {
+                "pms_property_id": pms_propert_1.id,
+                "partner_name": partner.name,
+                "partner_id": partner.id,
+            }
+        )
+        folio.env.invalidate_all()
+        self.assertEqual(
+            folio.fiscal_position_id.id,
+            fiscal_position_property.id,
+            "The fiscal_position_id of the folio was not set "
+            "correctly from the property",
+        )

odoo/addons/pms/tests/test_pms_room_type.py

@@ -843,6 +843,64 @@ class TestRoomType(TestPms):
                 }
             )
 
+    def test_room_type_board_service_by_default_constraint(self):
+        room_type = self.env["pms.room.type"].create(
+            {
+                "name": "Room Type",
+                "default_code": "Type1",
+                "pms_property_ids": self.pms_property1,
+                "class_id": self.room_type_class1.id,
+            }
+        )
+        board_service_default = self.env["pms.board.service"].create(
+            {
+                "name": "Board service 1",
+                "default_code": "c1",
+                "pms_property_ids": self.pms_property1,
+            }
+        )
+        board_service_not_default = self.env["pms.board.service"].create(
+            {
+                "name": "Board service 2",
+                "default_code": "c2",
+                "pms_property_ids": self.pms_property1,
+            }
+        )
+        board_service_second_default = self.env["pms.board.service"].create(
+            {
+                "name": "Board service 3",
+                "default_code": "c3",
+                "pms_property_ids": self.pms_property1,
+            }
+        )
+        self.env["pms.board.service.room.type"].create(
+            {
+                "pms_board_service_id": board_service_default.id,
+                "pms_room_type_id": room_type.id,
+                "pms_property_id": self.pms_property1.id,
+                "by_default": True,
+            }
+        )
+        self.env["pms.board.service.room.type"].create(
+            {
+                "pms_board_service_id": board_service_not_default.id,
+                "pms_room_type_id": room_type.id,
+                "pms_property_id": self.pms_property1.id,
+            }
+        )
+        with self.assertRaises(
+            UserError,
+            msg="Only can set one default board service",
+        ):
+            self.env["pms.board.service.room.type"].create(
+                {
+                    "pms_board_service_id": board_service_second_default.id,
+                    "pms_room_type_id": room_type.id,
+                    "pms_property_id": self.pms_property1.id,
+                    "by_default": True,
+                }
+            )
+
     def test_check_amenities_property_integrity(self):
         self.amenity1 = self.env["pms.amenity"].create(
             {"name": "Amenity", "pms_property_ids": self.pms_property1}

odoo/addons/pms/views/pms_folio_views.xml

@@ -248,18 +248,11 @@
                         <group
                             class="oe_subtotal_footer oe_right oe_inline"
                             name="folio_total"
+                            widget="monetary"
                             attrs="{'invisible':[('reservation_type', '!=', 'normal')]}"
                         >
-                            <field
-                                name="amount_untaxed"
-                                widget="monetary"
-                                options="{'currency_field': 'currency_id'}"
-                            />
-                            <field
-                                name="amount_tax"
-                                widget="monetary"
-                                options="{'currency_field': 'currency_id'}"
-                            />
+                            <field name="amount_untaxed" widget="monetary" />
+                            <field name="amount_tax" widget="monetary" />
                             <div
                                 class="oe_subtotal_footer_separator oe_inline o_td_label"
                             >
@@ -270,13 +263,8 @@
                                 nolabel="1"
                                 class="oe_subtotal_footer_separator"
                                 widget="monetary"
-                                options="{'currency_field': 'currency_id'}"
-                            />
-                            <field
-                                name="commission"
-                                widget='monetary'
-                                options="{'currency_field': 'currency_id'}"
                             />
+                            <field name="commission" widget='monetary' />
                         </group>
                     </group>
                     <group>
@@ -467,7 +455,7 @@
                                         options='{"no_open": True}'
                                         optional="hide"
                                     />
-                                    <field name="price_unit" />
+                                    <field name="price_unit" widget="monetary" />
                                     <field
                                         name="tax_ids"
                                         widget="many2many_tags"
@@ -532,6 +520,9 @@
                             string="Invoicing"
                             attrs="{'invisible':[('reservation_type', '!=', 'normal')]}"
                         >
+                            <group>
+                                <field name="fiscal_position_id" />
+                            </group>
                             <div
                                 class="alert alert-info"
                                 role="alert"
@@ -556,7 +547,7 @@
                                     <field name="create_uid" />
                                     <field name="date" />
                                     <field name="payment_type" />
-                                    <field name="amount" />
+                                    <field name="amount" widget="monetary" />
                                     <field name="partner_id" invisible="1" />
                                     <field
                                         name="state"

odoo/addons/pms/views/pms_property_views.xml

@@ -124,6 +124,7 @@
                                 <field name="max_amount_simplified_invoice" />
                                 <field name="avoid_simplified_max_amount_downpayment" />
                                 <field name="invoice_reservation_note_template" />
+                                <field name="property_account_position_id" />
                             </group>
                         </page>
                         <page string="Email Configuration">

odoo/addons/pms/views/pms_reservation_views.xml

@@ -498,16 +498,18 @@
                     </group>
                     <notebook>
                         <page name="detail" string="Detail">
+                            <separator string="Nights" />
                             <field name="reservation_line_ids" nolabel="1">
                                 <tree create="false" delete="false" editable="bottom">
+                                    <field name="currency_id" invisible="1" />
                                     <field
                                         name="room_id"
                                         attrs="{'column_invisible': [('parent.splitted','=', False)]}"
                                     />
                                     <field name="date" readonly="1" force_save="1" />
-                                    <field name="price" />
+                                    <field name="price" widget="monetary" />
                                     <field name="discount" />
-                                    <field name="price_day_total" />
+                                    <field name="price_day_total" widget="monetary" />
                                     <field name="cancel_discount" invisible="1" />
                                     <field name="sale_channel_id" />
                                     <field name="default_invoice_to" />
@@ -539,6 +541,7 @@
                                         invisible="1"
                                         readonly="1"
                                     />
+                                    <field name="currency_id" invisible="1" />
                                     <field
                                         name="pms_property_id"
                                         invisible="1"
@@ -586,24 +589,38 @@
                                         optional="show"
                                     />
                                     <field name="board_service_line_id" invisible="1" />
-                                    <field name="price_subtotal" optional="hide" />
-                                    <field name="price_tax" optional="hide" />
-                                    <field name="discount" />
-                                    <field name="price_total" />
+                                    <field
+                                        name="price_subtotal"
+                                        optional="hide"
+                                        widget="monetary"
+                                    />
+                                    <field
+                                        name="price_tax"
+                                        optional="hide"
+                                        widget="monetary"
+                                    />
+                                    <field name="discount" widget="monetary" />
+                                    <field name="price_total" widget="monetary" />
                                     <field
                                         name="service_line_ids"
                                         invisible="1"
                                         readonly="1"
                                     >
                                         <tree name="Days">
-                                            <field name="date" />
+                                            <field name="date" widget="date" />
                                             <field name="day_qty" />
                                             <field
                                                 name="discount"
                                                 attrs="{'readonly':[('is_board_service','=', True)]}"
                                             />
-                                            <field name="price_unit" />
-                                            <field name="price_day_total" />
+                                            <field
+                                                name="price_unit"
+                                                widget="monetary"
+                                            />
+                                            <field
+                                                name="price_day_total"
+                                                widget="monetary"
+                                            />
                                             <field
                                                 name="is_board_service"
                                                 invisible="1"
@@ -622,25 +639,21 @@
                                     name="price_services"
                                     string="Only Services"
                                     widget="monetary"
-                                    options="{'currency_field': 'currency_id'}"
                                 />
                             <field
                                     name="price_total"
                                     string="Only Room"
                                     widget="monetary"
-                                    options="{'currency_field': 'currency_id'}"
                                 />
                             <field
                                     name="discount"
                                     string="Discount Room"
                                     widget="monetary"
-                                    options="{'currency_field': 'currency_id'}"
                                 />
                             <field
                                     name="services_discount"
                                     string="Discount Services"
                                     widget="monetary"
-                                    options="{'currency_field': 'currency_id'}"
                                 />
                             <field name="price_subtotal" invisible="1" />
                             <div
@@ -656,7 +669,6 @@
                                     nolabel="1"
                                     class="oe_subtotal_footer_separator"
                                     widget="monetary"
-                                    options="{'currency_field': 'currency_id'}"
                                 />
                             <field
                                     name="commission_percent"
@@ -666,7 +678,6 @@
                                     name="commission_amount"
                                     string="Commission Amount"
                                     widget='monetary'
-                                    options="{'currency_field': 'currency_id'}"
                                 />
                             <field name="invoice_status" invisible="1" />
                             <field name="currency_id" invisible="1" />
@@ -823,6 +834,7 @@
                 <field name="splitted" invisible="1" />
                 <field name="is_reselling" invisible="1" />
                 <field name="pricelist_id" invisible="1" />
+                <field name="currency_id" invisible="1" />
                 <field name="rooms" />
                 <field name="checkin" />
                 <field name="checkout" />
@@ -843,9 +855,23 @@
                 <field name="sale_channel_origin_id" optional="show" />
                 <field name="sale_channel_ids" optional="show" />
                 <field name="price_subtotal" invisible="1" />
-                <field name="price_total" optional="hide" sum="Total" />
-                <field name="commission_amount" optional="hide" sum="Commission" />
-                <field name="folio_pending_amount" string="Folio Pending Amount" />
+                <field
+                    name="price_total"
+                    optional="hide"
+                    sum="Total"
+                    widget="monetary"
+                />
+                <field
+                    name="commission_amount"
+                    optional="hide"
+                    sum="Commission"
+                    widget="monetary"
+                />
+                <field
+                    name="folio_pending_amount"
+                    string="Folio Pending Amount"
+                    widget="monetary"
+                />
                 <field
                     name="state"
                     decoration-success="state == 'onboard'"

odoo/addons/pms/views/res_users_views.xml

@@ -5,7 +5,7 @@
         <field name="model">res.users</field>
         <field name="inherit_id" ref="base.view_users_form" />
         <field name="arch" type="xml">
-            <xpath expr="//page[@name='access_rights']/group" position="inside">
+            <xpath expr="//page[@name='access_rights']/group" position="after">
                 <group string="Multi Properties">
                     <field
                         string="Allowed Properties"

odoo/addons/pms/views/traveller_report_template.xml

@@ -16,11 +16,6 @@
                             <span t-field="docs.identifier" />
                         </strong> / <span t-field="docs.reservation_id" />
                     </p>
-                    <p class="amount"> Total amount
-                        (Reservation Card): <strong>
-                            <span t-field="docs.reservation_id.folio_id.amount_total" />
-                        </strong>
-                    </p>
                     <div class="property amount">
                         <strong>
                             <span t-field="docs.pms_property_id.name" />
@@ -182,10 +177,6 @@
                             <span t-field="docs.identifier" />
                         </strong> / <span t-field="docs.reservation_id" />
                     </p>
-                    <p class="amount"> Total amount (Reservation Card): <strong>
-                            <span t-field="docs.reservation_id.folio_id.amount_total" />
-                        </strong>
-                    </p>
                     <div class="property amount">
                         <strong>
                             <span t-field="docs.pms_property_id.name" />

{odoo_addon_pms-16.0.0.15.0.10.dist-info → odoo_addon_pms-16.0.0.24.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-pms
-Version: 16.0.0.15.0.10
+Version: 16.0.0.24.0.1
 Summary: A property management system
 Home-page: https://github.com/OCA/pms
 Author: Commit [Sun], Odoo Community Association (OCA)
@@ -36,7 +36,7 @@ PMS (Property Management System)
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:1932d20cb515244c940884a7573b46a3b589228ee1ebb94ad7f300612769a869
+   !! source digest: sha256:88334a9c85056b26b4f5f89e9ce6f476579984c113c68111c6d106f7c2ce2903
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png