From 6760714fe01b14e8c13c58304af0cd25a9268d83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dar=C3=ADo=20Lodeiros?= <dario@commitsun.com>
Date: Fri, 2 Apr 2021 14:09:54 +0200
Subject: [PATCH] [FIX] property on reservation with folio

---
 pms/demo/pms_folio.xml        | 31 +++++++++++++++++++++++++++++++
 pms/models/pms_reservation.py |  1 +
 2 files changed, 32 insertions(+)

diff --git a/pms/demo/pms_folio.xml b/pms/demo/pms_folio.xml
index f3aa6fe75..63d8651bc 100644
--- a/pms/demo/pms_folio.xml
+++ b/pms/demo/pms_folio.xml
@@ -6,6 +6,7 @@
         <record id="pms_folio_0" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_address_27" />
             <field name="user_id" ref="base.user_demo" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -23,6 +24,7 @@
         <record id="pms_folio_1" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_12" />
             <field name="user_id" ref="base.user_admin" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -40,6 +42,7 @@
         <record id="pms_folio_2" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_address_10" />
             <field name="user_id" ref="base.user_admin" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -73,6 +76,7 @@
         <record id="pms_folio_3" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_12" />
             <field name="user_id" ref="base.user_demo" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -90,6 +94,7 @@
             <field name="partner_id" ref="main_pms_property" />
             <field name="user_id" ref="base.user_admin" />
             <field name="reservation_type">out</field>
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -109,6 +114,7 @@
         <record id="pms_folio_5" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_address_15" />
             <field name="user_id" ref="base.user_demo" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -127,6 +133,7 @@
         <record id="pms_folio_6" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_4" />
             <field name="user_id" ref="base.user_admin" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -144,6 +151,7 @@
         <record id="pms_folio_7" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_10" />
             <field name="user_id" ref="base.user_demo" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -218,6 +226,7 @@
             <field name="partner_id" ref="main_pms_property" />
             <field name="user_id" ref="base.user_admin" />
             <field name="reservation_type">out</field>
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -237,6 +246,7 @@
         <record id="pms_folio_9" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_address_33" />
             <field name="user_id" ref="base.user_admin" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -262,6 +272,7 @@
         <record id="pms_folio_10" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_main2" />
             <field name="user_id" ref="base.user_demo" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -278,6 +289,7 @@
         <record id="pms_folio_11" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_address_10" />
             <field name="user_id" ref="base.user_demo" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -311,6 +323,7 @@
         <record id="pms_folio_12" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_1" />
             <field name="user_id" ref="base.user_demo" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -328,6 +341,7 @@
             <field name="partner_id" ref="base.res_partner_12" />
             <field name="user_id" ref="base.user_admin" />
             <field name="reservation_type">normal</field>
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -345,6 +359,7 @@
         <record id="pms_folio_14" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_12" />
             <field name="user_id" ref="base.user_demo" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -364,6 +379,7 @@
             <field name="partner_id" ref="base.res_partner_18" />
             <field name="user_id" ref="base.user_demo" />
             <field name="reservation_type">normal</field>
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -381,6 +397,7 @@
             <field name="partner_id" ref="base.res_partner_18" />
             <field name="user_id" ref="base.user_demo" />
             <field name="reservation_type">normal</field>
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -403,6 +420,7 @@
             <field name="partner_id" ref="base.res_partner_address_32" />
             <field name="user_id" ref="base.user_admin" />
             <field name="reservation_type">normal</field>
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -419,6 +437,7 @@
         <record id="pms_folio_18" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_address_30" />
             <field name="user_id" ref="base.user_demo" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -456,6 +475,7 @@
         <record id="pms_folio_19" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_18" />
             <field name="user_id" ref="base.user_demo" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -500,6 +520,7 @@
         <record id="pms_folio_20" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_address_25" />
             <field name="user_id" ref="base.user_admin" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -529,6 +550,7 @@
         <record id="pms_folio_21" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_address_32" />
             <field name="user_id" ref="base.user_admin" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -558,6 +580,7 @@
         <record id="pms_folio_22" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_10" />
             <field name="user_id" ref="base.user_demo" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -578,6 +601,7 @@
         <record id="pms_folio_23" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_4" />
             <field name="user_id" ref="base.user_demo" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -595,6 +619,7 @@
         <record id="pms_folio_24" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_address_27" />
             <field name="user_id" ref="base.user_demo" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -613,6 +638,7 @@
         <record id="pms_folio_25" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_12" />
             <field name="user_id" ref="base.user_demo" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -631,6 +657,7 @@
         <record id="pms_folio_26" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_address_27" />
             <field name="user_id" ref="base.user_demo" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -656,6 +683,7 @@
         <record id="pms_folio_27" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_3" />
             <field name="user_id" ref="base.user_admin" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -674,6 +702,7 @@
         <record id="pms_folio_28" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_address_17" />
             <field name="user_id" ref="base.user_demo" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -691,6 +720,7 @@
         <record id="pms_folio_29" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_address_25" />
             <field name="user_id" ref="base.user_demo" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -710,6 +740,7 @@
         <record id="pms_folio_30" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_address_15" />
             <field name="user_id" ref="base.user_demo" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
diff --git a/pms/models/pms_reservation.py b/pms/models/pms_reservation.py
index 0751e2a66..c599137ec 100644
--- a/pms/models/pms_reservation.py
+++ b/pms/models/pms_reservation.py
@@ -1314,6 +1314,7 @@ class PmsReservation(models.Model):
     def create(self, vals):
         if vals.get("folio_id"):
             folio = self.env["pms.folio"].browse(vals["folio_id"])
+            vals.update({"pms_property_id": folio.pms_property_id.id})
         elif "pms_property_id" in vals and (
             "partner_id" in vals or "agency_id" in vals
         ):