From cca52a0db2b671b93f9bdd70909f7a9517a6fb21 Mon Sep 17 00:00:00 2001
From: braisab <braisterbutalino@gmail.com>
Date: Wed, 3 Mar 2021 18:11:33 +0100
Subject: [PATCH 01/22] [WIP]pms: Folio user portal

---
 pms/__init__.py                      |  1 +
 pms/__manifest__.py                  |  1 +
 pms/controllers/__init__.py          |  1 +
 pms/controllers/pms_portal.py        | 34 ++++++++++++++++++++
 pms/security/ir.model.access.csv     |  1 +
 pms/security/pms_security.xml        |  7 +++++
 pms/views/folio_portal_templates.xml | 47 ++++++++++++++++++++++++++++
 7 files changed, 92 insertions(+)
 create mode 100644 pms/controllers/__init__.py
 create mode 100644 pms/controllers/pms_portal.py
 create mode 100644 pms/views/folio_portal_templates.xml

diff --git a/pms/__init__.py b/pms/__init__.py
index 22280bdac..36176c525 100644
--- a/pms/__init__.py
+++ b/pms/__init__.py
@@ -2,4 +2,5 @@
 
 from . import models
 from . import wizards
+from . import controllers
 from .init_hook import post_init_hook
diff --git a/pms/__manifest__.py b/pms/__manifest__.py
index 5147c917d..d5aefcd77 100644
--- a/pms/__manifest__.py
+++ b/pms/__manifest__.py
@@ -67,6 +67,7 @@
         "views/webclient_templates.xml",
         "views/ir_sequence_views.xml",
         "views/account_journal_views.xml",
+        "views/folio_portal_templates.xml",
         "wizards/wizard_reservation.xml",
         "wizards/wizard_massive_changes.xml",
         "wizards/wizard_advanced_filters.xml",
diff --git a/pms/controllers/__init__.py b/pms/controllers/__init__.py
new file mode 100644
index 000000000..52d463f19
--- /dev/null
+++ b/pms/controllers/__init__.py
@@ -0,0 +1 @@
+from . import pms_portal
diff --git a/pms/controllers/pms_portal.py b/pms/controllers/pms_portal.py
new file mode 100644
index 000000000..bf826d591
--- /dev/null
+++ b/pms/controllers/pms_portal.py
@@ -0,0 +1,34 @@
+from odoo import http
+from odoo.addons.portal.controllers.portal import CustomerPortal
+from odoo.exceptions import AccessError, MissingError
+from odoo.http import request, route
+
+
+class PortalFolio(CustomerPortal):
+
+    def _prepare_home_portal_values(self, counters):
+        partner = request.env.user.partner_id
+        values = super()._prepare_home_portal_values(counters)
+        Folio = request.env['pms.folio']
+        if 'folio_count' in counters:
+            values['folio_count'] = Folio.search_count([
+                # ('partner_id', '=', partner.id),
+            ]) if Folio.check_access_rights('read', raise_exception=False) else 0
+        return values
+
+    @http.route(['/my/folios'], type='http', auth="user", website=True)
+    def portal_my_folios(self, page=1, date_begin=None, date_end=None, sortby=None, filterby=None, **kw):
+        values = self._prepare_portal_layout_values()
+        values['folios'] = request.env['pms.folio'].sudo().search([])
+        return request.render("pms.portal_my_folio", values)
+
+    @http.route(['/my/folios/<int:folio_id>'], type='http', auth="user", website=True)
+    def portal_my_folio_detail(self, folio_id, access_token=None, report_type=None, download=False, **kw):
+        try:
+            folio_sudo = self._document_check_access('pms_folio', folio_id, access_token=access_token)
+        except (AccessError, MissingError):
+            return request.redirect('/my')
+        if report_type in ('html', 'pdf', 'text'):
+            return self._show_report(model=folio_sudo, report_type=report_type, report_ref='pms.report_folio_document', download=download)
+        values = self._invoice_get_page_view_values(folio_sudo, access_token, **kw)
+        return request.render("pms.report_folio_document", values)
diff --git a/pms/security/ir.model.access.csv b/pms/security/ir.model.access.csv
index 2587b5b9b..c972810bf 100644
--- a/pms/security/ir.model.access.csv
+++ b/pms/security/ir.model.access.csv
@@ -60,3 +60,4 @@ user_access_folio_make_invoice_advance,user_access_folio_make_invoice_advance,mo
 user_access_pms_invoice_filter_days,user_access_pms_invoice_filter_days,model_pms_invoice_filter_days,pms.group_pms_user,1,1,1,1
 user_access_pms_invoice_filter_days_items,user_access_pms_invoice_filter_days_items,model_pms_invoice_filter_days_items,pms.group_pms_user,1,1,1,1
 user_access_wizard_payment_folio,user_access_wizard_payment_folio,model_wizard_payment_folio,pms.group_pms_user,1,1,1,1
+user_access_pms_folio_portal,user_access_pms_folio_portal,model_pms_folio,base.group_portal,1,0,0,0
\ No newline at end of file
diff --git a/pms/security/pms_security.xml b/pms/security/pms_security.xml
index d9af58fb9..a9705ff48 100644
--- a/pms/security/pms_security.xml
+++ b/pms/security/pms_security.xml
@@ -223,5 +223,12 @@
                 user.get_active_property_ids())]
             </field>
         </record>
+        <record id="pms_folio_rule_portal" model="ir.rule">
+            <field name="name">Portal Personal Folios</field>
+            <field name="model_id" ref="model_pms_folio"/>
+            <field name="domain_force">[]</field>
+            <field name="groups" eval="[(4, ref('base.group_portal'))]"/>
+            <field name="perm_read" eval="True"/>
+        </record>
     </data>
 </odoo>
diff --git a/pms/views/folio_portal_templates.xml b/pms/views/folio_portal_templates.xml
new file mode 100644
index 000000000..d34e3ba6f
--- /dev/null
+++ b/pms/views/folio_portal_templates.xml
@@ -0,0 +1,47 @@
+<odoo>
+    <template id="portal_my_folios" name="Folios" inherit_id="portal.portal_my_home" customize_show="True" priority="30">
+        <xpath expr="//div[hasclass('o_portal_docs')]" position="inside">
+            <t t-call="portal.portal_docs_entry">
+                <t t-set="title">Folios</t>
+                <t t-set="url" t-value="'/my/folios'"/>
+                <t t-set="placeholder_count" t-value="'folio_count'"/>
+            </t>
+        </xpath>
+    </template>
+
+
+    <template id="portal_my_folio" name="My Folios">
+      <t t-call="portal.portal_layout">
+        <t t-set="breadcrumbs_searchbar" t-value="True"/>
+
+        <t t-call="portal.portal_searchbar">
+            <t t-set="title">Folios</t>
+        </t>
+        <t t-if="not folios">
+            <p>There are currently no folios for your account.</p>
+        </t>
+        <t t-if="folios" t-call="portal.portal_table">
+            <thead>
+                <tr class="active">
+                    <th>Folio #</th>
+                    <th>Order Date</th>
+                    <th class="text-right">Total</th>
+                </tr>
+            </thead>
+            <tbody>
+                <t t-foreach="folios" t-as="folio">
+                    <tr>
+                        <td>
+                            <a t-att-href="folio.get_portal_url()" t-att-title="folio.name">
+                                <t t-esc="folio.name"/>
+                            </a>
+                        </td>
+                        <td><span t-field="folio.date_order"/></td>
+                        <td class="text-right"><span t-field="folio.amount_total"/></td>
+                    </tr>
+                </t>
+            </tbody>
+        </t>
+      </t>
+    </template>
+</odoo>

From b3ce037840daeaa81af2206445dbfbcd954e1e0e Mon Sep 17 00:00:00 2001
From: Sara Lago <saralago126@gmail.com>
Date: Thu, 4 Mar 2021 12:15:37 +0100
Subject: [PATCH 02/22] [WIP] Pms: show folio details in portal

---
 pms/controllers/pms_portal.py        |  72 +++--
 pms/security/ir.model.access.csv     |   2 +-
 pms/security/pms_security.xml        |   6 +-
 pms/views/folio_portal_templates.xml | 420 ++++++++++++++++++++++++++-
 4 files changed, 469 insertions(+), 31 deletions(-)

diff --git a/pms/controllers/pms_portal.py b/pms/controllers/pms_portal.py
index bf826d591..eeb15fee3 100644
--- a/pms/controllers/pms_portal.py
+++ b/pms/controllers/pms_portal.py
@@ -1,34 +1,68 @@
 from odoo import http
-from odoo.addons.portal.controllers.portal import CustomerPortal
 from odoo.exceptions import AccessError, MissingError
-from odoo.http import request, route
+from odoo.http import request
+
+from odoo.addons.portal.controllers.portal import CustomerPortal
 
 
 class PortalFolio(CustomerPortal):
-
     def _prepare_home_portal_values(self, counters):
         partner = request.env.user.partner_id
         values = super()._prepare_home_portal_values(counters)
-        Folio = request.env['pms.folio']
-        if 'folio_count' in counters:
-            values['folio_count'] = Folio.search_count([
-                # ('partner_id', '=', partner.id),
-            ]) if Folio.check_access_rights('read', raise_exception=False) else 0
+        Folio = request.env["pms.folio"]
+        if "folio_count" in counters:
+            values["folio_count"] = (
+                Folio.search_count(
+                    [
+                        ("partner_id", "child_of", partner.id),
+                    ]
+                )
+                if Folio.check_access_rights("read", raise_exception=False)
+                else 0
+            )
         return values
 
-    @http.route(['/my/folios'], type='http', auth="user", website=True)
-    def portal_my_folios(self, page=1, date_begin=None, date_end=None, sortby=None, filterby=None, **kw):
+    def _folio_get_page_view_values(self, folio, access_token, **kwargs):
+        values = {"folio": folio, "token": access_token}
+        return self._get_page_view_values(
+            folio, access_token, values, "my_folios_history", False, **kwargs
+        )
+
+    @http.route(["/my/folios"], type="http", auth="user", website=True)
+    def portal_my_folios(
+        self, page=1, date_begin=None, date_end=None, sortby=None, filterby=None, **kw
+    ):
+        partner = request.env.user.partner_id
         values = self._prepare_portal_layout_values()
-        values['folios'] = request.env['pms.folio'].sudo().search([])
+        values["folios"] = (
+            request.env["pms.folio"]
+            .sudo()
+            .search(
+                [
+                    ("partner_id", "child_of", partner.id),
+                ]
+            )
+        )
         return request.render("pms.portal_my_folio", values)
 
-    @http.route(['/my/folios/<int:folio_id>'], type='http', auth="user", website=True)
-    def portal_my_folio_detail(self, folio_id, access_token=None, report_type=None, download=False, **kw):
+    @http.route(["/my/folios/<int:folio_id>"], type="http", auth="user", website=True)
+    def portal_my_folio_detail(
+        self, folio_id, access_token=None, report_type=None, download=False, **kw
+    ):
         try:
-            folio_sudo = self._document_check_access('pms_folio', folio_id, access_token=access_token)
+            folio_sudo = self._document_check_access(
+                "pms.folio",
+                folio_id,
+                access_token="9a6f4fc8-59f6-4f50-ae45-5af6492e7aba",
+            )
         except (AccessError, MissingError):
-            return request.redirect('/my')
-        if report_type in ('html', 'pdf', 'text'):
-            return self._show_report(model=folio_sudo, report_type=report_type, report_ref='pms.report_folio_document', download=download)
-        values = self._invoice_get_page_view_values(folio_sudo, access_token, **kw)
-        return request.render("pms.report_folio_document", values)
+            return request.redirect("/my")
+        if report_type in ("html", "pdf", "text"):
+            return self._show_report(
+                model=folio_sudo,
+                report_type=report_type,
+                report_ref="action_report_folio",
+                download=download,
+            )
+        values = self._folio_get_page_view_values(folio_sudo, access_token, **kw)
+        return request.render("pms.folio_portal_template", values)
diff --git a/pms/security/ir.model.access.csv b/pms/security/ir.model.access.csv
index c972810bf..0d1c1107a 100644
--- a/pms/security/ir.model.access.csv
+++ b/pms/security/ir.model.access.csv
@@ -60,4 +60,4 @@ user_access_folio_make_invoice_advance,user_access_folio_make_invoice_advance,mo
 user_access_pms_invoice_filter_days,user_access_pms_invoice_filter_days,model_pms_invoice_filter_days,pms.group_pms_user,1,1,1,1
 user_access_pms_invoice_filter_days_items,user_access_pms_invoice_filter_days_items,model_pms_invoice_filter_days_items,pms.group_pms_user,1,1,1,1
 user_access_wizard_payment_folio,user_access_wizard_payment_folio,model_wizard_payment_folio,pms.group_pms_user,1,1,1,1
-user_access_pms_folio_portal,user_access_pms_folio_portal,model_pms_folio,base.group_portal,1,0,0,0
\ No newline at end of file
+user_access_pms_folio_portal,user_access_pms_folio_portal,model_pms_folio,base.group_portal,1,0,0,0
diff --git a/pms/security/pms_security.xml b/pms/security/pms_security.xml
index a9705ff48..b1d35cae1 100644
--- a/pms/security/pms_security.xml
+++ b/pms/security/pms_security.xml
@@ -225,10 +225,10 @@
         </record>
         <record id="pms_folio_rule_portal" model="ir.rule">
             <field name="name">Portal Personal Folios</field>
-            <field name="model_id" ref="model_pms_folio"/>
+            <field name="model_id" ref="model_pms_folio" />
             <field name="domain_force">[]</field>
-            <field name="groups" eval="[(4, ref('base.group_portal'))]"/>
-            <field name="perm_read" eval="True"/>
+            <field name="groups" eval="[(4, ref('base.group_portal'))]" />
+            <field name="perm_read" eval="True" />
         </record>
     </data>
 </odoo>
diff --git a/pms/views/folio_portal_templates.xml b/pms/views/folio_portal_templates.xml
index d34e3ba6f..435e4b1b9 100644
--- a/pms/views/folio_portal_templates.xml
+++ b/pms/views/folio_portal_templates.xml
@@ -1,10 +1,16 @@
 <odoo>
-    <template id="portal_my_folios" name="Folios" inherit_id="portal.portal_my_home" customize_show="True" priority="30">
+    <template
+        id="portal_my_folios"
+        name="Folios"
+        inherit_id="portal.portal_my_home"
+        customize_show="True"
+        priority="30"
+    >
         <xpath expr="//div[hasclass('o_portal_docs')]" position="inside">
             <t t-call="portal.portal_docs_entry">
                 <t t-set="title">Folios</t>
-                <t t-set="url" t-value="'/my/folios'"/>
-                <t t-set="placeholder_count" t-value="'folio_count'"/>
+                <t t-set="url" t-value="'/my/folios'" />
+                <t t-set="placeholder_count" t-value="'folio_count'" />
             </t>
         </xpath>
     </template>
@@ -12,7 +18,7 @@
 
     <template id="portal_my_folio" name="My Folios">
       <t t-call="portal.portal_layout">
-        <t t-set="breadcrumbs_searchbar" t-value="True"/>
+        <t t-set="breadcrumbs_searchbar" t-value="True" />
 
         <t t-call="portal.portal_searchbar">
             <t t-set="title">Folios</t>
@@ -32,16 +38,414 @@
                 <t t-foreach="folios" t-as="folio">
                     <tr>
                         <td>
-                            <a t-att-href="folio.get_portal_url()" t-att-title="folio.name">
-                                <t t-esc="folio.name"/>
+                            <a
+                                    t-att-href="folio.get_portal_url()"
+                                    t-att-title="folio.name"
+                                >
+                                <t t-esc="folio.name" />
                             </a>
                         </td>
-                        <td><span t-field="folio.date_order"/></td>
-                        <td class="text-right"><span t-field="folio.amount_total"/></td>
+                        <td><span t-field="folio.date_order" /></td>
+                        <td class="text-right"><span
+                                    t-field="folio.amount_total"
+                                /></td>
                     </tr>
                 </t>
             </tbody>
         </t>
       </t>
     </template>
+    <template
+        id="folio_portal_template"
+        name="Folio Portal Template"
+        inherit_id="portal.portal_sidebar"
+        primary="True"
+    >
+        <xpath expr="//div[hasclass('o_portal_sidebar')]" position="inside">
+
+            <div class="row mt16 o_portal_sale_sidebar">
+                <!-- Sidebar -->
+                <t t-call="portal.portal_record_sidebar">
+                    <t t-set="classes" t-value="'col-lg-auto d-print-none'" />
+
+                    <t t-set="title">
+                        <h2 class="mb-0"><b t-field="folio.amount_total" /> </h2>
+                    </t>
+                    <t t-set="entries">
+                        <ul
+                            class="list-group list-group-flush flex-wrap flex-row flex-lg-column"
+                        >
+                            <li class="list-group-item flex-grow-1">
+                                <div class="o_download_pdf btn-toolbar flex-sm-nowrap">
+                                    <div class="btn-group flex-grow-1 mr-1 mb-1">
+                                        <a
+                                            class="btn btn-secondary btn-block o_download_btn"
+                                            t-att-href="folio.get_portal_url(report_type='pdf', download=True)"
+                                            title="Download"
+                                        ><i class="fa fa-download" /> Download</a>
+                                    </div>
+                                    <div class="btn-group flex-grow-1 mb-1">
+                                        <a
+                                            class="btn btn-secondary btn-block o_print_btn o_portal_invoice_print"
+                                            t-att-href="folio.get_portal_url(report_type='pdf')"
+                                            id="print_folio_report"
+                                            title="Print"
+                                            target="_blank"
+                                        ><i class="fa fa-print" /> Print</a>
+                                    </div>
+                                </div>
+                            </li>
+
+                            <li
+                                class="navspy list-group-item pl-0 flex-grow-1"
+                                t-ignore="true"
+                                role="complementary"
+                            >
+                                <ul class="nav flex-column bs-sidenav" />
+                            </li>
+
+                            <li
+                                t-if="folio.user_id.name"
+                                class="list-group-item flex-grow-1"
+                            >
+                                <div class="small mb-1"><strong
+                                        class="text-muted"
+                                    >Salesperson</strong></div>
+                                <div class="row flex-nowrap">
+                                    <!--<div class="col flex-grow-0 pr-2">
+                                        <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="folio.user_id.image_1024" t-att-src="image_data_uri(sale_order.user_id.image_1024)" alt="Contact"/>
+                                        <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="not folio.user_id.image_1024" src="/web/static/src/img/placeholder.png" alt="Contact"/>
+                                    </div>-->
+                                    <div class="col pl-0" style="min-width: 150px">
+                                        <span
+                                            t-field="folio.user_id"
+                                            t-options='{"widget": "contact", "fields": ["name", "phone"], "no_marker": True}'
+                                        />
+                                        <a href="#discussion" class="small"><i
+                                                class="fa fa-comment"
+                                            /> Send message</a>
+                                    </div>
+                                </div>
+                            </li>
+                        </ul>
+                    </t>
+                </t>
+                <!-- main content -->
+                <div
+                    t-attf-class="card #{'pb-5' if report_type == 'html' else ''}"
+                    id="portal_folio_content"
+                >
+                    <div t-call="pms.folio_portal_content" />
+                </div>
+                <!-- chatter -->
+                <div id="folio_communication" class="mt-4">
+                    <h2>History</h2>
+                    <t t-call="portal.message_thread">
+                        <t t-set="object" t-value="folio" />
+                    </t>
+                </div>
+            </div>
+        </xpath>
+    </template>
+
+    <!--
+    Sales Order content : intro, informations, order lines, remarks, descriptions ....
+    This template should contains all the printable element of the SO. This is the
+    template rendered in PDF with the report engine.
+    -->
+    <template id="folio_portal_content" name="Folio Portal Content">
+        <!--<t t-call="web.external_layout">-->
+        <t t-set="address">
+            <div class="row">
+                    <div class="col-xs-6">
+                        <t t-if="folio.partner_invoice_id != folio.partner_id">
+                            <div
+                            t-field="folio.partner_invoice_id"
+                            t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'
+                        />
+                        </t>
+                    </div>
+                    <div class="col-xs-5 col-xs-offset-1">
+                        <div
+                        t-field="folio.partner_id"
+                        t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'
+                    />
+                        <p t-if="folio.partner_id.vat">
+                            <t t-esc="folio.company_id.country_id.vat_label or 'TIN'" />
+                            :
+                            <span t-field="folio.partner_id.vat" />
+                        </p>
+                    </div>
+            </div>
+        </t>
+        <div class="page">
+            <div class="oe_structure" />
+
+            <h2 class="mt16">
+                <span t-if="folio.state not in ['draft','sent']">Order #</span>
+                <span t-if="folio.state in ['draft','sent']">Quotation #</span>
+                <span t-field="folio.name" />
+            </h2>
+
+            <div class="row mt32 mb32" id="informations">
+                <div t-if="folio.client_order_ref" class="col-auto col-3 mw-100 mb-2">
+                    <strong>Your Reference:</strong>
+                    <p class="m-0" t-field="folio.client_order_ref" />
+                </div>
+                <div
+                    t-if="folio.date_order and folio.state not in ['draft','sent']"
+                    class="col-auto col-3 mw-100 mb-2"
+                >
+                    <strong>Order Date:</strong>
+                    <p class="m-0" t-field="folio.date_order" />
+                </div>
+                <div
+                    t-if="folio.date_order and folio.state in ['draft','sent']"
+                    class="col-auto col-3 mw-100 mb-2"
+                >
+                    <strong>Quotation Date:</strong>
+                    <p
+                        class="m-0"
+                        t-field="folio.date_order"
+                        t-options='{"widget": "date"}'
+                    />
+                </div>
+                <div t-if="folio.user_id.name" class="col-auto col-3 mw-100 mb-2">
+                    <strong>Salesperson:</strong>
+                    <p class="m-0" t-field="folio.user_id" />
+                </div>
+            </div>
+
+            <!-- Is there a discount on at least one line? -->
+            <t
+                t-set="display_discount"
+                t-value="any(l.discount for l in folio.sale_line_ids)"
+            />
+
+            <table class="table table-sm o_main_table">
+                <!-- In case we want to repeat the header, remove "display: table-row-group" -->
+                <thead style="display: table-row-group">
+                    <tr>
+                        <th name="th_description" class="text-left">Description</th>
+                        <th name="th_quantity" class="text-right">Quantity</th>
+                        <th name="th_priceunit" class="text-right">Unit Price</th>
+                        <th
+                            name="th_discount"
+                            t-if="display_discount"
+                            class="text-right"
+                        >
+                            <span>Disc.%</span>
+                        </th>
+                        <th name="th_taxes" class="text-right">Taxes</th>
+                        <th name="th_subtotal" class="text-right">
+                            <span
+                                groups="account.group_show_line_subtotals_tax_excluded"
+                            >Amount</span>
+                            <span
+                                groups="account.group_show_line_subtotals_tax_included"
+                            >Total Price</span>
+                        </th>
+                    </tr>
+                </thead>
+                <tbody class="sale_tbody">
+
+                    <t t-set="current_subtotal" t-value="0" />
+
+                    <t t-foreach="folio.sale_line_ids" t-as="line">
+
+                        <t
+                            t-set="current_subtotal"
+                            t-value="current_subtotal + line.price_subtotal"
+                            groups="account.group_show_line_subtotals_tax_excluded"
+                        />
+                        <t
+                            t-set="current_subtotal"
+                            t-value="current_subtotal + line.price_total"
+                            groups="account.group_show_line_subtotals_tax_included"
+                        />
+
+                        <tr
+                            t-att-class="'bg-200 font-weight-bold o_line_section' if line.display_type == 'line_section' else 'font-italic o_line_note' if line.display_type == 'line_note' else ''"
+                        >
+                            <t t-if="not line.display_type">
+                                <t t-set="price" t-value="line.price_unit" />
+
+                                <t t-if="line.reservation_id">
+                                        <t
+                                        t-set="print_board_service"
+                                        t-value="line.reservation_id.board_service_room_id.pms_board_service_id.show_detail_report"
+                                    />
+                                        <t t-if="not print_board_service">
+                                            <t
+                                            t-foreach="line.reservation_id.service_ids"
+                                            t-as="service"
+                                        >
+                                                <t t-if="service.is_board_service">
+                                                        <t
+                                                    t-set="price"
+                                                    t-value="service.product_qty/line.product_uom_qty*service.price_unit*(1-(service.discount or 0.0)*0.01) + price"
+                                                />
+                                                </t>
+                                            </t>
+                                        </t>
+                                </t>
+                                <t
+                                    t-if="not(not print_board_service and line.service_id.is_board_service)"
+                                >
+                                        <td name="td_name"><span
+                                            t-field="line.name"
+                                        /></td>
+                                        <td name="td_quantity" class="text-right">
+                                            <span t-field="line.product_uom_qty" />
+                                            <span
+                                            t-field="line.product_uom"
+                                            groups="uom.group_uom"
+                                        />
+                                        </td>
+
+                                        <td name="td_priceunit" class="text-right">
+                                                <span
+                                            t-esc="price"
+                                            t-options='{"widget": "monetary", "display_currency": folio.pricelist_id.currency_id}'
+                                        />
+                                        </td>
+                                        <td t-if="display_discount" class="text-right">
+                                            <span t-field="line.discount" />
+                                        </td>
+                                        <td name="td_taxes" class="text-right">
+                                            <span
+                                            t-esc="', '.join(map(lambda x: (x.description or x.name), line.tax_ids))"
+                                        />
+                                        </td>
+                                        <td
+                                        name="td_subtotal"
+                                        class="text-right o_price_total"
+                                    >
+                                            <span
+                                            t-esc="price*(1-(line.discount or 0.0)*0.01)* line.product_uom_qty"
+                                            groups="account.group_show_line_subtotals_tax_excluded"
+                                            t-options='{"widget": "monetary", "display_currency": folio.pricelist_id.currency_id}'
+                                        />
+                                            <span
+                                            t-esc="price *(1-(line.discount or 0.0)*0.01)* line.product_uom_qty"
+                                            groups="account.group_show_line_subtotals_tax_included"
+                                            t-options='{"widget": "monetary", "display_currency": folio.pricelist_id.currency_id}'
+                                        />
+                                        </td>
+                                </t>
+                            </t>
+                            <t t-if="line.display_type == 'line_section'">
+                                <td name="td_section_line" colspan="99">
+                                    <span t-field="line.name" />
+                                </td>
+                                <t t-set="current_section" t-value="line" />
+                                <t t-set="current_subtotal" t-value="0" />
+                            </t>
+
+                            <t t-if="line.display_type == 'line_note'">
+                                <td name="td_note_line" colspan="99">
+                                    <span t-field="line.name" />
+                                </td>
+                            </t>
+                        </tr>
+
+                        <t
+                            t-if="current_section and (line_last or folio.sale_line_ids[line_index+1].display_type == 'line_section')"
+                        >
+                            <tr class="is-subtotal text-right">
+                                <td name="td_section_subtotal" colspan="99">
+                                    <strong class="mr16">Subtotal</strong>
+                                    <span
+                                        t-esc="current_subtotal"
+                                        t-options='{"widget": "monetary", "display_currency": folio.pricelist_id.currency_id}'
+                                    />
+                                </td>
+                            </tr>
+                        </t>
+                    </t>
+                </tbody>
+            </table>
+
+            <div class="clearfix" name="so_total_summary">
+                <div id="total" class="row" name="total">
+                    <div
+                        t-attf-class="#{'col-4' if report_type != 'html' else 'col-sm-7 col-md-5'} ml-auto"
+                    >
+                        <table class="table table-sm">
+                            <tr class="border-black o_subtotal" style="">
+                                <td name="td_amount_untaxed_label"><strong
+                                    >Subtotal</strong></td>
+                                <td name="td_amount_untaxed" class="text-right">
+                                    <span t-field="folio.amount_untaxed" />
+                                </td>
+                            </tr>
+                            <t
+                                t-foreach="folio._get_tax_amount_by_group()"
+                                t-as="amount_by_group"
+                            >
+                                <tr style="">
+                                    <t
+                                        t-if="amount_by_group[3] == 1 and folio.amount_untaxed == amount_by_group[2]"
+                                    >
+                                        <td name="td_amount_by_group_label_3">
+                                            <span t-esc="amount_by_group[0]" />
+                                            <span>&amp;nbsp;<span>on</span>&amp;nbsp;<t
+                                                    t-esc="amount_by_group[2]"
+                                                    t-options='{"widget": "monetary", "display_currency": folio.pricelist_id.currency_id}'
+                                                /></span>
+                                        </td>
+                                        <td
+                                            name="td_amount_by_group_3"
+                                            class="text-right o_price_total"
+                                        >
+                                            <span
+                                                t-esc="amount_by_group[1]"
+                                                t-options='{"widget": "monetary", "display_currency": folio.pricelist_id.currency_id}'
+                                            />
+                                        </td>
+                                    </t>
+                                    <t t-else="">
+                                        <td name="td_amount_by_group_label">
+                                            <span t-esc="amount_by_group[0]" />
+                                        </td>
+                                        <td
+                                            name="td_amount_by_group"
+                                            class="text-right o_price_total"
+                                        >
+                                            <span
+                                                t-esc="amount_by_group[1]"
+                                                t-options='{"widget": "monetary", "display_currency": folio.pricelist_id.currency_id}'
+                                            />
+                                        </td>
+                                    </t>
+                                </tr>
+                            </t>
+                            <tr class="border-black o_total">
+                                <td name="td_amount_total_label"><strong
+                                    >Total</strong></td>
+                                <td name="td_amount_total" class="text-right">
+                                    <span t-field="folio.amount_total" />
+                                </td>
+                            </tr>
+                        </table>
+                    </div>
+                </div>
+            </div>
+
+            <div class="oe_structure" />
+
+            <p t-field="folio.note" />
+            <p t-if="folio.payment_term_id.note">
+                <span t-field="folio.payment_term_id.note" />
+            </p>
+            <p
+                id="fiscal_position_remark"
+                t-if="folio.fiscal_position_id and folio.fiscal_position_id.sudo().note"
+            >
+                <strong>Fiscal Position Remark:</strong>
+                <span t-field="folio.fiscal_position_id.sudo().note" />
+            </p>
+        </div>
+    <!--</t>-->
+    </template>
 </odoo>

From 600c27be539db3f47a5fabddd055d9ad66541beb Mon Sep 17 00:00:00 2001
From: Sara Lago <saralago126@gmail.com>
Date: Thu, 4 Mar 2021 12:58:30 +0100
Subject: [PATCH 03/22] [WIP] Pms: change folio style in portal

---
 pms/views/folio_portal_templates.xml | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/pms/views/folio_portal_templates.xml b/pms/views/folio_portal_templates.xml
index 435e4b1b9..7d05ffe61 100644
--- a/pms/views/folio_portal_templates.xml
+++ b/pms/views/folio_portal_templates.xml
@@ -130,15 +130,13 @@
                         </ul>
                     </t>
                 </t>
-                <!-- main content -->
-                <div
-                    t-attf-class="card #{'pb-5' if report_type == 'html' else ''}"
-                    id="portal_folio_content"
-                >
+                <!-- main content-->
+                <div t-attf-class="card col-8 p-3" id="portal_folio_content">
                     <div t-call="pms.folio_portal_content" />
                 </div>
                 <!-- chatter -->
-                <div id="folio_communication" class="mt-4">
+                <div class="col-3" />
+                <div id="folio_communication" class="mt-4 col-8">
                     <h2>History</h2>
                     <t t-call="portal.message_thread">
                         <t t-set="object" t-value="folio" />
@@ -154,9 +152,10 @@
     template rendered in PDF with the report engine.
     -->
     <template id="folio_portal_content" name="Folio Portal Content">
-        <!--<t t-call="web.external_layout">-->
         <t t-set="address">
-            <div class="row">
+            <div
+                class="row pb-2 pt-3 #{'card-header bg-white' if report_type == 'html' else ''}"
+            >
                     <div class="col-xs-6">
                         <t t-if="folio.partner_invoice_id != folio.partner_id">
                             <div
@@ -188,29 +187,29 @@
             </h2>
 
             <div class="row mt32 mb32" id="informations">
-                <div t-if="folio.client_order_ref" class="col-auto col-3 mw-100 mb-2">
+                <div t-if="folio.client_order_ref" class="mb-3 col-6">
                     <strong>Your Reference:</strong>
                     <p class="m-0" t-field="folio.client_order_ref" />
                 </div>
                 <div
                     t-if="folio.date_order and folio.state not in ['draft','sent']"
-                    class="col-auto col-3 mw-100 mb-2"
+                    class="mb-3 col-6"
                 >
                     <strong>Order Date:</strong>
                     <p class="m-0" t-field="folio.date_order" />
                 </div>
                 <div
                     t-if="folio.date_order and folio.state in ['draft','sent']"
-                    class="col-auto col-3 mw-100 mb-2"
+                    class="mb-3 col-6"
                 >
                     <strong>Quotation Date:</strong>
                     <p
-                        class="m-0"
+                        class="mb-3 col-6"
                         t-field="folio.date_order"
                         t-options='{"widget": "date"}'
                     />
                 </div>
-                <div t-if="folio.user_id.name" class="col-auto col-3 mw-100 mb-2">
+                <div t-if="folio.user_id.name" class="mb-3 col-6">
                     <strong>Salesperson:</strong>
                     <p class="m-0" t-field="folio.user_id" />
                 </div>
@@ -446,6 +445,5 @@
                 <span t-field="folio.fiscal_position_id.sudo().note" />
             </p>
         </div>
-    <!--</t>-->
     </template>
 </odoo>

From e2eef5fdf0a1c0a71cbdca6a7ca3e605e078dc2d Mon Sep 17 00:00:00 2001
From: Sara Lago <saralago126@gmail.com>
Date: Thu, 4 Mar 2021 13:27:44 +0100
Subject: [PATCH 04/22] [IMP] Pms: Add compute method to url portal folio

---
 pms/controllers/pms_portal.py | 2 +-
 pms/models/pms_folio.py       | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pms/controllers/pms_portal.py b/pms/controllers/pms_portal.py
index eeb15fee3..c4a6de7f8 100644
--- a/pms/controllers/pms_portal.py
+++ b/pms/controllers/pms_portal.py
@@ -53,7 +53,7 @@ class PortalFolio(CustomerPortal):
             folio_sudo = self._document_check_access(
                 "pms.folio",
                 folio_id,
-                access_token="9a6f4fc8-59f6-4f50-ae45-5af6492e7aba",
+                access_token=access_token,
             )
         except (AccessError, MissingError):
             return request.redirect("/my")
diff --git a/pms/models/pms_folio.py b/pms/models/pms_folio.py
index 58829cd75..7d24a1daf 100644
--- a/pms/models/pms_folio.py
+++ b/pms/models/pms_folio.py
@@ -525,6 +525,11 @@ class PmsFolio(models.Model):
             order.move_ids = invoices
             order.invoice_count = len(invoices)
 
+    def _compute_access_url(self):
+        super(PmsFolio, self)._compute_access_url()
+        for folio in self:
+            folio.access_url = "/my/folios/%s" % (folio.id)
+
     def _search_invoice_ids(self, operator, value):
         if operator == "in" and value:
             self.env.cr.execute(

From 4772e9fe4adff7e5d5d32d05b550dfa053307fdb Mon Sep 17 00:00:00 2001
From: braisab <braisterbutalino@gmail.com>
Date: Thu, 4 Mar 2021 20:03:16 +0100
Subject: [PATCH 05/22] [WIP]pms: added breadcrumbs

---
 pms/controllers/pms_portal.py        |  6 ++++++
 pms/views/folio_portal_templates.xml | 15 +++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/pms/controllers/pms_portal.py b/pms/controllers/pms_portal.py
index c4a6de7f8..14ef92e86 100644
--- a/pms/controllers/pms_portal.py
+++ b/pms/controllers/pms_portal.py
@@ -43,6 +43,12 @@ class PortalFolio(CustomerPortal):
                 ]
             )
         )
+        values.update(
+            {
+                "page_name": "folios",
+                "default_url": "/my/folios",
+            }
+        )
         return request.render("pms.portal_my_folio", values)
 
     @http.route(["/my/folios/<int:folio_id>"], type="http", auth="user", website=True)
diff --git a/pms/views/folio_portal_templates.xml b/pms/views/folio_portal_templates.xml
index 7d05ffe61..93c235d5c 100644
--- a/pms/views/folio_portal_templates.xml
+++ b/pms/views/folio_portal_templates.xml
@@ -1,4 +1,19 @@
 <odoo>
+    <template
+        id="portal_my_home_menu_folio"
+        name="Portal layout : folio menu entries"
+        inherit_id="portal.portal_breadcrumbs"
+        priority="20"
+    >
+        <xpath expr="//ol[hasclass('o_portal_submenu')]" position="inside">
+            <li t-attf-class="breadcrumb-item #{'active ' if not folios else ''}">
+                <a t-attf-href="/my/folios?{{ keep_query() }}">Folios</a>
+            </li>
+            <li t-if="folio" class="breadcrumb-item active">
+                <t t-esc="folio.name" />
+            </li>
+        </xpath>
+    </template>
     <template
         id="portal_my_folios"
         name="Folios"

From 34d1cb0aee1769cefeb99c321dac8ceafcc731a0 Mon Sep 17 00:00:00 2001
From: braisab <braisterbutalino@gmail.com>
Date: Fri, 5 Mar 2021 11:43:14 +0100
Subject: [PATCH 06/22] [WIP]pms: add functionality sidebar buttons

---
 pms/controllers/pms_portal.py        |  4 ++--
 pms/models/pms_folio.py              |  3 +++
 pms/views/folio_portal_templates.xml | 19 ++++++-------------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/pms/controllers/pms_portal.py b/pms/controllers/pms_portal.py
index 14ef92e86..7c39cd3cc 100644
--- a/pms/controllers/pms_portal.py
+++ b/pms/controllers/pms_portal.py
@@ -14,7 +14,7 @@ class PortalFolio(CustomerPortal):
             values["folio_count"] = (
                 Folio.search_count(
                     [
-                        ("partner_id", "child_of", partner.id),
+                        ("partner_id", "=", partner.id),
                     ]
                 )
                 if Folio.check_access_rights("read", raise_exception=False)
@@ -67,7 +67,7 @@ class PortalFolio(CustomerPortal):
             return self._show_report(
                 model=folio_sudo,
                 report_type=report_type,
-                report_ref="action_report_folio",
+                report_ref="pms.action_report_folio",
                 download=download,
             )
         values = self._folio_get_page_view_values(folio_sudo, access_token, **kw)
diff --git a/pms/models/pms_folio.py b/pms/models/pms_folio.py
index 7d24a1daf..40cd8a2cf 100644
--- a/pms/models/pms_folio.py
+++ b/pms/models/pms_folio.py
@@ -734,6 +734,9 @@ class PmsFolio(models.Model):
             record.max_reservation_prior = max(reservation_priors)
 
     # Action methods
+    def _get_report_base_filename(self):
+        self.ensure_one()
+        return 'Folio %s' % self.name
 
     def action_pay(self):
         self.ensure_one()
diff --git a/pms/views/folio_portal_templates.xml b/pms/views/folio_portal_templates.xml
index 93c235d5c..4f7d0f0c3 100644
--- a/pms/views/folio_portal_templates.xml
+++ b/pms/views/folio_portal_templates.xml
@@ -6,11 +6,12 @@
         priority="20"
     >
         <xpath expr="//ol[hasclass('o_portal_submenu')]" position="inside">
-            <li t-attf-class="breadcrumb-item #{'active ' if not folios else ''}">
+            <li t-if="page_name == 'folios'" t-attf-class="breadcrumb-item #{'active ' if not folios else ''}">
                 <a t-attf-href="/my/folios?{{ keep_query() }}">Folios</a>
             </li>
             <li t-if="folio" class="breadcrumb-item active">
-                <t t-esc="folio.name" />
+                 <a t-attf-href="/my/folios?{{ keep_query() }}">Folios/</a>
+                <t t-esc="folio.name"/>
             </li>
         </xpath>
     </template>
@@ -111,14 +112,6 @@
                                 </div>
                             </li>
 
-                            <li
-                                class="navspy list-group-item pl-0 flex-grow-1"
-                                t-ignore="true"
-                                role="complementary"
-                            >
-                                <ul class="nav flex-column bs-sidenav" />
-                            </li>
-
                             <li
                                 t-if="folio.user_id.name"
                                 class="list-group-item flex-grow-1"
@@ -127,10 +120,10 @@
                                         class="text-muted"
                                     >Salesperson</strong></div>
                                 <div class="row flex-nowrap">
-                                    <!--<div class="col flex-grow-0 pr-2">
-                                        <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="folio.user_id.image_1024" t-att-src="image_data_uri(sale_order.user_id.image_1024)" alt="Contact"/>
+                                    <div class="col flex-grow-0 pr-2">
+                                        <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="folio.user_id.image_1024" t-att-src="image_data_uri(folio.user_id.image_1024)" alt="Contact"/>
                                         <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="not folio.user_id.image_1024" src="/web/static/src/img/placeholder.png" alt="Contact"/>
-                                    </div>-->
+                                    </div>
                                     <div class="col pl-0" style="min-width: 150px">
                                         <span
                                             t-field="folio.user_id"

From 94341bb8770be288e9cc401d81f7ccd503f069d1 Mon Sep 17 00:00:00 2001
From: braisab <braisterbutalino@gmail.com>
Date: Fri, 5 Mar 2021 12:47:35 +0100
Subject: [PATCH 07/22] [WIP] add sort by and pager

---
 pms/controllers/pms_portal.py        | 58 ++++++++++++++++++++++------
 pms/models/pms_folio.py              |  2 +-
 pms/views/folio_portal_templates.xml | 21 ++++++++--
 3 files changed, 65 insertions(+), 16 deletions(-)

diff --git a/pms/controllers/pms_portal.py b/pms/controllers/pms_portal.py
index 7c39cd3cc..db962effc 100644
--- a/pms/controllers/pms_portal.py
+++ b/pms/controllers/pms_portal.py
@@ -1,8 +1,8 @@
-from odoo import http
+from odoo import _, http
 from odoo.exceptions import AccessError, MissingError
 from odoo.http import request
 
-from odoo.addons.portal.controllers.portal import CustomerPortal
+from odoo.addons.portal.controllers.portal import CustomerPortal, pager as portal_pager
 
 
 class PortalFolio(CustomerPortal):
@@ -28,25 +28,61 @@ class PortalFolio(CustomerPortal):
             folio, access_token, values, "my_folios_history", False, **kwargs
         )
 
-    @http.route(["/my/folios"], type="http", auth="user", website=True)
+    @http.route(
+        ["/my/folios", "/my/folios/page/<int:page>"],
+        type="http",
+        auth="user",
+        website=True,
+    )
     def portal_my_folios(
         self, page=1, date_begin=None, date_end=None, sortby=None, filterby=None, **kw
     ):
         partner = request.env.user.partner_id
         values = self._prepare_portal_layout_values()
-        values["folios"] = (
-            request.env["pms.folio"]
-            .sudo()
-            .search(
-                [
-                    ("partner_id", "child_of", partner.id),
-                ]
-            )
+        PmsFolio = request.env["pms.folio"]
+        values["folios"] = PmsFolio.sudo().search(
+            [
+                ("partner_id", "child_of", partner.id),
+            ]
         )
+        domain = [
+            ("partner_id", "child_of", partner.id),
+        ]
+        searchbar_sortings = {
+            "date": {"label": _("Order Date"), "folio": "date_order desc"},
+            "name": {"label": _("Reference"), "folio": "name"},
+            "stage": {"label": _("Stage"), "folio": "state"},
+        }
+        if not sortby:
+            sortby = "date"
+        sort_order = searchbar_sortings[sortby]["folio"]
+
+        if date_begin and date_end:
+            domain += [
+                ("create_date", ">", date_begin),
+                ("create_date", "<=", date_end),
+            ]
+        folio_count = PmsFolio.search_count(domain)
+        pager = portal_pager(
+            url="/my/folios",
+            url_args={"date_begin": date_begin, "date_end": date_end, "sortby": sortby},
+            total=folio_count,
+            page=page,
+            step=self._items_per_page,
+        )
+        folios = PmsFolio.search(
+            domain, order=sort_order, limit=self._items_per_page, offset=pager["offset"]
+        )
+        request.session["my_folios_history"] = folios.ids[:100]
         values.update(
             {
+                "date": date_begin,
+                "folios": folios.sudo(),
                 "page_name": "folios",
+                "pager": pager,
                 "default_url": "/my/folios",
+                "searchbar_sortings": searchbar_sortings,
+                "sortby": sortby,
             }
         )
         return request.render("pms.portal_my_folio", values)
diff --git a/pms/models/pms_folio.py b/pms/models/pms_folio.py
index 40cd8a2cf..d3f23d80e 100644
--- a/pms/models/pms_folio.py
+++ b/pms/models/pms_folio.py
@@ -736,7 +736,7 @@ class PmsFolio(models.Model):
     # Action methods
     def _get_report_base_filename(self):
         self.ensure_one()
-        return 'Folio %s' % self.name
+        return "Folio %s" % self.name
 
     def action_pay(self):
         self.ensure_one()
diff --git a/pms/views/folio_portal_templates.xml b/pms/views/folio_portal_templates.xml
index 4f7d0f0c3..56f79be9e 100644
--- a/pms/views/folio_portal_templates.xml
+++ b/pms/views/folio_portal_templates.xml
@@ -6,12 +6,15 @@
         priority="20"
     >
         <xpath expr="//ol[hasclass('o_portal_submenu')]" position="inside">
-            <li t-if="page_name == 'folios'" t-attf-class="breadcrumb-item #{'active ' if not folios else ''}">
+            <li
+                t-if="page_name == 'folios'"
+                t-attf-class="breadcrumb-item #{'active ' if not folios else ''}"
+            >
                 <a t-attf-href="/my/folios?{{ keep_query() }}">Folios</a>
             </li>
             <li t-if="folio" class="breadcrumb-item active">
                  <a t-attf-href="/my/folios?{{ keep_query() }}">Folios/</a>
-                <t t-esc="folio.name"/>
+                <t t-esc="folio.name" />
             </li>
         </xpath>
     </template>
@@ -121,8 +124,18 @@
                                     >Salesperson</strong></div>
                                 <div class="row flex-nowrap">
                                     <div class="col flex-grow-0 pr-2">
-                                        <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="folio.user_id.image_1024" t-att-src="image_data_uri(folio.user_id.image_1024)" alt="Contact"/>
-                                        <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="not folio.user_id.image_1024" src="/web/static/src/img/placeholder.png" alt="Contact"/>
+                                        <img
+                                            class="rounded-circle mr4 float-left o_portal_contact_img"
+                                            t-if="folio.user_id.image_1024"
+                                            t-att-src="image_data_uri(folio.user_id.image_1024)"
+                                            alt="Contact"
+                                        />
+                                        <img
+                                            class="rounded-circle mr4 float-left o_portal_contact_img"
+                                            t-if="not folio.user_id.image_1024"
+                                            src="/web/static/src/img/placeholder.png"
+                                            alt="Contact"
+                                        />
                                     </div>
                                     <div class="col pl-0" style="min-width: 150px">
                                         <span

From 9ae89adeafb12af5dbb27cdd270f5cf1fed9b2f1 Mon Sep 17 00:00:00 2001
From: braisab <braisterbutalino@gmail.com>
Date: Fri, 5 Mar 2021 20:05:54 +0100
Subject: [PATCH 08/22] [WIP]pms: added reservations in portal

---
 pms/__manifest__.py                        |   1 +
 pms/controllers/pms_portal.py              | 112 ++++++++++++-
 pms/models/pms_reservation.py              |   5 +
 pms/security/ir.model.access.csv           |   1 +
 pms/security/pms_security.xml              |   7 +
 pms/views/reservation_portal_templates.xml | 180 +++++++++++++++++++++
 6 files changed, 305 insertions(+), 1 deletion(-)
 create mode 100644 pms/views/reservation_portal_templates.xml

diff --git a/pms/__manifest__.py b/pms/__manifest__.py
index d5aefcd77..5e91a3bb5 100644
--- a/pms/__manifest__.py
+++ b/pms/__manifest__.py
@@ -68,6 +68,7 @@
         "views/ir_sequence_views.xml",
         "views/account_journal_views.xml",
         "views/folio_portal_templates.xml",
+        "views/reservation_portal_templates.xml",
         "wizards/wizard_reservation.xml",
         "wizards/wizard_massive_changes.xml",
         "wizards/wizard_advanced_filters.xml",
diff --git a/pms/controllers/pms_portal.py b/pms/controllers/pms_portal.py
index db962effc..927320589 100644
--- a/pms/controllers/pms_portal.py
+++ b/pms/controllers/pms_portal.py
@@ -40,7 +40,7 @@ class PortalFolio(CustomerPortal):
         partner = request.env.user.partner_id
         values = self._prepare_portal_layout_values()
         PmsFolio = request.env["pms.folio"]
-        values["folios"] = PmsFolio.sudo().search(
+        values["folios"] = PmsFolio.search(
             [
                 ("partner_id", "child_of", partner.id),
             ]
@@ -108,3 +108,113 @@ class PortalFolio(CustomerPortal):
             )
         values = self._folio_get_page_view_values(folio_sudo, access_token, **kw)
         return request.render("pms.folio_portal_template", values)
+
+
+class PortalReservation(CustomerPortal):
+    def _prepare_home_portal_values(self, counters):
+        partner = request.env.user.partner_id
+        values = super()._prepare_home_portal_values(counters)
+        Reservation = request.env["pms.reservation"]
+        if "reservation_count" in counters:
+            values["reservation_count"] = (
+                Reservation.search_count(
+                    [
+                        ("partner_id", "=", partner.id),
+                    ]
+                )
+                if Reservation.check_access_rights("read", raise_exception=False)
+                else 0
+            )
+        return values
+
+    def _reservation_get_page_view_values(self, reservation, access_token, **kwargs):
+        values = {"reservation": reservation, "token": access_token}
+        return self._get_page_view_values(
+            reservation,
+            access_token,
+            values,
+            "my_reservations_history",
+            False,
+            **kwargs
+        )
+
+    @http.route(
+        ["/my/reservations", "/my/reservations/page/<int:page>"],
+        type="http",
+        auth="user",
+        website=True,
+    )
+    def portal_my_reservations(
+        self, page=1, date_begin=None, date_end=None, sortby=None, filterby=None, **kw
+    ):
+        partner = request.env.user.partner_id
+        values = self._prepare_portal_layout_values()
+        Reservation = request.env["pms.reservation"]
+        values["reservations"] = Reservation.search(
+            [
+                ("partner_id", "child_of", partner.id),
+            ]
+        )
+        domain = [
+            ("partner_id", "child_of", partner.id),
+        ]
+        searchbar_sortings = {
+            "date": {"label": _("Order Date"), "reservation": "date_order desc"},
+            "name": {"label": _("Reference"), "reservation": "name"},
+            "stage": {"label": _("Stage"), "reservation": "state"},
+        }
+        if not sortby:
+            sortby = "date"
+        sort_order = searchbar_sortings[sortby]["reservation"]
+
+        if date_begin and date_end:
+            domain += [
+                ("create_date", ">", date_begin),
+                ("create_date", "<=", date_end),
+            ]
+        reservation_count = Reservation.search_count(domain)
+        pager = portal_pager(
+            url="/my/reservations",
+            url_args={"date_begin": date_begin, "date_end": date_end, "sortby": sortby},
+            total=reservation_count,
+            page=page,
+            step=self._items_per_page,
+        )
+        reservations = Reservation.search(
+            domain, order=sort_order, limit=self._items_per_page, offset=pager["offset"]
+        )
+        request.session["my_reservations_history"] = reservations.ids[:100]
+        values.update(
+            {
+                "date": date_begin,
+                "reservations": reservations.sudo(),
+                "page_name": "reservations",
+                "pager": pager,
+                "default_url": "/my/reservations",
+                "searchbar_sortings": searchbar_sortings,
+                "sortby": sortby,
+            }
+        )
+        return request.render("pms.portal_my_reservation", values)
+
+    @http.route(
+        ["/my/reservations/<int:reservation_id>"],
+        type="http",
+        auth="user",
+        website=True,
+    )
+    def portal_my_reservation_detail(self, reservation_id, access_token=None, **kw):
+        try:
+            reservation_sudo = self._document_check_access(
+                "pms.reservation",
+                reservation_id,
+                access_token=access_token,
+            )
+        except (AccessError, MissingError):
+            return request.redirect("/my")
+        # for attachment in reservation_sudo.attachment_ids:
+        #     attachment.generate_access_token()
+        values = self._reservation_get_page_view_values(
+            reservation_sudo, access_token, **kw
+        )
+        return request.render("pms.portal_my_reservation_detail", values)
diff --git a/pms/models/pms_reservation.py b/pms/models/pms_reservation.py
index 7af48e7a0..23398640f 100644
--- a/pms/models/pms_reservation.py
+++ b/pms/models/pms_reservation.py
@@ -822,6 +822,11 @@ class PmsReservation(models.Model):
                 else False
             )
 
+    def _compute_access_url(self):
+        super(PmsReservation, self)._compute_access_url()
+        for reservation in self:
+            reservation.access_url = "/my/reservations/%s" % (reservation.id)
+
     def _search_left_for_checkin(self, operator, value):
         if operator not in ("=",):
             raise UserError(
diff --git a/pms/security/ir.model.access.csv b/pms/security/ir.model.access.csv
index 0d1c1107a..3bf23f885 100644
--- a/pms/security/ir.model.access.csv
+++ b/pms/security/ir.model.access.csv
@@ -61,3 +61,4 @@ user_access_pms_invoice_filter_days,user_access_pms_invoice_filter_days,model_pm
 user_access_pms_invoice_filter_days_items,user_access_pms_invoice_filter_days_items,model_pms_invoice_filter_days_items,pms.group_pms_user,1,1,1,1
 user_access_wizard_payment_folio,user_access_wizard_payment_folio,model_wizard_payment_folio,pms.group_pms_user,1,1,1,1
 user_access_pms_folio_portal,user_access_pms_folio_portal,model_pms_folio,base.group_portal,1,0,0,0
+user_access_pms_reservation_portal,user_access_pms_reservation_portal,model_pms_reservation,base.group_portal,1,0,0,0
diff --git a/pms/security/pms_security.xml b/pms/security/pms_security.xml
index b1d35cae1..ff331b48f 100644
--- a/pms/security/pms_security.xml
+++ b/pms/security/pms_security.xml
@@ -230,5 +230,12 @@
             <field name="groups" eval="[(4, ref('base.group_portal'))]" />
             <field name="perm_read" eval="True" />
         </record>
+        <record id="pms_reservation_rule_portal" model="ir.rule">
+            <field name="name">Portal Personal Reservation</field>
+            <field name="model_id" ref="model_pms_reservation" />
+            <field name="domain_force">[]</field>
+            <field name="groups" eval="[(4, ref('base.group_portal'))]" />
+            <field name="perm_read" eval="True" />
+        </record>
     </data>
 </odoo>
diff --git a/pms/views/reservation_portal_templates.xml b/pms/views/reservation_portal_templates.xml
new file mode 100644
index 000000000..a4da35de5
--- /dev/null
+++ b/pms/views/reservation_portal_templates.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template
+        id="portal_my_home_menu_reservation"
+        name="Portal layout : reservation menu entries"
+        inherit_id="portal.portal_breadcrumbs"
+        priority="20"
+    >
+        <xpath expr="//ol[hasclass('o_portal_submenu')]" position="inside">
+            <li
+                t-if="page_name == 'reservations'"
+                t-attf-class="breadcrumb-item #{'active ' if not reservations else ''}"
+            >
+                <a t-attf-href="/my/reservations?{{ keep_query() }}">Reservations</a>
+            </li>
+            <li t-if="reservation" class="breadcrumb-item active">
+                 <a t-attf-href="/my/reservations?{{ keep_query() }}">Reservations/</a>
+                <t t-esc="reservation.name" />
+            </li>
+        </xpath>
+    </template>
+    <template
+        id="portal_my_reservations"
+        name="Reservations"
+        inherit_id="portal.portal_my_home"
+        customize_show="True"
+        priority="30"
+    >
+        <xpath expr="//div[hasclass('o_portal_docs')]" position="inside">
+            <t t-call="portal.portal_docs_entry">
+                <t t-set="title">Reservations</t>
+                <t t-set="url" t-value="'/my/reservations'" />
+                <t t-set="placeholder_count" t-value="'reservation_count'" />
+            </t>
+        </xpath>
+    </template>
+
+    <template id="portal_my_reservation" name="My Reservations">
+      <t t-call="portal.portal_layout">
+        <t t-set="breadcrumbs_searchbar" t-value="True" />
+
+        <t t-call="portal.portal_searchbar">
+            <t t-set="title">Reservations</t>
+        </t>
+        <t t-if="not reservations">
+            <p>There are currently no reservations for your account.</p>
+        </t>
+        <t t-if="reservations" t-call="portal.portal_table">
+            <thead>
+                <tr class="active">
+                    <th>Reservation #</th>
+                    <th>Checkin</th>
+                    <th>Checkout</th>
+                    <th class="text-right">Total</th>
+                </tr>
+            </thead>
+            <tbody>
+                <t t-foreach="reservations" t-as="reservation">
+                    <tr>
+                        <td>
+                            <a
+                                    t-att-href="reservation.get_portal_url()"
+                                    t-att-title="reservation.name"
+                                >
+                                <t t-esc="reservation.name" />
+                            </a>
+                        </td>
+                        <td><span t-field="reservation.checkin" /></td>
+                        <td><span t-field="reservation.checkout" /></td>
+<!--                        <td class="text-right"><span-->
+<!--                                    t-field="reservation.price_room_services_set"-->
+<!--                                /></td>-->
+                    </tr>
+                </t>
+            </tbody>
+        </t>
+      </t>
+    </template>
+
+    <template id="portal_my_reservation_detail" name="My Reservation">
+        <t t-call="portal.portal_layout">
+<!--            <t t-set="o_portal_fullwidth_alert" groups="project.group_project_user">-->
+<!--                <t t-call="portal.portal_back_in_edit_mode">-->
+<!--                    <t t-set="backend_url" t-value="'/web#model=project.task&amp;id=%s&amp;view_type=form' % (task.id)"/>-->
+<!--                </t>-->
+<!--            </t>-->
+
+            <t t-call="portal.portal_record_layout">
+                <t t-set="card_header">
+                    <div class="row no-gutters">
+                        <div class="col-12">
+                            <h5 class="d-flex mb-1 mb-md-0 row">
+                                <span t-field="reservation.name" class="col-9 text-truncate"/>
+                                <small class="text-muted d-none d-md-inline"> (#<span t-field="reservation.id"/>)</small>
+                                <div class="col-3 col-md-2 text-right">
+                                    <small class="text-right">Status:</small>
+                                    <span t-field="reservation.state" class=" badge badge-pill badge-info" title="Current state of this reservation"/>
+                                </div>
+                            </h5>
+                        </div>
+                    </div>
+                </t>
+                <t t-set="card_body">
+<!--                    <div class="mb-1" t-if="user in reservation.sudo().allowed_user_ids">-->
+<!--                        <strong>Project:</strong> <a t-attf-href="/my/project/#{reservation.project_id.id}" t-field="reservation.name"/>-->
+<!--                    </div>-->
+
+                    <div class="row mb-4">
+                        <div class="col-12 col-md-6" t-if="reservation.checkin">
+                            <strong>Checkin:</strong> <span t-field="reservation.checkin" t-options='{"widget": "date"}'/>
+                        </div>
+                        <div class="col-12 col-md-6 mb-1">
+                            <strong>Checkout:</strong> <span t-field="reservation.checkout" t-options='{"widget": "date"}'/>
+                        </div>
+                    </div>
+
+                    <div class="row mb-4" t-if="reservation.partner_id">
+                        <div class="col-12 col-md-6 pb-2" t-if="reservation.partner_id">
+                            <strong>Assigned to</strong>
+                            <div class="row">
+                                <div class="col flex-grow-0 pr-3">
+                                    <img t-if="reservation.partner_id.image_1024" class="rounded-circle mt-1 o_portal_contact_img" t-att-src="image_data_uri(reservation.partner_id.image_1024)" alt="Contact"/>
+                                    <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/src/img/user_menu_avatar.png" alt="Contact"/>
+                                </div>
+                                <div class="col pl-md-0">
+                                    <div t-field="reservation.partner_id" t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'/>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="coll-12 col-md-6 pb-2" t-if="reservation.partner_id">
+                            <strong>Reported by</strong>
+                            <div class="row">
+                                <div class="col flex-grow-0 pr-3">
+                                    <img t-if="reservation.partner_id.image_1024" class="rounded-circle mt-1 o_portal_contact_img" t-att-src="image_data_uri(reservation.partner_id.image_1024)" alt="Contact"/>
+                                    <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/src/img/user_menu_avatar.png" alt="Contact"/>
+                                </div>
+                                <div class="col pl-md-0">
+                                    <div t-field="reservation.partner_id" t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'/>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+<!--                    <div class="row" t-if="reservation.description">-->
+<!--                        <div t-if="reservation.description" t-attf-class="col-12 col-lg-7 mb-4 mb-md-0 ">-->
+<!--                            <hr class="mb-1"/>-->
+<!--                            <div class="d-flex my-2">-->
+<!--                                <strong>Description</strong>-->
+<!--                            </div>-->
+<!--                            <div class="py-1 px-2 bg-100 small" t-field="reservation.description"/>-->
+<!--                        </div>-->
+<!--                        <div t-if="reservation.attachment_ids" t-attf-class="col-12 col-lg-5 o_project_portal_attachments {{'col-lg-5' if reservation.description else 'col-lg-12'}}">-->
+<!--                            <hr class="mb-1 d-none d-lg-block"/>-->
+<!--                            <strong class="d-block mb-2">Attachments</strong>-->
+<!--                            <div class="row">-->
+<!--                                <div t-attf-class="col {{'col-lg-6' if not reservation.description else 'col-lg-12'}}">-->
+<!--                                    <ul class="list-group">-->
+<!--                                        <a class="list-group-item list-group-item-action d-flex align-items-center oe_attachments py-1 px-2" t-foreach='reservation.attachment_ids' t-as='attachment' t-attf-href="/web/content/#{attachment.id}?download=true&amp;access_token=#{attachment.access_token}" target="_blank" data-no-post-process="">-->
+<!--                                            <div class='oe_attachment_embedded o_image o_image_small mr-2 mr-lg-3' t-att-title="attachment.name" t-att-data-mimetype="attachment.mimetype" t-attf-data-src="/web/image/#{attachment.id}/50x40?access_token=#{attachment.access_token}"/>-->
+<!--                                            <div class='oe_attachment_name text-truncate'><t t-esc='attachment.name'/></div>-->
+<!--                                        </a>-->
+<!--                                    </ul>-->
+<!--                                </div>-->
+<!--                            </div>-->
+<!--                        </div>-->
+<!--                    </div>-->
+                </t>
+            </t>
+
+            <div class="mt32">
+                <h4><strong>Message and communication history</strong></h4>
+                <t t-call="portal.message_thread">
+                    <t t-set="object" t-value="reservation"/>
+                    <t t-set="token" t-value="reservation.access_token"/>
+                    <t t-set="pid" t-value="pid"/>
+                    <t t-set="hash" t-value="hash"/>
+                </t>
+            </div>
+        </t>
+    </template>
+</odoo>

From 085bf3fee5471ee1b531fbacec16568dd76fe8eb Mon Sep 17 00:00:00 2001
From: braisab <braisterbutalino@gmail.com>
Date: Wed, 3 Mar 2021 18:11:33 +0100
Subject: [PATCH 09/22] [WIP]pms: Folio user portal

---
 pms/__init__.py                      |  1 +
 pms/__manifest__.py                  |  1 +
 pms/controllers/__init__.py          |  1 +
 pms/controllers/pms_portal.py        | 34 ++++++++++++++++++++
 pms/security/ir.model.access.csv     |  1 +
 pms/security/pms_security.xml        |  7 +++++
 pms/views/folio_portal_templates.xml | 47 ++++++++++++++++++++++++++++
 7 files changed, 92 insertions(+)
 create mode 100644 pms/controllers/__init__.py
 create mode 100644 pms/controllers/pms_portal.py
 create mode 100644 pms/views/folio_portal_templates.xml

diff --git a/pms/__init__.py b/pms/__init__.py
index 22280bdac..36176c525 100644
--- a/pms/__init__.py
+++ b/pms/__init__.py
@@ -2,4 +2,5 @@
 
 from . import models
 from . import wizards
+from . import controllers
 from .init_hook import post_init_hook
diff --git a/pms/__manifest__.py b/pms/__manifest__.py
index 623b9a827..0c628585c 100644
--- a/pms/__manifest__.py
+++ b/pms/__manifest__.py
@@ -67,6 +67,7 @@
         "views/webclient_templates.xml",
         "views/ir_sequence_views.xml",
         "views/account_journal_views.xml",
+        "views/folio_portal_templates.xml",
         "wizards/wizard_reservation.xml",
         "wizards/wizard_massive_changes.xml",
         "wizards/wizard_advanced_filters.xml",
diff --git a/pms/controllers/__init__.py b/pms/controllers/__init__.py
new file mode 100644
index 000000000..52d463f19
--- /dev/null
+++ b/pms/controllers/__init__.py
@@ -0,0 +1 @@
+from . import pms_portal
diff --git a/pms/controllers/pms_portal.py b/pms/controllers/pms_portal.py
new file mode 100644
index 000000000..bf826d591
--- /dev/null
+++ b/pms/controllers/pms_portal.py
@@ -0,0 +1,34 @@
+from odoo import http
+from odoo.addons.portal.controllers.portal import CustomerPortal
+from odoo.exceptions import AccessError, MissingError
+from odoo.http import request, route
+
+
+class PortalFolio(CustomerPortal):
+
+    def _prepare_home_portal_values(self, counters):
+        partner = request.env.user.partner_id
+        values = super()._prepare_home_portal_values(counters)
+        Folio = request.env['pms.folio']
+        if 'folio_count' in counters:
+            values['folio_count'] = Folio.search_count([
+                # ('partner_id', '=', partner.id),
+            ]) if Folio.check_access_rights('read', raise_exception=False) else 0
+        return values
+
+    @http.route(['/my/folios'], type='http', auth="user", website=True)
+    def portal_my_folios(self, page=1, date_begin=None, date_end=None, sortby=None, filterby=None, **kw):
+        values = self._prepare_portal_layout_values()
+        values['folios'] = request.env['pms.folio'].sudo().search([])
+        return request.render("pms.portal_my_folio", values)
+
+    @http.route(['/my/folios/<int:folio_id>'], type='http', auth="user", website=True)
+    def portal_my_folio_detail(self, folio_id, access_token=None, report_type=None, download=False, **kw):
+        try:
+            folio_sudo = self._document_check_access('pms_folio', folio_id, access_token=access_token)
+        except (AccessError, MissingError):
+            return request.redirect('/my')
+        if report_type in ('html', 'pdf', 'text'):
+            return self._show_report(model=folio_sudo, report_type=report_type, report_ref='pms.report_folio_document', download=download)
+        values = self._invoice_get_page_view_values(folio_sudo, access_token, **kw)
+        return request.render("pms.report_folio_document", values)
diff --git a/pms/security/ir.model.access.csv b/pms/security/ir.model.access.csv
index ce18fbbfd..c41b2cae9 100644
--- a/pms/security/ir.model.access.csv
+++ b/pms/security/ir.model.access.csv
@@ -61,3 +61,4 @@ user_access_pms_invoice_filter_days,user_access_pms_invoice_filter_days,model_pm
 user_access_pms_invoice_filter_days_items,user_access_pms_invoice_filter_days_items,model_pms_invoice_filter_days_items,pms.group_pms_user,1,1,1,1
 user_access_wizard_payment_folio,user_access_wizard_payment_folio,model_wizard_payment_folio,pms.group_pms_user,1,1,1,1
 user_access_wizard_folio_changes,user_access_wizard_folio_changes,model_wizard_folio_changes,pms.group_pms_user,1,1,1,1
+user_access_pms_folio_portal,user_access_pms_folio_portal,model_pms_folio,base.group_portal,1,0,0,0
diff --git a/pms/security/pms_security.xml b/pms/security/pms_security.xml
index d9af58fb9..a9705ff48 100644
--- a/pms/security/pms_security.xml
+++ b/pms/security/pms_security.xml
@@ -223,5 +223,12 @@
                 user.get_active_property_ids())]
             </field>
         </record>
+        <record id="pms_folio_rule_portal" model="ir.rule">
+            <field name="name">Portal Personal Folios</field>
+            <field name="model_id" ref="model_pms_folio"/>
+            <field name="domain_force">[]</field>
+            <field name="groups" eval="[(4, ref('base.group_portal'))]"/>
+            <field name="perm_read" eval="True"/>
+        </record>
     </data>
 </odoo>
diff --git a/pms/views/folio_portal_templates.xml b/pms/views/folio_portal_templates.xml
new file mode 100644
index 000000000..d34e3ba6f
--- /dev/null
+++ b/pms/views/folio_portal_templates.xml
@@ -0,0 +1,47 @@
+<odoo>
+    <template id="portal_my_folios" name="Folios" inherit_id="portal.portal_my_home" customize_show="True" priority="30">
+        <xpath expr="//div[hasclass('o_portal_docs')]" position="inside">
+            <t t-call="portal.portal_docs_entry">
+                <t t-set="title">Folios</t>
+                <t t-set="url" t-value="'/my/folios'"/>
+                <t t-set="placeholder_count" t-value="'folio_count'"/>
+            </t>
+        </xpath>
+    </template>
+
+
+    <template id="portal_my_folio" name="My Folios">
+      <t t-call="portal.portal_layout">
+        <t t-set="breadcrumbs_searchbar" t-value="True"/>
+
+        <t t-call="portal.portal_searchbar">
+            <t t-set="title">Folios</t>
+        </t>
+        <t t-if="not folios">
+            <p>There are currently no folios for your account.</p>
+        </t>
+        <t t-if="folios" t-call="portal.portal_table">
+            <thead>
+                <tr class="active">
+                    <th>Folio #</th>
+                    <th>Order Date</th>
+                    <th class="text-right">Total</th>
+                </tr>
+            </thead>
+            <tbody>
+                <t t-foreach="folios" t-as="folio">
+                    <tr>
+                        <td>
+                            <a t-att-href="folio.get_portal_url()" t-att-title="folio.name">
+                                <t t-esc="folio.name"/>
+                            </a>
+                        </td>
+                        <td><span t-field="folio.date_order"/></td>
+                        <td class="text-right"><span t-field="folio.amount_total"/></td>
+                    </tr>
+                </t>
+            </tbody>
+        </t>
+      </t>
+    </template>
+</odoo>

From 51b417e4a29cc0f9dd48b46c16beaaa12a426d0a Mon Sep 17 00:00:00 2001
From: Sara Lago <saralago126@gmail.com>
Date: Thu, 4 Mar 2021 12:15:37 +0100
Subject: [PATCH 10/22] [WIP] Pms: show folio details in portal

---
 pms/controllers/pms_portal.py        |  72 +++--
 pms/security/pms_security.xml        |   6 +-
 pms/views/folio_portal_templates.xml | 420 ++++++++++++++++++++++++++-
 3 files changed, 468 insertions(+), 30 deletions(-)

diff --git a/pms/controllers/pms_portal.py b/pms/controllers/pms_portal.py
index bf826d591..eeb15fee3 100644
--- a/pms/controllers/pms_portal.py
+++ b/pms/controllers/pms_portal.py
@@ -1,34 +1,68 @@
 from odoo import http
-from odoo.addons.portal.controllers.portal import CustomerPortal
 from odoo.exceptions import AccessError, MissingError
-from odoo.http import request, route
+from odoo.http import request
+
+from odoo.addons.portal.controllers.portal import CustomerPortal
 
 
 class PortalFolio(CustomerPortal):
-
     def _prepare_home_portal_values(self, counters):
         partner = request.env.user.partner_id
         values = super()._prepare_home_portal_values(counters)
-        Folio = request.env['pms.folio']
-        if 'folio_count' in counters:
-            values['folio_count'] = Folio.search_count([
-                # ('partner_id', '=', partner.id),
-            ]) if Folio.check_access_rights('read', raise_exception=False) else 0
+        Folio = request.env["pms.folio"]
+        if "folio_count" in counters:
+            values["folio_count"] = (
+                Folio.search_count(
+                    [
+                        ("partner_id", "child_of", partner.id),
+                    ]
+                )
+                if Folio.check_access_rights("read", raise_exception=False)
+                else 0
+            )
         return values
 
-    @http.route(['/my/folios'], type='http', auth="user", website=True)
-    def portal_my_folios(self, page=1, date_begin=None, date_end=None, sortby=None, filterby=None, **kw):
+    def _folio_get_page_view_values(self, folio, access_token, **kwargs):
+        values = {"folio": folio, "token": access_token}
+        return self._get_page_view_values(
+            folio, access_token, values, "my_folios_history", False, **kwargs
+        )
+
+    @http.route(["/my/folios"], type="http", auth="user", website=True)
+    def portal_my_folios(
+        self, page=1, date_begin=None, date_end=None, sortby=None, filterby=None, **kw
+    ):
+        partner = request.env.user.partner_id
         values = self._prepare_portal_layout_values()
-        values['folios'] = request.env['pms.folio'].sudo().search([])
+        values["folios"] = (
+            request.env["pms.folio"]
+            .sudo()
+            .search(
+                [
+                    ("partner_id", "child_of", partner.id),
+                ]
+            )
+        )
         return request.render("pms.portal_my_folio", values)
 
-    @http.route(['/my/folios/<int:folio_id>'], type='http', auth="user", website=True)
-    def portal_my_folio_detail(self, folio_id, access_token=None, report_type=None, download=False, **kw):
+    @http.route(["/my/folios/<int:folio_id>"], type="http", auth="user", website=True)
+    def portal_my_folio_detail(
+        self, folio_id, access_token=None, report_type=None, download=False, **kw
+    ):
         try:
-            folio_sudo = self._document_check_access('pms_folio', folio_id, access_token=access_token)
+            folio_sudo = self._document_check_access(
+                "pms.folio",
+                folio_id,
+                access_token="9a6f4fc8-59f6-4f50-ae45-5af6492e7aba",
+            )
         except (AccessError, MissingError):
-            return request.redirect('/my')
-        if report_type in ('html', 'pdf', 'text'):
-            return self._show_report(model=folio_sudo, report_type=report_type, report_ref='pms.report_folio_document', download=download)
-        values = self._invoice_get_page_view_values(folio_sudo, access_token, **kw)
-        return request.render("pms.report_folio_document", values)
+            return request.redirect("/my")
+        if report_type in ("html", "pdf", "text"):
+            return self._show_report(
+                model=folio_sudo,
+                report_type=report_type,
+                report_ref="action_report_folio",
+                download=download,
+            )
+        values = self._folio_get_page_view_values(folio_sudo, access_token, **kw)
+        return request.render("pms.folio_portal_template", values)
diff --git a/pms/security/pms_security.xml b/pms/security/pms_security.xml
index a9705ff48..b1d35cae1 100644
--- a/pms/security/pms_security.xml
+++ b/pms/security/pms_security.xml
@@ -225,10 +225,10 @@
         </record>
         <record id="pms_folio_rule_portal" model="ir.rule">
             <field name="name">Portal Personal Folios</field>
-            <field name="model_id" ref="model_pms_folio"/>
+            <field name="model_id" ref="model_pms_folio" />
             <field name="domain_force">[]</field>
-            <field name="groups" eval="[(4, ref('base.group_portal'))]"/>
-            <field name="perm_read" eval="True"/>
+            <field name="groups" eval="[(4, ref('base.group_portal'))]" />
+            <field name="perm_read" eval="True" />
         </record>
     </data>
 </odoo>
diff --git a/pms/views/folio_portal_templates.xml b/pms/views/folio_portal_templates.xml
index d34e3ba6f..435e4b1b9 100644
--- a/pms/views/folio_portal_templates.xml
+++ b/pms/views/folio_portal_templates.xml
@@ -1,10 +1,16 @@
 <odoo>
-    <template id="portal_my_folios" name="Folios" inherit_id="portal.portal_my_home" customize_show="True" priority="30">
+    <template
+        id="portal_my_folios"
+        name="Folios"
+        inherit_id="portal.portal_my_home"
+        customize_show="True"
+        priority="30"
+    >
         <xpath expr="//div[hasclass('o_portal_docs')]" position="inside">
             <t t-call="portal.portal_docs_entry">
                 <t t-set="title">Folios</t>
-                <t t-set="url" t-value="'/my/folios'"/>
-                <t t-set="placeholder_count" t-value="'folio_count'"/>
+                <t t-set="url" t-value="'/my/folios'" />
+                <t t-set="placeholder_count" t-value="'folio_count'" />
             </t>
         </xpath>
     </template>
@@ -12,7 +18,7 @@
 
     <template id="portal_my_folio" name="My Folios">
       <t t-call="portal.portal_layout">
-        <t t-set="breadcrumbs_searchbar" t-value="True"/>
+        <t t-set="breadcrumbs_searchbar" t-value="True" />
 
         <t t-call="portal.portal_searchbar">
             <t t-set="title">Folios</t>
@@ -32,16 +38,414 @@
                 <t t-foreach="folios" t-as="folio">
                     <tr>
                         <td>
-                            <a t-att-href="folio.get_portal_url()" t-att-title="folio.name">
-                                <t t-esc="folio.name"/>
+                            <a
+                                    t-att-href="folio.get_portal_url()"
+                                    t-att-title="folio.name"
+                                >
+                                <t t-esc="folio.name" />
                             </a>
                         </td>
-                        <td><span t-field="folio.date_order"/></td>
-                        <td class="text-right"><span t-field="folio.amount_total"/></td>
+                        <td><span t-field="folio.date_order" /></td>
+                        <td class="text-right"><span
+                                    t-field="folio.amount_total"
+                                /></td>
                     </tr>
                 </t>
             </tbody>
         </t>
       </t>
     </template>
+    <template
+        id="folio_portal_template"
+        name="Folio Portal Template"
+        inherit_id="portal.portal_sidebar"
+        primary="True"
+    >
+        <xpath expr="//div[hasclass('o_portal_sidebar')]" position="inside">
+
+            <div class="row mt16 o_portal_sale_sidebar">
+                <!-- Sidebar -->
+                <t t-call="portal.portal_record_sidebar">
+                    <t t-set="classes" t-value="'col-lg-auto d-print-none'" />
+
+                    <t t-set="title">
+                        <h2 class="mb-0"><b t-field="folio.amount_total" /> </h2>
+                    </t>
+                    <t t-set="entries">
+                        <ul
+                            class="list-group list-group-flush flex-wrap flex-row flex-lg-column"
+                        >
+                            <li class="list-group-item flex-grow-1">
+                                <div class="o_download_pdf btn-toolbar flex-sm-nowrap">
+                                    <div class="btn-group flex-grow-1 mr-1 mb-1">
+                                        <a
+                                            class="btn btn-secondary btn-block o_download_btn"
+                                            t-att-href="folio.get_portal_url(report_type='pdf', download=True)"
+                                            title="Download"
+                                        ><i class="fa fa-download" /> Download</a>
+                                    </div>
+                                    <div class="btn-group flex-grow-1 mb-1">
+                                        <a
+                                            class="btn btn-secondary btn-block o_print_btn o_portal_invoice_print"
+                                            t-att-href="folio.get_portal_url(report_type='pdf')"
+                                            id="print_folio_report"
+                                            title="Print"
+                                            target="_blank"
+                                        ><i class="fa fa-print" /> Print</a>
+                                    </div>
+                                </div>
+                            </li>
+
+                            <li
+                                class="navspy list-group-item pl-0 flex-grow-1"
+                                t-ignore="true"
+                                role="complementary"
+                            >
+                                <ul class="nav flex-column bs-sidenav" />
+                            </li>
+
+                            <li
+                                t-if="folio.user_id.name"
+                                class="list-group-item flex-grow-1"
+                            >
+                                <div class="small mb-1"><strong
+                                        class="text-muted"
+                                    >Salesperson</strong></div>
+                                <div class="row flex-nowrap">
+                                    <!--<div class="col flex-grow-0 pr-2">
+                                        <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="folio.user_id.image_1024" t-att-src="image_data_uri(sale_order.user_id.image_1024)" alt="Contact"/>
+                                        <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="not folio.user_id.image_1024" src="/web/static/src/img/placeholder.png" alt="Contact"/>
+                                    </div>-->
+                                    <div class="col pl-0" style="min-width: 150px">
+                                        <span
+                                            t-field="folio.user_id"
+                                            t-options='{"widget": "contact", "fields": ["name", "phone"], "no_marker": True}'
+                                        />
+                                        <a href="#discussion" class="small"><i
+                                                class="fa fa-comment"
+                                            /> Send message</a>
+                                    </div>
+                                </div>
+                            </li>
+                        </ul>
+                    </t>
+                </t>
+                <!-- main content -->
+                <div
+                    t-attf-class="card #{'pb-5' if report_type == 'html' else ''}"
+                    id="portal_folio_content"
+                >
+                    <div t-call="pms.folio_portal_content" />
+                </div>
+                <!-- chatter -->
+                <div id="folio_communication" class="mt-4">
+                    <h2>History</h2>
+                    <t t-call="portal.message_thread">
+                        <t t-set="object" t-value="folio" />
+                    </t>
+                </div>
+            </div>
+        </xpath>
+    </template>
+
+    <!--
+    Sales Order content : intro, informations, order lines, remarks, descriptions ....
+    This template should contains all the printable element of the SO. This is the
+    template rendered in PDF with the report engine.
+    -->
+    <template id="folio_portal_content" name="Folio Portal Content">
+        <!--<t t-call="web.external_layout">-->
+        <t t-set="address">
+            <div class="row">
+                    <div class="col-xs-6">
+                        <t t-if="folio.partner_invoice_id != folio.partner_id">
+                            <div
+                            t-field="folio.partner_invoice_id"
+                            t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'
+                        />
+                        </t>
+                    </div>
+                    <div class="col-xs-5 col-xs-offset-1">
+                        <div
+                        t-field="folio.partner_id"
+                        t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'
+                    />
+                        <p t-if="folio.partner_id.vat">
+                            <t t-esc="folio.company_id.country_id.vat_label or 'TIN'" />
+                            :
+                            <span t-field="folio.partner_id.vat" />
+                        </p>
+                    </div>
+            </div>
+        </t>
+        <div class="page">
+            <div class="oe_structure" />
+
+            <h2 class="mt16">
+                <span t-if="folio.state not in ['draft','sent']">Order #</span>
+                <span t-if="folio.state in ['draft','sent']">Quotation #</span>
+                <span t-field="folio.name" />
+            </h2>
+
+            <div class="row mt32 mb32" id="informations">
+                <div t-if="folio.client_order_ref" class="col-auto col-3 mw-100 mb-2">
+                    <strong>Your Reference:</strong>
+                    <p class="m-0" t-field="folio.client_order_ref" />
+                </div>
+                <div
+                    t-if="folio.date_order and folio.state not in ['draft','sent']"
+                    class="col-auto col-3 mw-100 mb-2"
+                >
+                    <strong>Order Date:</strong>
+                    <p class="m-0" t-field="folio.date_order" />
+                </div>
+                <div
+                    t-if="folio.date_order and folio.state in ['draft','sent']"
+                    class="col-auto col-3 mw-100 mb-2"
+                >
+                    <strong>Quotation Date:</strong>
+                    <p
+                        class="m-0"
+                        t-field="folio.date_order"
+                        t-options='{"widget": "date"}'
+                    />
+                </div>
+                <div t-if="folio.user_id.name" class="col-auto col-3 mw-100 mb-2">
+                    <strong>Salesperson:</strong>
+                    <p class="m-0" t-field="folio.user_id" />
+                </div>
+            </div>
+
+            <!-- Is there a discount on at least one line? -->
+            <t
+                t-set="display_discount"
+                t-value="any(l.discount for l in folio.sale_line_ids)"
+            />
+
+            <table class="table table-sm o_main_table">
+                <!-- In case we want to repeat the header, remove "display: table-row-group" -->
+                <thead style="display: table-row-group">
+                    <tr>
+                        <th name="th_description" class="text-left">Description</th>
+                        <th name="th_quantity" class="text-right">Quantity</th>
+                        <th name="th_priceunit" class="text-right">Unit Price</th>
+                        <th
+                            name="th_discount"
+                            t-if="display_discount"
+                            class="text-right"
+                        >
+                            <span>Disc.%</span>
+                        </th>
+                        <th name="th_taxes" class="text-right">Taxes</th>
+                        <th name="th_subtotal" class="text-right">
+                            <span
+                                groups="account.group_show_line_subtotals_tax_excluded"
+                            >Amount</span>
+                            <span
+                                groups="account.group_show_line_subtotals_tax_included"
+                            >Total Price</span>
+                        </th>
+                    </tr>
+                </thead>
+                <tbody class="sale_tbody">
+
+                    <t t-set="current_subtotal" t-value="0" />
+
+                    <t t-foreach="folio.sale_line_ids" t-as="line">
+
+                        <t
+                            t-set="current_subtotal"
+                            t-value="current_subtotal + line.price_subtotal"
+                            groups="account.group_show_line_subtotals_tax_excluded"
+                        />
+                        <t
+                            t-set="current_subtotal"
+                            t-value="current_subtotal + line.price_total"
+                            groups="account.group_show_line_subtotals_tax_included"
+                        />
+
+                        <tr
+                            t-att-class="'bg-200 font-weight-bold o_line_section' if line.display_type == 'line_section' else 'font-italic o_line_note' if line.display_type == 'line_note' else ''"
+                        >
+                            <t t-if="not line.display_type">
+                                <t t-set="price" t-value="line.price_unit" />
+
+                                <t t-if="line.reservation_id">
+                                        <t
+                                        t-set="print_board_service"
+                                        t-value="line.reservation_id.board_service_room_id.pms_board_service_id.show_detail_report"
+                                    />
+                                        <t t-if="not print_board_service">
+                                            <t
+                                            t-foreach="line.reservation_id.service_ids"
+                                            t-as="service"
+                                        >
+                                                <t t-if="service.is_board_service">
+                                                        <t
+                                                    t-set="price"
+                                                    t-value="service.product_qty/line.product_uom_qty*service.price_unit*(1-(service.discount or 0.0)*0.01) + price"
+                                                />
+                                                </t>
+                                            </t>
+                                        </t>
+                                </t>
+                                <t
+                                    t-if="not(not print_board_service and line.service_id.is_board_service)"
+                                >
+                                        <td name="td_name"><span
+                                            t-field="line.name"
+                                        /></td>
+                                        <td name="td_quantity" class="text-right">
+                                            <span t-field="line.product_uom_qty" />
+                                            <span
+                                            t-field="line.product_uom"
+                                            groups="uom.group_uom"
+                                        />
+                                        </td>
+
+                                        <td name="td_priceunit" class="text-right">
+                                                <span
+                                            t-esc="price"
+                                            t-options='{"widget": "monetary", "display_currency": folio.pricelist_id.currency_id}'
+                                        />
+                                        </td>
+                                        <td t-if="display_discount" class="text-right">
+                                            <span t-field="line.discount" />
+                                        </td>
+                                        <td name="td_taxes" class="text-right">
+                                            <span
+                                            t-esc="', '.join(map(lambda x: (x.description or x.name), line.tax_ids))"
+                                        />
+                                        </td>
+                                        <td
+                                        name="td_subtotal"
+                                        class="text-right o_price_total"
+                                    >
+                                            <span
+                                            t-esc="price*(1-(line.discount or 0.0)*0.01)* line.product_uom_qty"
+                                            groups="account.group_show_line_subtotals_tax_excluded"
+                                            t-options='{"widget": "monetary", "display_currency": folio.pricelist_id.currency_id}'
+                                        />
+                                            <span
+                                            t-esc="price *(1-(line.discount or 0.0)*0.01)* line.product_uom_qty"
+                                            groups="account.group_show_line_subtotals_tax_included"
+                                            t-options='{"widget": "monetary", "display_currency": folio.pricelist_id.currency_id}'
+                                        />
+                                        </td>
+                                </t>
+                            </t>
+                            <t t-if="line.display_type == 'line_section'">
+                                <td name="td_section_line" colspan="99">
+                                    <span t-field="line.name" />
+                                </td>
+                                <t t-set="current_section" t-value="line" />
+                                <t t-set="current_subtotal" t-value="0" />
+                            </t>
+
+                            <t t-if="line.display_type == 'line_note'">
+                                <td name="td_note_line" colspan="99">
+                                    <span t-field="line.name" />
+                                </td>
+                            </t>
+                        </tr>
+
+                        <t
+                            t-if="current_section and (line_last or folio.sale_line_ids[line_index+1].display_type == 'line_section')"
+                        >
+                            <tr class="is-subtotal text-right">
+                                <td name="td_section_subtotal" colspan="99">
+                                    <strong class="mr16">Subtotal</strong>
+                                    <span
+                                        t-esc="current_subtotal"
+                                        t-options='{"widget": "monetary", "display_currency": folio.pricelist_id.currency_id}'
+                                    />
+                                </td>
+                            </tr>
+                        </t>
+                    </t>
+                </tbody>
+            </table>
+
+            <div class="clearfix" name="so_total_summary">
+                <div id="total" class="row" name="total">
+                    <div
+                        t-attf-class="#{'col-4' if report_type != 'html' else 'col-sm-7 col-md-5'} ml-auto"
+                    >
+                        <table class="table table-sm">
+                            <tr class="border-black o_subtotal" style="">
+                                <td name="td_amount_untaxed_label"><strong
+                                    >Subtotal</strong></td>
+                                <td name="td_amount_untaxed" class="text-right">
+                                    <span t-field="folio.amount_untaxed" />
+                                </td>
+                            </tr>
+                            <t
+                                t-foreach="folio._get_tax_amount_by_group()"
+                                t-as="amount_by_group"
+                            >
+                                <tr style="">
+                                    <t
+                                        t-if="amount_by_group[3] == 1 and folio.amount_untaxed == amount_by_group[2]"
+                                    >
+                                        <td name="td_amount_by_group_label_3">
+                                            <span t-esc="amount_by_group[0]" />
+                                            <span>&amp;nbsp;<span>on</span>&amp;nbsp;<t
+                                                    t-esc="amount_by_group[2]"
+                                                    t-options='{"widget": "monetary", "display_currency": folio.pricelist_id.currency_id}'
+                                                /></span>
+                                        </td>
+                                        <td
+                                            name="td_amount_by_group_3"
+                                            class="text-right o_price_total"
+                                        >
+                                            <span
+                                                t-esc="amount_by_group[1]"
+                                                t-options='{"widget": "monetary", "display_currency": folio.pricelist_id.currency_id}'
+                                            />
+                                        </td>
+                                    </t>
+                                    <t t-else="">
+                                        <td name="td_amount_by_group_label">
+                                            <span t-esc="amount_by_group[0]" />
+                                        </td>
+                                        <td
+                                            name="td_amount_by_group"
+                                            class="text-right o_price_total"
+                                        >
+                                            <span
+                                                t-esc="amount_by_group[1]"
+                                                t-options='{"widget": "monetary", "display_currency": folio.pricelist_id.currency_id}'
+                                            />
+                                        </td>
+                                    </t>
+                                </tr>
+                            </t>
+                            <tr class="border-black o_total">
+                                <td name="td_amount_total_label"><strong
+                                    >Total</strong></td>
+                                <td name="td_amount_total" class="text-right">
+                                    <span t-field="folio.amount_total" />
+                                </td>
+                            </tr>
+                        </table>
+                    </div>
+                </div>
+            </div>
+
+            <div class="oe_structure" />
+
+            <p t-field="folio.note" />
+            <p t-if="folio.payment_term_id.note">
+                <span t-field="folio.payment_term_id.note" />
+            </p>
+            <p
+                id="fiscal_position_remark"
+                t-if="folio.fiscal_position_id and folio.fiscal_position_id.sudo().note"
+            >
+                <strong>Fiscal Position Remark:</strong>
+                <span t-field="folio.fiscal_position_id.sudo().note" />
+            </p>
+        </div>
+    <!--</t>-->
+    </template>
 </odoo>

From c80b8f888ef0ebb68aedb0449dae3428c3c8c372 Mon Sep 17 00:00:00 2001
From: Sara Lago <saralago126@gmail.com>
Date: Thu, 4 Mar 2021 12:58:30 +0100
Subject: [PATCH 11/22] [WIP] Pms: change folio style in portal

---
 pms/views/folio_portal_templates.xml | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/pms/views/folio_portal_templates.xml b/pms/views/folio_portal_templates.xml
index 435e4b1b9..7d05ffe61 100644
--- a/pms/views/folio_portal_templates.xml
+++ b/pms/views/folio_portal_templates.xml
@@ -130,15 +130,13 @@
                         </ul>
                     </t>
                 </t>
-                <!-- main content -->
-                <div
-                    t-attf-class="card #{'pb-5' if report_type == 'html' else ''}"
-                    id="portal_folio_content"
-                >
+                <!-- main content-->
+                <div t-attf-class="card col-8 p-3" id="portal_folio_content">
                     <div t-call="pms.folio_portal_content" />
                 </div>
                 <!-- chatter -->
-                <div id="folio_communication" class="mt-4">
+                <div class="col-3" />
+                <div id="folio_communication" class="mt-4 col-8">
                     <h2>History</h2>
                     <t t-call="portal.message_thread">
                         <t t-set="object" t-value="folio" />
@@ -154,9 +152,10 @@
     template rendered in PDF with the report engine.
     -->
     <template id="folio_portal_content" name="Folio Portal Content">
-        <!--<t t-call="web.external_layout">-->
         <t t-set="address">
-            <div class="row">
+            <div
+                class="row pb-2 pt-3 #{'card-header bg-white' if report_type == 'html' else ''}"
+            >
                     <div class="col-xs-6">
                         <t t-if="folio.partner_invoice_id != folio.partner_id">
                             <div
@@ -188,29 +187,29 @@
             </h2>
 
             <div class="row mt32 mb32" id="informations">
-                <div t-if="folio.client_order_ref" class="col-auto col-3 mw-100 mb-2">
+                <div t-if="folio.client_order_ref" class="mb-3 col-6">
                     <strong>Your Reference:</strong>
                     <p class="m-0" t-field="folio.client_order_ref" />
                 </div>
                 <div
                     t-if="folio.date_order and folio.state not in ['draft','sent']"
-                    class="col-auto col-3 mw-100 mb-2"
+                    class="mb-3 col-6"
                 >
                     <strong>Order Date:</strong>
                     <p class="m-0" t-field="folio.date_order" />
                 </div>
                 <div
                     t-if="folio.date_order and folio.state in ['draft','sent']"
-                    class="col-auto col-3 mw-100 mb-2"
+                    class="mb-3 col-6"
                 >
                     <strong>Quotation Date:</strong>
                     <p
-                        class="m-0"
+                        class="mb-3 col-6"
                         t-field="folio.date_order"
                         t-options='{"widget": "date"}'
                     />
                 </div>
-                <div t-if="folio.user_id.name" class="col-auto col-3 mw-100 mb-2">
+                <div t-if="folio.user_id.name" class="mb-3 col-6">
                     <strong>Salesperson:</strong>
                     <p class="m-0" t-field="folio.user_id" />
                 </div>
@@ -446,6 +445,5 @@
                 <span t-field="folio.fiscal_position_id.sudo().note" />
             </p>
         </div>
-    <!--</t>-->
     </template>
 </odoo>

From 61ced4a7382434a19bfd373d80a75efee27ba037 Mon Sep 17 00:00:00 2001
From: Sara Lago <saralago126@gmail.com>
Date: Thu, 4 Mar 2021 13:27:44 +0100
Subject: [PATCH 12/22] [IMP] Pms: Add compute method to url portal folio

---
 pms/controllers/pms_portal.py | 2 +-
 pms/models/pms_folio.py       | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pms/controllers/pms_portal.py b/pms/controllers/pms_portal.py
index eeb15fee3..c4a6de7f8 100644
--- a/pms/controllers/pms_portal.py
+++ b/pms/controllers/pms_portal.py
@@ -53,7 +53,7 @@ class PortalFolio(CustomerPortal):
             folio_sudo = self._document_check_access(
                 "pms.folio",
                 folio_id,
-                access_token="9a6f4fc8-59f6-4f50-ae45-5af6492e7aba",
+                access_token=access_token,
             )
         except (AccessError, MissingError):
             return request.redirect("/my")
diff --git a/pms/models/pms_folio.py b/pms/models/pms_folio.py
index bdce61a81..07a8912e6 100644
--- a/pms/models/pms_folio.py
+++ b/pms/models/pms_folio.py
@@ -542,6 +542,11 @@ class PmsFolio(models.Model):
             order.move_ids = invoices
             order.invoice_count = len(invoices)
 
+    def _compute_access_url(self):
+        super(PmsFolio, self)._compute_access_url()
+        for folio in self:
+            folio.access_url = "/my/folios/%s" % (folio.id)
+
     def _search_invoice_ids(self, operator, value):
         if operator == "in" and value:
             self.env.cr.execute(

From 2b8d648b18411a17574b069a938e716377130903 Mon Sep 17 00:00:00 2001
From: braisab <braisterbutalino@gmail.com>
Date: Thu, 4 Mar 2021 20:03:16 +0100
Subject: [PATCH 13/22] [WIP]pms: added breadcrumbs

---
 pms/controllers/pms_portal.py        |  6 ++++++
 pms/views/folio_portal_templates.xml | 15 +++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/pms/controllers/pms_portal.py b/pms/controllers/pms_portal.py
index c4a6de7f8..14ef92e86 100644
--- a/pms/controllers/pms_portal.py
+++ b/pms/controllers/pms_portal.py
@@ -43,6 +43,12 @@ class PortalFolio(CustomerPortal):
                 ]
             )
         )
+        values.update(
+            {
+                "page_name": "folios",
+                "default_url": "/my/folios",
+            }
+        )
         return request.render("pms.portal_my_folio", values)
 
     @http.route(["/my/folios/<int:folio_id>"], type="http", auth="user", website=True)
diff --git a/pms/views/folio_portal_templates.xml b/pms/views/folio_portal_templates.xml
index 7d05ffe61..93c235d5c 100644
--- a/pms/views/folio_portal_templates.xml
+++ b/pms/views/folio_portal_templates.xml
@@ -1,4 +1,19 @@
 <odoo>
+    <template
+        id="portal_my_home_menu_folio"
+        name="Portal layout : folio menu entries"
+        inherit_id="portal.portal_breadcrumbs"
+        priority="20"
+    >
+        <xpath expr="//ol[hasclass('o_portal_submenu')]" position="inside">
+            <li t-attf-class="breadcrumb-item #{'active ' if not folios else ''}">
+                <a t-attf-href="/my/folios?{{ keep_query() }}">Folios</a>
+            </li>
+            <li t-if="folio" class="breadcrumb-item active">
+                <t t-esc="folio.name" />
+            </li>
+        </xpath>
+    </template>
     <template
         id="portal_my_folios"
         name="Folios"

From 3f84d629cb9af8192972f785afe233580ecebd08 Mon Sep 17 00:00:00 2001
From: braisab <braisterbutalino@gmail.com>
Date: Fri, 5 Mar 2021 11:43:14 +0100
Subject: [PATCH 14/22] [WIP]pms: add functionality sidebar buttons

---
 pms/controllers/pms_portal.py        |  4 ++--
 pms/models/pms_folio.py              |  3 +++
 pms/views/folio_portal_templates.xml | 19 ++++++-------------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/pms/controllers/pms_portal.py b/pms/controllers/pms_portal.py
index 14ef92e86..7c39cd3cc 100644
--- a/pms/controllers/pms_portal.py
+++ b/pms/controllers/pms_portal.py
@@ -14,7 +14,7 @@ class PortalFolio(CustomerPortal):
             values["folio_count"] = (
                 Folio.search_count(
                     [
-                        ("partner_id", "child_of", partner.id),
+                        ("partner_id", "=", partner.id),
                     ]
                 )
                 if Folio.check_access_rights("read", raise_exception=False)
@@ -67,7 +67,7 @@ class PortalFolio(CustomerPortal):
             return self._show_report(
                 model=folio_sudo,
                 report_type=report_type,
-                report_ref="action_report_folio",
+                report_ref="pms.action_report_folio",
                 download=download,
             )
         values = self._folio_get_page_view_values(folio_sudo, access_token, **kw)
diff --git a/pms/models/pms_folio.py b/pms/models/pms_folio.py
index 07a8912e6..89150dcc4 100644
--- a/pms/models/pms_folio.py
+++ b/pms/models/pms_folio.py
@@ -751,6 +751,9 @@ class PmsFolio(models.Model):
             record.max_reservation_prior = max(reservation_priors)
 
     # Action methods
+    def _get_report_base_filename(self):
+        self.ensure_one()
+        return 'Folio %s' % self.name
 
     def action_pay(self):
         self.ensure_one()
diff --git a/pms/views/folio_portal_templates.xml b/pms/views/folio_portal_templates.xml
index 93c235d5c..4f7d0f0c3 100644
--- a/pms/views/folio_portal_templates.xml
+++ b/pms/views/folio_portal_templates.xml
@@ -6,11 +6,12 @@
         priority="20"
     >
         <xpath expr="//ol[hasclass('o_portal_submenu')]" position="inside">
-            <li t-attf-class="breadcrumb-item #{'active ' if not folios else ''}">
+            <li t-if="page_name == 'folios'" t-attf-class="breadcrumb-item #{'active ' if not folios else ''}">
                 <a t-attf-href="/my/folios?{{ keep_query() }}">Folios</a>
             </li>
             <li t-if="folio" class="breadcrumb-item active">
-                <t t-esc="folio.name" />
+                 <a t-attf-href="/my/folios?{{ keep_query() }}">Folios/</a>
+                <t t-esc="folio.name"/>
             </li>
         </xpath>
     </template>
@@ -111,14 +112,6 @@
                                 </div>
                             </li>
 
-                            <li
-                                class="navspy list-group-item pl-0 flex-grow-1"
-                                t-ignore="true"
-                                role="complementary"
-                            >
-                                <ul class="nav flex-column bs-sidenav" />
-                            </li>
-
                             <li
                                 t-if="folio.user_id.name"
                                 class="list-group-item flex-grow-1"
@@ -127,10 +120,10 @@
                                         class="text-muted"
                                     >Salesperson</strong></div>
                                 <div class="row flex-nowrap">
-                                    <!--<div class="col flex-grow-0 pr-2">
-                                        <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="folio.user_id.image_1024" t-att-src="image_data_uri(sale_order.user_id.image_1024)" alt="Contact"/>
+                                    <div class="col flex-grow-0 pr-2">
+                                        <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="folio.user_id.image_1024" t-att-src="image_data_uri(folio.user_id.image_1024)" alt="Contact"/>
                                         <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="not folio.user_id.image_1024" src="/web/static/src/img/placeholder.png" alt="Contact"/>
-                                    </div>-->
+                                    </div>
                                     <div class="col pl-0" style="min-width: 150px">
                                         <span
                                             t-field="folio.user_id"

From 5ce890527c79a9c255da51972d7d9c8660afac9b Mon Sep 17 00:00:00 2001
From: braisab <braisterbutalino@gmail.com>
Date: Fri, 5 Mar 2021 12:47:35 +0100
Subject: [PATCH 15/22] [WIP] add sort by and pager

---
 pms/controllers/pms_portal.py        | 58 ++++++++++++++++++++++------
 pms/models/pms_folio.py              |  2 +-
 pms/views/folio_portal_templates.xml | 21 ++++++++--
 3 files changed, 65 insertions(+), 16 deletions(-)

diff --git a/pms/controllers/pms_portal.py b/pms/controllers/pms_portal.py
index 7c39cd3cc..db962effc 100644
--- a/pms/controllers/pms_portal.py
+++ b/pms/controllers/pms_portal.py
@@ -1,8 +1,8 @@
-from odoo import http
+from odoo import _, http
 from odoo.exceptions import AccessError, MissingError
 from odoo.http import request
 
-from odoo.addons.portal.controllers.portal import CustomerPortal
+from odoo.addons.portal.controllers.portal import CustomerPortal, pager as portal_pager
 
 
 class PortalFolio(CustomerPortal):
@@ -28,25 +28,61 @@ class PortalFolio(CustomerPortal):
             folio, access_token, values, "my_folios_history", False, **kwargs
         )
 
-    @http.route(["/my/folios"], type="http", auth="user", website=True)
+    @http.route(
+        ["/my/folios", "/my/folios/page/<int:page>"],
+        type="http",
+        auth="user",
+        website=True,
+    )
     def portal_my_folios(
         self, page=1, date_begin=None, date_end=None, sortby=None, filterby=None, **kw
     ):
         partner = request.env.user.partner_id
         values = self._prepare_portal_layout_values()
-        values["folios"] = (
-            request.env["pms.folio"]
-            .sudo()
-            .search(
-                [
-                    ("partner_id", "child_of", partner.id),
-                ]
-            )
+        PmsFolio = request.env["pms.folio"]
+        values["folios"] = PmsFolio.sudo().search(
+            [
+                ("partner_id", "child_of", partner.id),
+            ]
         )
+        domain = [
+            ("partner_id", "child_of", partner.id),
+        ]
+        searchbar_sortings = {
+            "date": {"label": _("Order Date"), "folio": "date_order desc"},
+            "name": {"label": _("Reference"), "folio": "name"},
+            "stage": {"label": _("Stage"), "folio": "state"},
+        }
+        if not sortby:
+            sortby = "date"
+        sort_order = searchbar_sortings[sortby]["folio"]
+
+        if date_begin and date_end:
+            domain += [
+                ("create_date", ">", date_begin),
+                ("create_date", "<=", date_end),
+            ]
+        folio_count = PmsFolio.search_count(domain)
+        pager = portal_pager(
+            url="/my/folios",
+            url_args={"date_begin": date_begin, "date_end": date_end, "sortby": sortby},
+            total=folio_count,
+            page=page,
+            step=self._items_per_page,
+        )
+        folios = PmsFolio.search(
+            domain, order=sort_order, limit=self._items_per_page, offset=pager["offset"]
+        )
+        request.session["my_folios_history"] = folios.ids[:100]
         values.update(
             {
+                "date": date_begin,
+                "folios": folios.sudo(),
                 "page_name": "folios",
+                "pager": pager,
                 "default_url": "/my/folios",
+                "searchbar_sortings": searchbar_sortings,
+                "sortby": sortby,
             }
         )
         return request.render("pms.portal_my_folio", values)
diff --git a/pms/models/pms_folio.py b/pms/models/pms_folio.py
index 89150dcc4..90d98f7e1 100644
--- a/pms/models/pms_folio.py
+++ b/pms/models/pms_folio.py
@@ -753,7 +753,7 @@ class PmsFolio(models.Model):
     # Action methods
     def _get_report_base_filename(self):
         self.ensure_one()
-        return 'Folio %s' % self.name
+        return "Folio %s" % self.name
 
     def action_pay(self):
         self.ensure_one()
diff --git a/pms/views/folio_portal_templates.xml b/pms/views/folio_portal_templates.xml
index 4f7d0f0c3..56f79be9e 100644
--- a/pms/views/folio_portal_templates.xml
+++ b/pms/views/folio_portal_templates.xml
@@ -6,12 +6,15 @@
         priority="20"
     >
         <xpath expr="//ol[hasclass('o_portal_submenu')]" position="inside">
-            <li t-if="page_name == 'folios'" t-attf-class="breadcrumb-item #{'active ' if not folios else ''}">
+            <li
+                t-if="page_name == 'folios'"
+                t-attf-class="breadcrumb-item #{'active ' if not folios else ''}"
+            >
                 <a t-attf-href="/my/folios?{{ keep_query() }}">Folios</a>
             </li>
             <li t-if="folio" class="breadcrumb-item active">
                  <a t-attf-href="/my/folios?{{ keep_query() }}">Folios/</a>
-                <t t-esc="folio.name"/>
+                <t t-esc="folio.name" />
             </li>
         </xpath>
     </template>
@@ -121,8 +124,18 @@
                                     >Salesperson</strong></div>
                                 <div class="row flex-nowrap">
                                     <div class="col flex-grow-0 pr-2">
-                                        <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="folio.user_id.image_1024" t-att-src="image_data_uri(folio.user_id.image_1024)" alt="Contact"/>
-                                        <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="not folio.user_id.image_1024" src="/web/static/src/img/placeholder.png" alt="Contact"/>
+                                        <img
+                                            class="rounded-circle mr4 float-left o_portal_contact_img"
+                                            t-if="folio.user_id.image_1024"
+                                            t-att-src="image_data_uri(folio.user_id.image_1024)"
+                                            alt="Contact"
+                                        />
+                                        <img
+                                            class="rounded-circle mr4 float-left o_portal_contact_img"
+                                            t-if="not folio.user_id.image_1024"
+                                            src="/web/static/src/img/placeholder.png"
+                                            alt="Contact"
+                                        />
                                     </div>
                                     <div class="col pl-0" style="min-width: 150px">
                                         <span

From bebfe819720ee45f0614ae67f548edf04d666143 Mon Sep 17 00:00:00 2001
From: braisab <braisterbutalino@gmail.com>
Date: Fri, 5 Mar 2021 20:05:54 +0100
Subject: [PATCH 16/22] [WIP]pms: added reservations in portal

---
 pms/__manifest__.py                        |   1 +
 pms/controllers/pms_portal.py              | 112 ++++++++++++-
 pms/models/pms_reservation.py              |   5 +
 pms/security/ir.model.access.csv           |   1 +
 pms/security/pms_security.xml              |   7 +
 pms/views/reservation_portal_templates.xml | 180 +++++++++++++++++++++
 6 files changed, 305 insertions(+), 1 deletion(-)
 create mode 100644 pms/views/reservation_portal_templates.xml

diff --git a/pms/__manifest__.py b/pms/__manifest__.py
index 0c628585c..270cb2384 100644
--- a/pms/__manifest__.py
+++ b/pms/__manifest__.py
@@ -68,6 +68,7 @@
         "views/ir_sequence_views.xml",
         "views/account_journal_views.xml",
         "views/folio_portal_templates.xml",
+        "views/reservation_portal_templates.xml",
         "wizards/wizard_reservation.xml",
         "wizards/wizard_massive_changes.xml",
         "wizards/wizard_advanced_filters.xml",
diff --git a/pms/controllers/pms_portal.py b/pms/controllers/pms_portal.py
index db962effc..927320589 100644
--- a/pms/controllers/pms_portal.py
+++ b/pms/controllers/pms_portal.py
@@ -40,7 +40,7 @@ class PortalFolio(CustomerPortal):
         partner = request.env.user.partner_id
         values = self._prepare_portal_layout_values()
         PmsFolio = request.env["pms.folio"]
-        values["folios"] = PmsFolio.sudo().search(
+        values["folios"] = PmsFolio.search(
             [
                 ("partner_id", "child_of", partner.id),
             ]
@@ -108,3 +108,113 @@ class PortalFolio(CustomerPortal):
             )
         values = self._folio_get_page_view_values(folio_sudo, access_token, **kw)
         return request.render("pms.folio_portal_template", values)
+
+
+class PortalReservation(CustomerPortal):
+    def _prepare_home_portal_values(self, counters):
+        partner = request.env.user.partner_id
+        values = super()._prepare_home_portal_values(counters)
+        Reservation = request.env["pms.reservation"]
+        if "reservation_count" in counters:
+            values["reservation_count"] = (
+                Reservation.search_count(
+                    [
+                        ("partner_id", "=", partner.id),
+                    ]
+                )
+                if Reservation.check_access_rights("read", raise_exception=False)
+                else 0
+            )
+        return values
+
+    def _reservation_get_page_view_values(self, reservation, access_token, **kwargs):
+        values = {"reservation": reservation, "token": access_token}
+        return self._get_page_view_values(
+            reservation,
+            access_token,
+            values,
+            "my_reservations_history",
+            False,
+            **kwargs
+        )
+
+    @http.route(
+        ["/my/reservations", "/my/reservations/page/<int:page>"],
+        type="http",
+        auth="user",
+        website=True,
+    )
+    def portal_my_reservations(
+        self, page=1, date_begin=None, date_end=None, sortby=None, filterby=None, **kw
+    ):
+        partner = request.env.user.partner_id
+        values = self._prepare_portal_layout_values()
+        Reservation = request.env["pms.reservation"]
+        values["reservations"] = Reservation.search(
+            [
+                ("partner_id", "child_of", partner.id),
+            ]
+        )
+        domain = [
+            ("partner_id", "child_of", partner.id),
+        ]
+        searchbar_sortings = {
+            "date": {"label": _("Order Date"), "reservation": "date_order desc"},
+            "name": {"label": _("Reference"), "reservation": "name"},
+            "stage": {"label": _("Stage"), "reservation": "state"},
+        }
+        if not sortby:
+            sortby = "date"
+        sort_order = searchbar_sortings[sortby]["reservation"]
+
+        if date_begin and date_end:
+            domain += [
+                ("create_date", ">", date_begin),
+                ("create_date", "<=", date_end),
+            ]
+        reservation_count = Reservation.search_count(domain)
+        pager = portal_pager(
+            url="/my/reservations",
+            url_args={"date_begin": date_begin, "date_end": date_end, "sortby": sortby},
+            total=reservation_count,
+            page=page,
+            step=self._items_per_page,
+        )
+        reservations = Reservation.search(
+            domain, order=sort_order, limit=self._items_per_page, offset=pager["offset"]
+        )
+        request.session["my_reservations_history"] = reservations.ids[:100]
+        values.update(
+            {
+                "date": date_begin,
+                "reservations": reservations.sudo(),
+                "page_name": "reservations",
+                "pager": pager,
+                "default_url": "/my/reservations",
+                "searchbar_sortings": searchbar_sortings,
+                "sortby": sortby,
+            }
+        )
+        return request.render("pms.portal_my_reservation", values)
+
+    @http.route(
+        ["/my/reservations/<int:reservation_id>"],
+        type="http",
+        auth="user",
+        website=True,
+    )
+    def portal_my_reservation_detail(self, reservation_id, access_token=None, **kw):
+        try:
+            reservation_sudo = self._document_check_access(
+                "pms.reservation",
+                reservation_id,
+                access_token=access_token,
+            )
+        except (AccessError, MissingError):
+            return request.redirect("/my")
+        # for attachment in reservation_sudo.attachment_ids:
+        #     attachment.generate_access_token()
+        values = self._reservation_get_page_view_values(
+            reservation_sudo, access_token, **kw
+        )
+        return request.render("pms.portal_my_reservation_detail", values)
diff --git a/pms/models/pms_reservation.py b/pms/models/pms_reservation.py
index 04015fc96..48fd3593f 100644
--- a/pms/models/pms_reservation.py
+++ b/pms/models/pms_reservation.py
@@ -840,6 +840,11 @@ class PmsReservation(models.Model):
                 else False
             )
 
+    def _compute_access_url(self):
+        super(PmsReservation, self)._compute_access_url()
+        for reservation in self:
+            reservation.access_url = "/my/reservations/%s" % (reservation.id)
+
     def _search_left_for_checkin(self, operator, value):
         if operator not in ("=",):
             raise UserError(
diff --git a/pms/security/ir.model.access.csv b/pms/security/ir.model.access.csv
index c41b2cae9..23c05a463 100644
--- a/pms/security/ir.model.access.csv
+++ b/pms/security/ir.model.access.csv
@@ -62,3 +62,4 @@ user_access_pms_invoice_filter_days_items,user_access_pms_invoice_filter_days_it
 user_access_wizard_payment_folio,user_access_wizard_payment_folio,model_wizard_payment_folio,pms.group_pms_user,1,1,1,1
 user_access_wizard_folio_changes,user_access_wizard_folio_changes,model_wizard_folio_changes,pms.group_pms_user,1,1,1,1
 user_access_pms_folio_portal,user_access_pms_folio_portal,model_pms_folio,base.group_portal,1,0,0,0
+user_access_pms_reservation_portal,user_access_pms_reservation_portal,model_pms_reservation,base.group_portal,1,0,0,0
diff --git a/pms/security/pms_security.xml b/pms/security/pms_security.xml
index b1d35cae1..ff331b48f 100644
--- a/pms/security/pms_security.xml
+++ b/pms/security/pms_security.xml
@@ -230,5 +230,12 @@
             <field name="groups" eval="[(4, ref('base.group_portal'))]" />
             <field name="perm_read" eval="True" />
         </record>
+        <record id="pms_reservation_rule_portal" model="ir.rule">
+            <field name="name">Portal Personal Reservation</field>
+            <field name="model_id" ref="model_pms_reservation" />
+            <field name="domain_force">[]</field>
+            <field name="groups" eval="[(4, ref('base.group_portal'))]" />
+            <field name="perm_read" eval="True" />
+        </record>
     </data>
 </odoo>
diff --git a/pms/views/reservation_portal_templates.xml b/pms/views/reservation_portal_templates.xml
new file mode 100644
index 000000000..a4da35de5
--- /dev/null
+++ b/pms/views/reservation_portal_templates.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template
+        id="portal_my_home_menu_reservation"
+        name="Portal layout : reservation menu entries"
+        inherit_id="portal.portal_breadcrumbs"
+        priority="20"
+    >
+        <xpath expr="//ol[hasclass('o_portal_submenu')]" position="inside">
+            <li
+                t-if="page_name == 'reservations'"
+                t-attf-class="breadcrumb-item #{'active ' if not reservations else ''}"
+            >
+                <a t-attf-href="/my/reservations?{{ keep_query() }}">Reservations</a>
+            </li>
+            <li t-if="reservation" class="breadcrumb-item active">
+                 <a t-attf-href="/my/reservations?{{ keep_query() }}">Reservations/</a>
+                <t t-esc="reservation.name" />
+            </li>
+        </xpath>
+    </template>
+    <template
+        id="portal_my_reservations"
+        name="Reservations"
+        inherit_id="portal.portal_my_home"
+        customize_show="True"
+        priority="30"
+    >
+        <xpath expr="//div[hasclass('o_portal_docs')]" position="inside">
+            <t t-call="portal.portal_docs_entry">
+                <t t-set="title">Reservations</t>
+                <t t-set="url" t-value="'/my/reservations'" />
+                <t t-set="placeholder_count" t-value="'reservation_count'" />
+            </t>
+        </xpath>
+    </template>
+
+    <template id="portal_my_reservation" name="My Reservations">
+      <t t-call="portal.portal_layout">
+        <t t-set="breadcrumbs_searchbar" t-value="True" />
+
+        <t t-call="portal.portal_searchbar">
+            <t t-set="title">Reservations</t>
+        </t>
+        <t t-if="not reservations">
+            <p>There are currently no reservations for your account.</p>
+        </t>
+        <t t-if="reservations" t-call="portal.portal_table">
+            <thead>
+                <tr class="active">
+                    <th>Reservation #</th>
+                    <th>Checkin</th>
+                    <th>Checkout</th>
+                    <th class="text-right">Total</th>
+                </tr>
+            </thead>
+            <tbody>
+                <t t-foreach="reservations" t-as="reservation">
+                    <tr>
+                        <td>
+                            <a
+                                    t-att-href="reservation.get_portal_url()"
+                                    t-att-title="reservation.name"
+                                >
+                                <t t-esc="reservation.name" />
+                            </a>
+                        </td>
+                        <td><span t-field="reservation.checkin" /></td>
+                        <td><span t-field="reservation.checkout" /></td>
+<!--                        <td class="text-right"><span-->
+<!--                                    t-field="reservation.price_room_services_set"-->
+<!--                                /></td>-->
+                    </tr>
+                </t>
+            </tbody>
+        </t>
+      </t>
+    </template>
+
+    <template id="portal_my_reservation_detail" name="My Reservation">
+        <t t-call="portal.portal_layout">
+<!--            <t t-set="o_portal_fullwidth_alert" groups="project.group_project_user">-->
+<!--                <t t-call="portal.portal_back_in_edit_mode">-->
+<!--                    <t t-set="backend_url" t-value="'/web#model=project.task&amp;id=%s&amp;view_type=form' % (task.id)"/>-->
+<!--                </t>-->
+<!--            </t>-->
+
+            <t t-call="portal.portal_record_layout">
+                <t t-set="card_header">
+                    <div class="row no-gutters">
+                        <div class="col-12">
+                            <h5 class="d-flex mb-1 mb-md-0 row">
+                                <span t-field="reservation.name" class="col-9 text-truncate"/>
+                                <small class="text-muted d-none d-md-inline"> (#<span t-field="reservation.id"/>)</small>
+                                <div class="col-3 col-md-2 text-right">
+                                    <small class="text-right">Status:</small>
+                                    <span t-field="reservation.state" class=" badge badge-pill badge-info" title="Current state of this reservation"/>
+                                </div>
+                            </h5>
+                        </div>
+                    </div>
+                </t>
+                <t t-set="card_body">
+<!--                    <div class="mb-1" t-if="user in reservation.sudo().allowed_user_ids">-->
+<!--                        <strong>Project:</strong> <a t-attf-href="/my/project/#{reservation.project_id.id}" t-field="reservation.name"/>-->
+<!--                    </div>-->
+
+                    <div class="row mb-4">
+                        <div class="col-12 col-md-6" t-if="reservation.checkin">
+                            <strong>Checkin:</strong> <span t-field="reservation.checkin" t-options='{"widget": "date"}'/>
+                        </div>
+                        <div class="col-12 col-md-6 mb-1">
+                            <strong>Checkout:</strong> <span t-field="reservation.checkout" t-options='{"widget": "date"}'/>
+                        </div>
+                    </div>
+
+                    <div class="row mb-4" t-if="reservation.partner_id">
+                        <div class="col-12 col-md-6 pb-2" t-if="reservation.partner_id">
+                            <strong>Assigned to</strong>
+                            <div class="row">
+                                <div class="col flex-grow-0 pr-3">
+                                    <img t-if="reservation.partner_id.image_1024" class="rounded-circle mt-1 o_portal_contact_img" t-att-src="image_data_uri(reservation.partner_id.image_1024)" alt="Contact"/>
+                                    <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/src/img/user_menu_avatar.png" alt="Contact"/>
+                                </div>
+                                <div class="col pl-md-0">
+                                    <div t-field="reservation.partner_id" t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'/>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="coll-12 col-md-6 pb-2" t-if="reservation.partner_id">
+                            <strong>Reported by</strong>
+                            <div class="row">
+                                <div class="col flex-grow-0 pr-3">
+                                    <img t-if="reservation.partner_id.image_1024" class="rounded-circle mt-1 o_portal_contact_img" t-att-src="image_data_uri(reservation.partner_id.image_1024)" alt="Contact"/>
+                                    <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/src/img/user_menu_avatar.png" alt="Contact"/>
+                                </div>
+                                <div class="col pl-md-0">
+                                    <div t-field="reservation.partner_id" t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'/>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+<!--                    <div class="row" t-if="reservation.description">-->
+<!--                        <div t-if="reservation.description" t-attf-class="col-12 col-lg-7 mb-4 mb-md-0 ">-->
+<!--                            <hr class="mb-1"/>-->
+<!--                            <div class="d-flex my-2">-->
+<!--                                <strong>Description</strong>-->
+<!--                            </div>-->
+<!--                            <div class="py-1 px-2 bg-100 small" t-field="reservation.description"/>-->
+<!--                        </div>-->
+<!--                        <div t-if="reservation.attachment_ids" t-attf-class="col-12 col-lg-5 o_project_portal_attachments {{'col-lg-5' if reservation.description else 'col-lg-12'}}">-->
+<!--                            <hr class="mb-1 d-none d-lg-block"/>-->
+<!--                            <strong class="d-block mb-2">Attachments</strong>-->
+<!--                            <div class="row">-->
+<!--                                <div t-attf-class="col {{'col-lg-6' if not reservation.description else 'col-lg-12'}}">-->
+<!--                                    <ul class="list-group">-->
+<!--                                        <a class="list-group-item list-group-item-action d-flex align-items-center oe_attachments py-1 px-2" t-foreach='reservation.attachment_ids' t-as='attachment' t-attf-href="/web/content/#{attachment.id}?download=true&amp;access_token=#{attachment.access_token}" target="_blank" data-no-post-process="">-->
+<!--                                            <div class='oe_attachment_embedded o_image o_image_small mr-2 mr-lg-3' t-att-title="attachment.name" t-att-data-mimetype="attachment.mimetype" t-attf-data-src="/web/image/#{attachment.id}/50x40?access_token=#{attachment.access_token}"/>-->
+<!--                                            <div class='oe_attachment_name text-truncate'><t t-esc='attachment.name'/></div>-->
+<!--                                        </a>-->
+<!--                                    </ul>-->
+<!--                                </div>-->
+<!--                            </div>-->
+<!--                        </div>-->
+<!--                    </div>-->
+                </t>
+            </t>
+
+            <div class="mt32">
+                <h4><strong>Message and communication history</strong></h4>
+                <t t-call="portal.message_thread">
+                    <t t-set="object" t-value="reservation"/>
+                    <t t-set="token" t-value="reservation.access_token"/>
+                    <t t-set="pid" t-value="pid"/>
+                    <t t-set="hash" t-value="hash"/>
+                </t>
+            </div>
+        </t>
+    </template>
+</odoo>

From 74ff63e0e4971760f889b14ca69a4a42c2b8d260 Mon Sep 17 00:00:00 2001
From: braisab <braisterbutalino@gmail.com>
Date: Tue, 9 Mar 2021 12:35:39 +0100
Subject: [PATCH 17/22] [WIP] Add more information in reservation portal

---
 pms/views/folio_portal_templates.xml       |   4 +-
 pms/views/reservation_portal_templates.xml | 127 ++++++++++++++++++---
 2 files changed, 111 insertions(+), 20 deletions(-)

diff --git a/pms/views/folio_portal_templates.xml b/pms/views/folio_portal_templates.xml
index 56f79be9e..5c5f754fc 100644
--- a/pms/views/folio_portal_templates.xml
+++ b/pms/views/folio_portal_templates.xml
@@ -178,9 +178,9 @@
                 class="row pb-2 pt-3 #{'card-header bg-white' if report_type == 'html' else ''}"
             >
                     <div class="col-xs-6">
-                        <t t-if="folio.partner_invoice_id != folio.partner_id">
+                        <t t-if="folio.partner_invoice_ids[0] != folio.partner_id">
                             <div
-                            t-field="folio.partner_invoice_id"
+                            t-field="folio.partner_invoice_ids"
                             t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'
                         />
                         </t>
diff --git a/pms/views/reservation_portal_templates.xml b/pms/views/reservation_portal_templates.xml
index a4da35de5..866ff0497 100644
--- a/pms/views/reservation_portal_templates.xml
+++ b/pms/views/reservation_portal_templates.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <template
         id="portal_my_home_menu_reservation"
@@ -90,11 +90,17 @@
                     <div class="row no-gutters">
                         <div class="col-12">
                             <h5 class="d-flex mb-1 mb-md-0 row">
-                                <span t-field="reservation.name" class="col-9 text-truncate"/>
-                                <small class="text-muted d-none d-md-inline"> (#<span t-field="reservation.id"/>)</small>
+                                <span
+                                    t-field="reservation.name"
+                                    class="col-9 text-truncate"
+                                />
                                 <div class="col-3 col-md-2 text-right">
                                     <small class="text-right">Status:</small>
-                                    <span t-field="reservation.state" class=" badge badge-pill badge-info" title="Current state of this reservation"/>
+                                    <span
+                                        t-field="reservation.state"
+                                        class=" badge badge-pill badge-info"
+                                        title="Current state of this reservation"
+                                    />
                                 </div>
                             </h5>
                         </div>
@@ -106,36 +112,121 @@
 <!--                    </div>-->
 
                     <div class="row mb-4">
-                        <div class="col-12 col-md-6" t-if="reservation.checkin">
-                            <strong>Checkin:</strong> <span t-field="reservation.checkin" t-options='{"widget": "date"}'/>
+                        <div class="col-12 col-md-6">
+                            <strong>Checkin:</strong> <span
+                                t-field="reservation.checkin"
+                                t-options='{"widget": "date"}'
+                            />
                         </div>
                         <div class="col-12 col-md-6 mb-1">
-                            <strong>Checkout:</strong> <span t-field="reservation.checkout" t-options='{"widget": "date"}'/>
+                            <strong>Checkout:</strong> <span
+                                t-field="reservation.checkout"
+                                t-options='{"widget": "date"}'
+                            />
+                        </div>
+                    </div>
+                     <div class="row mb-4">
+                        <div class="col-12 col-md-6">
+                            <strong>Arrival hour:</strong> <span
+                                t-field="reservation.arrival_hour"
+                            />
+                        </div>
+                        <div class="col-12 col-md-6 mb-1">
+                            <strong>Departure hour:</strong> <span
+                                t-field="reservation.departure_hour"
+                            />
                         </div>
                     </div>
 
+                    <div class="row mb-4">
+                        <div class="col-12 col-md-6">
+                            <strong>Room:</strong> <span
+                                t-field="reservation.preferred_room_id"
+                            />
+                        </div>
+                       <div class="col-12 col-md-6 mb-1">
+                            <strong>Reservation total:</strong> <span
+                                t-field="reservation.price_room_services_set"
+                            />
+                        </div>
+                    </div>
+                    <t t-if="reservation.service_ids">
+                        <table class="table">
+                            <thead style="display:table-row-group">
+                                <th name="th_services">
+                                    Services
+                                </th>
+                                <th name="th_qty">
+                                    Quantity
+                                </th>
+                                <th name="th_price">
+                                    Price
+                                </th>
+                            </thead>
+                            <tbody>
+                                <t t-foreach="reservation.service_ids" t-as="service">
+                                <t t-if="service.is_board_service">
+                                    <tr>
+                                        <td><span t-field="service.name" /></td>
+                                        <td><span t-field="service.product_qty" /></td>
+                                        <td><span t-field="service.price_unit" /></td>
+                                    </tr>
+                                </t>
+                            </t>
+                            </tbody>
+                        </table>
+                    </t>
                     <div class="row mb-4" t-if="reservation.partner_id">
                         <div class="col-12 col-md-6 pb-2" t-if="reservation.partner_id">
                             <strong>Assigned to</strong>
                             <div class="row">
                                 <div class="col flex-grow-0 pr-3">
-                                    <img t-if="reservation.partner_id.image_1024" class="rounded-circle mt-1 o_portal_contact_img" t-att-src="image_data_uri(reservation.partner_id.image_1024)" alt="Contact"/>
-                                    <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/src/img/user_menu_avatar.png" alt="Contact"/>
+                                    <img
+                                        t-if="reservation.partner_id.image_1024"
+                                        class="rounded-circle mt-1 o_portal_contact_img"
+                                        t-att-src="image_data_uri(reservation.partner_id.image_1024)"
+                                        alt="Contact"
+                                    />
+                                    <img
+                                        t-else=""
+                                        class="rounded-circle mt-1 o_portal_contact_img"
+                                        src="/web/static/src/img/user_menu_avatar.png"
+                                        alt="Contact"
+                                    />
                                 </div>
                                 <div class="col pl-md-0">
-                                    <div t-field="reservation.partner_id" t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'/>
+                                    <div
+                                        t-field="reservation.partner_id"
+                                        t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'
+                                    />
                                 </div>
                             </div>
                         </div>
-                        <div class="coll-12 col-md-6 pb-2" t-if="reservation.partner_id">
+                        <div
+                            class="coll-12 col-md-6 pb-2"
+                            t-if="reservation.partner_id"
+                        >
                             <strong>Reported by</strong>
                             <div class="row">
                                 <div class="col flex-grow-0 pr-3">
-                                    <img t-if="reservation.partner_id.image_1024" class="rounded-circle mt-1 o_portal_contact_img" t-att-src="image_data_uri(reservation.partner_id.image_1024)" alt="Contact"/>
-                                    <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/src/img/user_menu_avatar.png" alt="Contact"/>
+                                    <img
+                                        t-if="reservation.partner_id.image_1024"
+                                        class="rounded-circle mt-1 o_portal_contact_img"
+                                        t-att-src="image_data_uri(reservation.partner_id.image_1024)"
+                                        alt="Contact"
+                                    />
+                                    <img
+                                        t-else=""
+                                        class="rounded-circle mt-1 o_portal_contact_img"
+                                        src="/web/static/src/img/user_menu_avatar.png"
+                                        alt="Contact"
+                                    />
                                 </div>
                                 <div class="col pl-md-0">
-                                    <div t-field="reservation.partner_id" t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'/>
+                                    <div
+                                        t-field="reservation.partner_id"
+                                        t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'
+                                    />
                                 </div>
                             </div>
                         </div>
@@ -169,10 +260,10 @@
             <div class="mt32">
                 <h4><strong>Message and communication history</strong></h4>
                 <t t-call="portal.message_thread">
-                    <t t-set="object" t-value="reservation"/>
-                    <t t-set="token" t-value="reservation.access_token"/>
-                    <t t-set="pid" t-value="pid"/>
-                    <t t-set="hash" t-value="hash"/>
+                    <t t-set="object" t-value="reservation" />
+                    <t t-set="token" t-value="reservation.access_token" />
+                    <t t-set="pid" t-value="pid" />
+                    <t t-set="hash" t-value="hash" />
                 </t>
             </div>
         </t>

From 80232417a02f089c5acec787fafe0120a03c83c3 Mon Sep 17 00:00:00 2001
From: braisab <braisterbutalino@gmail.com>
Date: Tue, 9 Mar 2021 12:47:49 +0100
Subject: [PATCH 18/22] [WIP]pms: conflicts resolved

---
 pms/views/reservation_portal_templates.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pms/views/reservation_portal_templates.xml b/pms/views/reservation_portal_templates.xml
index bcd0c01cf..866ff0497 100644
--- a/pms/views/reservation_portal_templates.xml
+++ b/pms/views/reservation_portal_templates.xml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 <?xml version="1.0" encoding="utf-8" ?>
-=======
-<?xml version="1.0" encoding="utf-8"?>
->>>>>>> 9ae89adeafb12af5dbb27cdd270f5cf1fed9b2f1
 <odoo>
     <template
         id="portal_my_home_menu_reservation"

From b8120474dcb2f1712922788018675fb65d18746a Mon Sep 17 00:00:00 2001
From: braisab <braisterbutalino@gmail.com>
Date: Fri, 12 Mar 2021 13:31:18 +0100
Subject: [PATCH 19/22] [IMP] group reservations by folio in portal

---
 pms/controllers/pms_portal.py              | 24 +++----
 pms/views/reservation_portal_templates.xml | 81 +++++++---------------
 2 files changed, 36 insertions(+), 69 deletions(-)

diff --git a/pms/controllers/pms_portal.py b/pms/controllers/pms_portal.py
index 927320589..89b8b2c4b 100644
--- a/pms/controllers/pms_portal.py
+++ b/pms/controllers/pms_portal.py
@@ -158,14 +158,14 @@ class PortalReservation(CustomerPortal):
         domain = [
             ("partner_id", "child_of", partner.id),
         ]
-        searchbar_sortings = {
-            "date": {"label": _("Order Date"), "reservation": "date_order desc"},
-            "name": {"label": _("Reference"), "reservation": "name"},
-            "stage": {"label": _("Stage"), "reservation": "state"},
-        }
-        if not sortby:
-            sortby = "date"
-        sort_order = searchbar_sortings[sortby]["reservation"]
+        # searchbar_sortings = {
+        #     "date": {"label": _("Order Date"), "reservation": "date_order desc"},
+        #     "name": {"label": _("Reference"), "reservation": "name"},
+        #     "stage": {"label": _("Stage"), "reservation": "state"},
+        # }
+        # if not sortby:
+        #     sortby = "date"
+        # sort_order = searchbar_sortings[sortby]["reservation"]
 
         if date_begin and date_end:
             domain += [
@@ -175,13 +175,13 @@ class PortalReservation(CustomerPortal):
         reservation_count = Reservation.search_count(domain)
         pager = portal_pager(
             url="/my/reservations",
-            url_args={"date_begin": date_begin, "date_end": date_end, "sortby": sortby},
+            url_args={"date_begin": date_begin, "date_end": date_end},
             total=reservation_count,
             page=page,
             step=self._items_per_page,
         )
         reservations = Reservation.search(
-            domain, order=sort_order, limit=self._items_per_page, offset=pager["offset"]
+            domain, limit=self._items_per_page, offset=pager["offset"]
         )
         request.session["my_reservations_history"] = reservations.ids[:100]
         values.update(
@@ -191,8 +191,8 @@ class PortalReservation(CustomerPortal):
                 "page_name": "reservations",
                 "pager": pager,
                 "default_url": "/my/reservations",
-                "searchbar_sortings": searchbar_sortings,
-                "sortby": sortby,
+                # "searchbar_sortings": searchbar_sortings,
+                # "sortby": sortby,
             }
         )
         return request.render("pms.portal_my_reservation", values)
diff --git a/pms/views/reservation_portal_templates.xml b/pms/views/reservation_portal_templates.xml
index 866ff0497..ca3356c4c 100644
--- a/pms/views/reservation_portal_templates.xml
+++ b/pms/views/reservation_portal_templates.xml
@@ -56,6 +56,20 @@
             </thead>
             <tbody>
                 <t t-foreach="reservations" t-as="reservation">
+                    <t t-set="folio" t-value="reservation.folio_id"/>
+                    <!-- Sacar folio-->
+                    <t t-if="reservation == folio.reservation_ids[0]">
+                        <tr class="bg-light">
+                            <td colspan="4"><em class="font-weight-normal text-muted"><span/> Reservations for folio: </em>
+                            <a
+                                    t-att-href="folio.get_portal_url()"
+                                    t-att-title="folio.name"
+                                >
+                                <t t-esc="folio.name" />
+                            </a>
+                        </td>
+                        </tr>
+                    </t>
                     <tr>
                         <td>
                             <a
@@ -67,9 +81,9 @@
                         </td>
                         <td><span t-field="reservation.checkin" /></td>
                         <td><span t-field="reservation.checkout" /></td>
-<!--                        <td class="text-right"><span-->
-<!--                                    t-field="reservation.price_room_services_set"-->
-<!--                                /></td>-->
+                        <td class="text-right"><span
+                                    t-field="reservation.price_room_services_set"
+                                /></td>
                     </tr>
                 </t>
             </tbody>
@@ -166,8 +180,11 @@
                             <tbody>
                                 <t t-foreach="reservation.service_ids" t-as="service">
                                 <t t-if="service.is_board_service">
+                                    <t t-set="board_service"
+                                     t-value="reservation.board_service_room_id.pms_board_service_id"
+                                    />
                                     <tr>
-                                        <td><span t-field="service.name" /></td>
+                                        <td><span t-esc="board_service.name" /></td>
                                         <td><span t-field="service.product_qty" /></td>
                                         <td><span t-field="service.price_unit" /></td>
                                     </tr>
@@ -176,8 +193,9 @@
                             </tbody>
                         </table>
                     </t>
-                    <div class="row mb-4" t-if="reservation.partner_id">
-                        <div class="col-12 col-md-6 pb-2" t-if="reservation.partner_id">
+
+                    <div class="row mb-4" t-if="reservation.partner_id.is_agency">
+                        <div class="col-12 col-md-6 pb-2" t-if="reservation.partner_id.is_agency">
                             <strong>Assigned to</strong>
                             <div class="row">
                                 <div class="col flex-grow-0 pr-3">
@@ -202,58 +220,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div
-                            class="coll-12 col-md-6 pb-2"
-                            t-if="reservation.partner_id"
-                        >
-                            <strong>Reported by</strong>
-                            <div class="row">
-                                <div class="col flex-grow-0 pr-3">
-                                    <img
-                                        t-if="reservation.partner_id.image_1024"
-                                        class="rounded-circle mt-1 o_portal_contact_img"
-                                        t-att-src="image_data_uri(reservation.partner_id.image_1024)"
-                                        alt="Contact"
-                                    />
-                                    <img
-                                        t-else=""
-                                        class="rounded-circle mt-1 o_portal_contact_img"
-                                        src="/web/static/src/img/user_menu_avatar.png"
-                                        alt="Contact"
-                                    />
-                                </div>
-                                <div class="col pl-md-0">
-                                    <div
-                                        t-field="reservation.partner_id"
-                                        t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'
-                                    />
-                                </div>
-                            </div>
-                        </div>
                     </div>
-<!--                    <div class="row" t-if="reservation.description">-->
-<!--                        <div t-if="reservation.description" t-attf-class="col-12 col-lg-7 mb-4 mb-md-0 ">-->
-<!--                            <hr class="mb-1"/>-->
-<!--                            <div class="d-flex my-2">-->
-<!--                                <strong>Description</strong>-->
-<!--                            </div>-->
-<!--                            <div class="py-1 px-2 bg-100 small" t-field="reservation.description"/>-->
-<!--                        </div>-->
-<!--                        <div t-if="reservation.attachment_ids" t-attf-class="col-12 col-lg-5 o_project_portal_attachments {{'col-lg-5' if reservation.description else 'col-lg-12'}}">-->
-<!--                            <hr class="mb-1 d-none d-lg-block"/>-->
-<!--                            <strong class="d-block mb-2">Attachments</strong>-->
-<!--                            <div class="row">-->
-<!--                                <div t-attf-class="col {{'col-lg-6' if not reservation.description else 'col-lg-12'}}">-->
-<!--                                    <ul class="list-group">-->
-<!--                                        <a class="list-group-item list-group-item-action d-flex align-items-center oe_attachments py-1 px-2" t-foreach='reservation.attachment_ids' t-as='attachment' t-attf-href="/web/content/#{attachment.id}?download=true&amp;access_token=#{attachment.access_token}" target="_blank" data-no-post-process="">-->
-<!--                                            <div class='oe_attachment_embedded o_image o_image_small mr-2 mr-lg-3' t-att-title="attachment.name" t-att-data-mimetype="attachment.mimetype" t-attf-data-src="/web/image/#{attachment.id}/50x40?access_token=#{attachment.access_token}"/>-->
-<!--                                            <div class='oe_attachment_name text-truncate'><t t-esc='attachment.name'/></div>-->
-<!--                                        </a>-->
-<!--                                    </ul>-->
-<!--                                </div>-->
-<!--                            </div>-->
-<!--                        </div>-->
-<!--                    </div>-->
                 </t>
             </t>
 

From cd03ff60bac524f835811f95b6d08c9c5eaa2d69 Mon Sep 17 00:00:00 2001
From: braisab <braisterbutalino@gmail.com>
Date: Tue, 16 Mar 2021 18:23:02 +0100
Subject: [PATCH 20/22] [WIP]portal reservation with board service name

---
 pms/views/reservation_portal_templates.xml | 69 +++++++++++++++-------
 1 file changed, 49 insertions(+), 20 deletions(-)

diff --git a/pms/views/reservation_portal_templates.xml b/pms/views/reservation_portal_templates.xml
index ca3356c4c..d5fcdcf3e 100644
--- a/pms/views/reservation_portal_templates.xml
+++ b/pms/views/reservation_portal_templates.xml
@@ -56,15 +56,17 @@
             </thead>
             <tbody>
                 <t t-foreach="reservations" t-as="reservation">
-                    <t t-set="folio" t-value="reservation.folio_id"/>
+                    <t t-set="folio" t-value="reservation.folio_id" />
                     <!-- Sacar folio-->
                     <t t-if="reservation == folio.reservation_ids[0]">
                         <tr class="bg-light">
-                            <td colspan="4"><em class="font-weight-normal text-muted"><span/> Reservations for folio: </em>
+                            <td colspan="4"><em
+                                        class="font-weight-normal text-muted"
+                                    ><span /> Reservations by folio: </em>
                             <a
-                                    t-att-href="folio.get_portal_url()"
-                                    t-att-title="folio.name"
-                                >
+                                        t-att-href="folio.get_portal_url()"
+                                        t-att-title="folio.name"
+                                    >
                                 <t t-esc="folio.name" />
                             </a>
                         </td>
@@ -93,12 +95,6 @@
 
     <template id="portal_my_reservation_detail" name="My Reservation">
         <t t-call="portal.portal_layout">
-<!--            <t t-set="o_portal_fullwidth_alert" groups="project.group_project_user">-->
-<!--                <t t-call="portal.portal_back_in_edit_mode">-->
-<!--                    <t t-set="backend_url" t-value="'/web#model=project.task&amp;id=%s&amp;view_type=form' % (task.id)"/>-->
-<!--                </t>-->
-<!--            </t>-->
-
             <t t-call="portal.portal_record_layout">
                 <t t-set="card_header">
                     <div class="row no-gutters">
@@ -121,10 +117,6 @@
                     </div>
                 </t>
                 <t t-set="card_body">
-<!--                    <div class="mb-1" t-if="user in reservation.sudo().allowed_user_ids">-->
-<!--                        <strong>Project:</strong> <a t-attf-href="/my/project/#{reservation.project_id.id}" t-field="reservation.name"/>-->
-<!--                    </div>-->
-
                     <div class="row mb-4">
                         <div class="col-12 col-md-6">
                             <strong>Checkin:</strong> <span
@@ -164,6 +156,20 @@
                             />
                         </div>
                     </div>
+
+                    <div class="row mb-4">
+                        <div class="col-12 col-md-6">
+                            <strong>Room price per night:</strong> <span
+                                t-field="reservation.preferred_room_id.room_type_id.list_price"
+                                t-options='{"widget": "monetary", "display_currency": reservation.pricelist_id.currency_id}'
+                            />
+                        </div>
+                       <div class="col-12 col-md-6 mb-1">
+                            <strong>Room price total:</strong> <span
+                                t-field="reservation.price_total"
+                            />
+                        </div>
+                    </div>
                     <t t-if="reservation.service_ids">
                         <table class="table">
                             <thead style="display:table-row-group">
@@ -178,13 +184,33 @@
                                 </th>
                             </thead>
                             <tbody>
+                                <t t-set="board_service_count" t-value="0" />
                                 <t t-foreach="reservation.service_ids" t-as="service">
+
                                 <t t-if="service.is_board_service">
-                                    <t t-set="board_service"
-                                     t-value="reservation.board_service_room_id.pms_board_service_id"
-                                    />
+                                    <t t-if="board_service_count==0">
+                                        <t
+                                                t-set="board_service_count"
+                                                t-value="board_service_count+1"
+                                            />
+                                        <t
+                                                t-set="board_service"
+                                                t-value="reservation.board_service_room_id.pms_board_service_id"
+                                            />
+                                        <tr>
+                                            <td><span t-esc="board_service.name" /></td>
+                                            <td><span
+                                                        t-field="service.product_qty"
+                                                    /></td>
+                                            <td><span
+                                                        t-field="board_service.amount"
+                                                    /></td>
+                                        </tr>
+                                    </t>
+                                </t>
+                                <t t-else="">
                                     <tr>
-                                        <td><span t-esc="board_service.name" /></td>
+                                        <td><span t-esc="service.name" /></td>
                                         <td><span t-field="service.product_qty" /></td>
                                         <td><span t-field="service.price_unit" /></td>
                                     </tr>
@@ -195,7 +221,10 @@
                     </t>
 
                     <div class="row mb-4" t-if="reservation.partner_id.is_agency">
-                        <div class="col-12 col-md-6 pb-2" t-if="reservation.partner_id.is_agency">
+                        <div
+                            class="col-12 col-md-6 pb-2"
+                            t-if="reservation.partner_id.is_agency"
+                        >
                             <strong>Assigned to</strong>
                             <div class="row">
                                 <div class="col flex-grow-0 pr-3">

From 2727d9fb223d30c71285d0d93b7b27d09a3f2faf Mon Sep 17 00:00:00 2001
From: Sara Lago <saralago126@gmail.com>
Date: Thu, 18 Mar 2021 13:31:27 +0100
Subject: [PATCH 21/22] [IMP] Change portal view, separate room and services
 price

---
 pms/views/reservation_portal_templates.xml | 82 +++++++++++++---------
 1 file changed, 50 insertions(+), 32 deletions(-)

diff --git a/pms/views/reservation_portal_templates.xml b/pms/views/reservation_portal_templates.xml
index d5fcdcf3e..8a1a38233 100644
--- a/pms/views/reservation_portal_templates.xml
+++ b/pms/views/reservation_portal_templates.xml
@@ -151,26 +151,47 @@
                             />
                         </div>
                        <div class="col-12 col-md-6 mb-1">
-                            <strong>Reservation total:</strong> <span
-                                t-field="reservation.price_room_services_set"
-                            />
+                           <t t-if="reservation.board_service_room_id">
+                               <strong>Board Service:</strong> <span
+                                    t-field="reservation.board_service_room_id.pms_board_service_id.name"
+                                />
+                           </t>
                         </div>
                     </div>
-
+                    <t t-set="service_price" t-value="0" />
+                    <t t-set="board_service_price" t-value="0" />
+                    <t t-foreach="reservation.service_ids" t-as="service">
+                        <t t-if="service.is_board_service">
+                            <t
+                                t-set="board_service_price"
+                                t-value="board_service_price + service.price_total"
+                            />
+                        </t>
+                        <t t-else="">
+                            <t
+                                t-set="service_price"
+                                t-value="service_price + service.price_total"
+                            />
+                        </t>
+                    </t>
                     <div class="row mb-4">
                         <div class="col-12 col-md-6">
-                            <strong>Room price per night:</strong> <span
-                                t-field="reservation.preferred_room_id.room_type_id.list_price"
+                            <strong>Room price:</strong> <span
+                                t-esc="reservation.price_total + board_service_price"
                                 t-options='{"widget": "monetary", "display_currency": reservation.pricelist_id.currency_id}'
                             />
                         </div>
                        <div class="col-12 col-md-6 mb-1">
-                            <strong>Room price total:</strong> <span
-                                t-field="reservation.price_total"
-                            />
+                           <t t-if="service_price!=0">
+                                <strong>Service total:</strong> <span
+                                    t-esc="service_price"
+                                    t-options='{"widget": "monetary", "display_currency": reservation.pricelist_id.currency_id}'
+                                />
+                           </t>
                         </div>
                     </div>
                     <t t-if="reservation.service_ids">
+                        <t t-if="service_price!=0">
                         <table class="table">
                             <thead style="display:table-row-group">
                                 <th name="th_services">
@@ -180,44 +201,41 @@
                                     Quantity
                                 </th>
                                 <th name="th_price">
-                                    Price
+                                    Price Unit
+                                </th>
+                                <th name="th_price_total">
+                                    Price Total
                                 </th>
                             </thead>
                             <tbody>
-                                <t t-set="board_service_count" t-value="0" />
                                 <t t-foreach="reservation.service_ids" t-as="service">
-
-                                <t t-if="service.is_board_service">
-                                    <t t-if="board_service_count==0">
-                                        <t
-                                                t-set="board_service_count"
-                                                t-value="board_service_count+1"
-                                            />
-                                        <t
-                                                t-set="board_service"
-                                                t-value="reservation.board_service_room_id.pms_board_service_id"
-                                            />
+                                    <t t-if="not service.is_board_service">
                                         <tr>
-                                            <td><span t-esc="board_service.name" /></td>
+                                            <td><span t-esc="service.name" /></td>
                                             <td><span
                                                         t-field="service.product_qty"
                                                     /></td>
                                             <td><span
-                                                        t-field="board_service.amount"
+                                                        t-field="service.price_unit"
+                                                        t-options='{"widget": "monetary", "display_currency": reservation.pricelist_id.currency_id}'
+                                                    /></td>
+                                            <td><span
+                                                        t-field="service.price_total"
+                                                        t-options='{"widget": "monetary", "display_currency": reservation.pricelist_id.currency_id}'
                                                     /></td>
                                         </tr>
                                     </t>
                                 </t>
-                                <t t-else="">
-                                    <tr>
-                                        <td><span t-esc="service.name" /></td>
-                                        <td><span t-field="service.product_qty" /></td>
-                                        <td><span t-field="service.price_unit" /></td>
-                                    </tr>
-                                </t>
-                            </t>
                             </tbody>
                         </table>
+                        </t>
+                        <div class="row mb-4 justify-content-start">
+                            <div class="h3 text-info">
+                               <strong>Reservation total:</strong> <span
+                                    t-field="reservation.price_room_services_set"
+                                />
+                            </div>
+                        </div>
                     </t>
 
                     <div class="row mb-4" t-if="reservation.partner_id.is_agency">

From f68f8a4cc4782824065b8ae6ea52517855ff3769 Mon Sep 17 00:00:00 2001
From: Sara Lago <saralago126@gmail.com>
Date: Thu, 18 Mar 2021 13:31:54 +0100
Subject: [PATCH 22/22] [IMP] Pms: Add Customer Preview Button in reservation
 and folio

---
 pms/models/pms_folio.py             |  8 ++++++++
 pms/models/pms_reservation.py       |  8 ++++++++
 pms/views/pms_folio_views.xml       | 11 +++++++++++
 pms/views/pms_reservation_views.xml | 11 +++++++++++
 4 files changed, 38 insertions(+)

diff --git a/pms/models/pms_folio.py b/pms/models/pms_folio.py
index 90d98f7e1..223df06ef 100644
--- a/pms/models/pms_folio.py
+++ b/pms/models/pms_folio.py
@@ -547,6 +547,14 @@ class PmsFolio(models.Model):
         for folio in self:
             folio.access_url = "/my/folios/%s" % (folio.id)
 
+    def preview_folio(self):
+        self.ensure_one()
+        return {
+            "type": "ir.actions.act_url",
+            "target": "self",
+            "url": self.get_portal_url(),
+        }
+
     def _search_invoice_ids(self, operator, value):
         if operator == "in" and value:
             self.env.cr.execute(
diff --git a/pms/models/pms_reservation.py b/pms/models/pms_reservation.py
index 48fd3593f..5736bd33d 100644
--- a/pms/models/pms_reservation.py
+++ b/pms/models/pms_reservation.py
@@ -845,6 +845,14 @@ class PmsReservation(models.Model):
         for reservation in self:
             reservation.access_url = "/my/reservations/%s" % (reservation.id)
 
+    def preview_reservation(self):
+        self.ensure_one()
+        return {
+            "type": "ir.actions.act_url",
+            "target": "self",
+            "url": self.get_portal_url(),
+        }
+
     def _search_left_for_checkin(self, operator, value):
         if operator not in ("=",):
             raise UserError(
diff --git a/pms/views/pms_folio_views.xml b/pms/views/pms_folio_views.xml
index f6e12ad30..f411b2c83 100644
--- a/pms/views/pms_folio_views.xml
+++ b/pms/views/pms_folio_views.xml
@@ -41,6 +41,17 @@
                 </header>
                 <sheet>
                     <div class="oe_button_box" name="button_box">
+                        <button
+                            name="preview_folio"
+                            type="object"
+                            class="oe_stat_button"
+                            icon="fa-globe icon"
+                        >
+                            <div class="o_field_widget o_stat_info">
+                                <span class="o_stat_text">Customer</span>
+                                <span class="o_stat_text">Preview</span>
+                            </div>
+                        </button>
                         <button
                             type="object"
                             class="oe_stat_button"
diff --git a/pms/views/pms_reservation_views.xml b/pms/views/pms_reservation_views.xml
index b11ca981b..a7a74ab0d 100644
--- a/pms/views/pms_reservation_views.xml
+++ b/pms/views/pms_reservation_views.xml
@@ -88,6 +88,17 @@
                         name="button_box"
                         attrs="{'invisible': [('folio_id','=',False)]}"
                     >
+                        <button
+                            name="preview_reservation"
+                            type="object"
+                            class="oe_stat_button"
+                            icon="fa-globe icon"
+                        >
+                            <div class="o_field_widget o_stat_info">
+                                <span class="o_stat_text">Customer</span>
+                                <span class="o_stat_text">Preview</span>
+                            </div>
+                        </button>
                         <button
                             type="object"
                             class="oe_stat_button"