audrius/pms
1
0
Fork 1
mirror of https://github.com/OCA/pms.git synced 2025-01-29 00:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #61 into 14.0

Browse Source 
Signed-off-by DarioLodeiros
This commit is contained in:
OCA-git-bot
2021-09-16 21:15:57 +00:00
parent 16e92ab3f5 f405c579cd
commit 38b1e5d572
9 changed files with 1407 additions and 2639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3866
pms/i18n/es.po
View File

File diff suppressed because it is too large Load Diff

2
pms/models/pms_checkin_partner.py
View File

@@ -538,7 +538,7 @@ class PmsCheckinPartner(models.Model):
or not record.document_type.validation_code or not record.document_type.validation_code
): ):
return return
eval_context = self._validation_eval_context(id_number) eval_context = record._validation_eval_context(id_number)
try: try:
safe_eval( safe_eval(
record.document_type.validation_code, record.document_type.validation_code,

18
pms/models/res_partner.py
View File

@@ -140,7 +140,7 @@ class ResPartner(models.Model):
@api.depends("pms_checkin_partner_ids", "pms_checkin_partner_ids.gender") @api.depends("pms_checkin_partner_ids", "pms_checkin_partner_ids.gender")
def _compute_gender(self): def _compute_gender(self):
if hasattr(super(), "_compute_gender"): if hasattr(super(), "_compute_gender"):
super()._compute_field() super()._compute_gender()
for record in self: for record in self:
if not record.gender and record.pms_checkin_partner_ids: if not record.gender and record.pms_checkin_partner_ids:
gender = list( gender = list(
@@ -156,7 +156,7 @@ class ResPartner(models.Model):
@api.depends("pms_checkin_partner_ids", "pms_checkin_partner_ids.birthdate_date") @api.depends("pms_checkin_partner_ids", "pms_checkin_partner_ids.birthdate_date")
def _compute_birthdate_date(self): def _compute_birthdate_date(self):
if hasattr(super(), "_compute_birthdate_date"): if hasattr(super(), "_compute_birthdate_date"):
super()._compute_field() super()._compute_birthdate_date()
for record in self: for record in self:
if not record.birthdate_date and record.pms_checkin_partner_ids: if not record.birthdate_date and record.pms_checkin_partner_ids:
birthdate = list( birthdate = list(
@@ -175,7 +175,7 @@ class ResPartner(models.Model):
@api.depends("pms_checkin_partner_ids", "pms_checkin_partner_ids.nationality_id") @api.depends("pms_checkin_partner_ids", "pms_checkin_partner_ids.nationality_id")
def _compute_nationality_id(self): def _compute_nationality_id(self):
if hasattr(super(), "_compute_nationality_id"): if hasattr(super(), "_compute_nationality_id"):
super()._compute_field() super()._compute_nationality_id()
for record in self: for record in self:
if not record.nationality_id and record.pms_checkin_partner_ids: if not record.nationality_id and record.pms_checkin_partner_ids:
nationality_id = list( nationality_id = list(
@@ -194,7 +194,7 @@ class ResPartner(models.Model):
@api.depends("pms_checkin_partner_ids", "pms_checkin_partner_ids.state_id") @api.depends("pms_checkin_partner_ids", "pms_checkin_partner_ids.state_id")
def _compute_state_id(self): def _compute_state_id(self):
if hasattr(super(), "_compute_state_id"): if hasattr(super(), "_compute_state_id"):
super()._compute_field() super()._compute_state_id()
for record in self: for record in self:
if not record.state_id and record.pms_checkin_partner_ids: if not record.state_id and record.pms_checkin_partner_ids:
state_id = list( state_id = list(
@@ -220,7 +220,7 @@ class ResPartner(models.Model):
) )
def _compute_email(self): def _compute_email(self):
if hasattr(super(), "_compute_email"): if hasattr(super(), "_compute_email"):
super()._compute_field() super()._compute_email()
for record in self: for record in self:
if not record.email and ( if not record.email and (
record.pms_checkin_partner_ids record.pms_checkin_partner_ids
@@ -254,7 +254,7 @@ class ResPartner(models.Model):
) )
def _compute_mobile(self): def _compute_mobile(self):
if hasattr(super(), "_compute_mobile"): if hasattr(super(), "_compute_mobile"):
super()._compute_field() super()._compute_mobile()
for record in self: for record in self:
if not record.mobile and ( if not record.mobile and (
record.pms_checkin_partner_ids record.pms_checkin_partner_ids
@@ -281,7 +281,7 @@ class ResPartner(models.Model):
@api.depends("pms_checkin_partner_ids", "pms_checkin_partner_ids.firstname") @api.depends("pms_checkin_partner_ids", "pms_checkin_partner_ids.firstname")
def _compute_firstname(self): def _compute_firstname(self):
if hasattr(super(), "_compute_firstname"): if hasattr(super(), "_compute_firstname"):
super()._compute_field() super()._compute_firstname()
for record in self: for record in self:
if not record.firstname and record.pms_checkin_partner_ids: if not record.firstname and record.pms_checkin_partner_ids:
firstname = list( firstname = list(
@@ -299,7 +299,7 @@ class ResPartner(models.Model):
@api.depends("pms_checkin_partner_ids", "pms_checkin_partner_ids.lastname") @api.depends("pms_checkin_partner_ids", "pms_checkin_partner_ids.lastname")
def _compute_lastname(self): def _compute_lastname(self):
if hasattr(super(), "_compute_lastname"): if hasattr(super(), "_compute_lastname"):
super()._compute_field() super()._compute_lastname()
for record in self: for record in self:
if not record.lastname and record.pms_checkin_partner_ids: if not record.lastname and record.pms_checkin_partner_ids:
lastname = list( lastname = list(
@@ -315,7 +315,7 @@ class ResPartner(models.Model):
@api.depends("pms_checkin_partner_ids", "pms_checkin_partner_ids.lastname2") @api.depends("pms_checkin_partner_ids", "pms_checkin_partner_ids.lastname2")
def _compute_lastname2(self): def _compute_lastname2(self):
if hasattr(super(), "_compute_lastname2"): if hasattr(super(), "_compute_lastname2"):
super()._compute_field() super()._compute_lastname2()
for record in self: for record in self:
if not record.lastname2 and record.pms_checkin_partner_ids: if not record.lastname2 and record.pms_checkin_partner_ids:
lastname2 = list( lastname2 = list(

2
pms/models/res_partner_id_number.py
View File

@@ -25,7 +25,7 @@ class ResPartnerIdNumber(models.Model):
) )
def _compute_valid_from(self): def _compute_valid_from(self):
if hasattr(super(), "_compute_valid_from"): if hasattr(super(), "_compute_valid_from"):
super()._compute_field() super()._compute_valid_from()
for record in self: for record in self:
if not record.valid_from and record.partner_id.pms_checkin_partner_ids: if not record.valid_from and record.partner_id.pms_checkin_partner_ids:
document_expedition_date = list( document_expedition_date = list(

1
pms/views/pms_checkin_partner_views.xml
View File

@@ -458,6 +458,7 @@
enable_counters="1" enable_counters="1"
select="multi" select="multi"
/> />
<field name="pms_property_id" enable_counters="1" select="multi" />
</searchpanel> </searchpanel>
</search> </search>
</field> </field>

20
pms/views/pms_folio_views.xml
View File

@@ -298,7 +298,6 @@
name="channel_type_id" name="channel_type_id"
attrs="{'readonly':[('agency_id','!=', False)], 'invisible':[('reservation_type', 'not in', 'normal')]}" attrs="{'readonly':[('agency_id','!=', False)], 'invisible':[('reservation_type', 'not in', 'normal')]}"
/> />
<field name="internal_comment" />
</group> </group>
<group <group
class="oe_subtotal_footer oe_right" class="oe_subtotal_footer oe_right"
@@ -571,6 +570,8 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree <tree
string="Folio" string="Folio"
multi_edit="1"
sample="1"
create="false" create="false"
class="o_sale_order" class="o_sale_order"
decoration-info="state == 'draft'" decoration-info="state == 'draft'"
@@ -582,7 +583,7 @@
decoration-info="reservation_type == 'staff'" decoration-info="reservation_type == 'staff'"
decoration-bf="reservation_type == 'out'" decoration-bf="reservation_type == 'out'"
/> />
<field name="partner_id" invisible="1" /> <field name="partner_id" />
<field name="partner_name" select="1" /> <field name="partner_name" select="1" />
<field name="date_order" select="1" /> <field name="date_order" select="1" />
<field name="user_id" widget="many2one_avatar_user" optional="show" /> <field name="user_id" widget="many2one_avatar_user" optional="show" />
@@ -720,6 +721,19 @@
</search> </search>
</field> </field>
</record> </record>
<record id="pms_folio_pivot" model="ir.ui.view">
<field name="name">pms.folio.pivot</field>
<field name="model">pms.folio</field>
<field name="arch" type="xml">
<pivot string="Folios">
<field name="pricelist_id" type="row" />
<field name="pms_property_id" type="col" />
<field name="amount_total" type="measure" />
</pivot>
</field>
</record>
<record id="pms_folio_view_graph" model="ir.ui.view"> <record id="pms_folio_view_graph" model="ir.ui.view">
<field name="name">view.pms.folio.graph</field> <field name="name">view.pms.folio.graph</field>
<field name="model">pms.folio</field> <field name="model">pms.folio</field>
@@ -750,7 +764,7 @@
<record model="ir.actions.act_window" id="open_pms_folio1_form_tree_all"> <record model="ir.actions.act_window" id="open_pms_folio1_form_tree_all">
<field name="name">Folio</field> <field name="name">Folio</field>
<field name="res_model">pms.folio</field> <field name="res_model">pms.folio</field>
<field name="view_mode">tree,form,graph</field> <field name="view_mode">tree,form,graph,pivot</field>
</record> </record>
<menuitem <menuitem
name="Folios" name="Folios"

91
pms/views/pms_reservation_views.xml
View File

@@ -3,7 +3,7 @@
<record model="ir.actions.act_window" id="open_pms_reservation_form_tree_all"> <record model="ir.actions.act_window" id="open_pms_reservation_form_tree_all">
<field name="name">Reservation</field> <field name="name">Reservation</field>
<field name="res_model">pms.reservation</field> <field name="res_model">pms.reservation</field>
<field name="view_mode">tree,form,calendar,graph,pivot</field> <field name="view_mode">tree,form,graph,pivot</field>
</record> </record>
<record model="ir.ui.view" id="pms_reservation_view_form"> <record model="ir.ui.view" id="pms_reservation_view_form">
<field name="name">pms.reservation.form</field> <field name="name">pms.reservation.form</field>
@@ -181,23 +181,6 @@
<span class="o_stat_text">Preview</span> <span class="o_stat_text">Preview</span>
</div> </div>
</button> </button>
<button
type="object"
class="oe_stat_button"
icon="fa-file"
name="open_folio"
>
<div class="o_field_widget o_stat_info">
<span class="o_stat_text">
<field
name="folio_id"
readonly="1"
nolabel="1"
force_save="1"
/>
</span>
</div>
</button>
<button <button
type="object" type="object"
class="oe_stat_button" class="oe_stat_button"
@@ -226,11 +209,16 @@
('ready_for_checkin', '!=', True), ('ready_for_checkin', '!=', True),
]}" ]}"
> >
<field <div class="o_field_widget o_stat_info">
name="checkins_ratio" <span class="o_stat_value">
string="On Board" <field
widget="percentpie" name="checkins_ratio"
/> string="On Board"
widget="percentpie"
/>
</span>
<span class="o_stat_text">Datos Checkin</span>
</div>
</button> </button>
<button <button
type="object" type="object"
@@ -246,6 +234,23 @@
widget="percentpie" widget="percentpie"
/> />
</button> </button>
<button
type="object"
class="oe_stat_button"
icon="fa-file"
name="open_folio"
>
<div class="o_field_widget o_stat_info">
<span class="o_stat_text">
<field
name="folio_id"
readonly="1"
nolabel="1"
force_save="1"
/>
</span>
</div>
</button>
</div> </div>
<widget <widget
name="web_ribbon" name="web_ribbon"
@@ -287,9 +292,22 @@
<i class="fa fa-warning" /> OverBooking <i class="fa fa-warning" /> OverBooking
</div> </div>
</div> </div>
<h1> <h3 class="oe_right">
<field nolabel="1" name="name" /> <field nolabel="1" name="name" class="oe_inline" />
</h1> <i
class="fa fa-long-arrow-right mx-2"
aria-label="Arrow icon"
title="Arrow"
/>
<field
name="pms_property_id"
options="{'no_create': True,'no_open': True}"
attrs="{'readonly':[('name', '!=', False)]}"
nolabel="1"
class="oe_inline"
/>
</h3>
<h3> <h3>
<field <field
name="checkin" name="checkin"
@@ -342,7 +360,7 @@
string="General Info" string="General Info"
name="contact_details" name="contact_details"
> >
<field name="partner_id" invisible="1" /> <field name="partner_id" />
<field <field
name="document_type" name="document_type"
attrs="{'invisible':[('reservation_type','in',('out'))]}" attrs="{'invisible':[('reservation_type','in',('out'))]}"
@@ -670,7 +688,6 @@
<div class="col-6"> <div class="col-6">
<group> <group>
<field name="user_id" /> <field name="user_id" />
<field name="pms_property_id" />
<field name="overbooking" /> <field name="overbooking" />
</group> </group>
<group> <group>
@@ -700,7 +717,7 @@
</record> </record>
<!-- Calendar --> <!-- Calendar -->
<record id="pms_reservation_view_calendar" model="ir.ui.view"> <!-- <record id="pms_reservation_view_calendar" model="ir.ui.view">
<field name="name">pms.reservation.view.calendar</field> <field name="name">pms.reservation.view.calendar</field>
<field name="model">pms.reservation</field> <field name="model">pms.reservation</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
@@ -719,7 +736,7 @@
<field name="rooms" /> <field name="rooms" />
</calendar> </calendar>
</field> </field>
</record> </record> -->
<record model="ir.ui.view" id="pms_reservation_view_tree"> <record model="ir.ui.view" id="pms_reservation_view_tree">
<field name="name">pms.reservation.tree</field> <field name="name">pms.reservation.tree</field>
<field name="model">pms.reservation</field> <field name="model">pms.reservation</field>
@@ -730,7 +747,6 @@
sample="1" sample="1"
class="o_sale_order" class="o_sale_order"
decoration-warning="splitted" decoration-warning="splitted"
decoration-bf="splitted"
js_class="pms_booking_engine_request_tree" js_class="pms_booking_engine_request_tree"
> >
<field name="reservation_type" invisible="1" /> <field name="reservation_type" invisible="1" />
@@ -760,6 +776,8 @@
<field name="to_assign" invisible="1" /> <field name="to_assign" invisible="1" />
<field name="checkin_partner_pending_count" invisible="1" /> <field name="checkin_partner_pending_count" invisible="1" />
<field name="tax_ids" invisible="1" /> <field name="tax_ids" invisible="1" />
<field name="agency_id" optional="show" />
<field name="channel_type_id" optional="show" />
<field name="price_subtotal" invisible="1" /> <field name="price_subtotal" invisible="1" />
<field name="price_total" /> <field name="price_total" />
<field name="folio_pending_amount" string="Folio Pending Amount" /> <field name="folio_pending_amount" string="Folio Pending Amount" />
@@ -851,10 +869,15 @@
<field name="model">pms.reservation</field> <field name="model">pms.reservation</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Reservation Detail"> <search string="Reservation Detail">
<field name="name" /> <field
name="name"
string="Customer"
filter_domain="['|', '|', '|', ('partner_name', 'ilike', self), ('document_number', 'ilike', self), ('partner_id.vat', 'ilike', self), ('mobile', 'ilike', self)]"
/>
<field name="partner_id" /> <field name="partner_id" />
<field name="folio_id" /> <field name="folio_id" />
<field name="agency_id" /> <field name="agency_id" />
<field name="pms_property_id" />
<filter <filter
string="My Reservations" string="My Reservations"
name="my_reservations" name="my_reservations"
@@ -930,7 +953,7 @@
/>--> />-->
<separator /> <separator />
<filter <filter
string="Still to be paid" string="To be paid"
name="still_to_be_paid" name="still_to_be_paid"
domain="[('folio_id.pending_amount','&gt;',0)]" domain="[('folio_id.pending_amount','&gt;',0)]"
/> />
@@ -953,7 +976,7 @@
<filter <filter
string="Out of Service" string="Out of Service"
name="out_of_service" name="out_of_service"
domain="[('reservation_type','in',['dontsell'])]" domain="[('reservation_type','in',['out'])]"
/> />
<group expand="0" string="Group By"> <group expand="0" string="Group By">
<!-- <filter string="Room Type" domain="[]" <!-- <filter string="Room Type" domain="[]"

34
pms/views/pms_room_views.xml
View File

@@ -142,15 +142,33 @@
<field name="name">pms.room.search</field> <field name="name">pms.room.search</field>
<field name="model">pms.room</field> <field name="model">pms.room</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Property Room"> <search string="Room">
<field name="name" /> <field name="name" />
<field name="room_type_id" /> <field name="room_type_id" />
<field name="capacity" /> <field name="capacity" />
<field name="room_amenity_ids" />
<newline /> <newline />
<!--<filter name="available" string="Available" <searchpanel>
domain="[('status','=', 'available')]" help="Available Rooms" />--> <field
<!--<filter string="Reserved" domain="[('status','=', 'occupied')]" name="pms_property_id"
help="Reserved Rooms" />--> string="Property"
enable_counters="1"
select="multi"
/>
<field
name="room_type_id"
string="Room Type"
enable_counters="1"
icon="fa-hotel"
color="#784f73"
/>
<field
name="ubication_id"
string="Ubication"
enable_counters="1"
color="#875A7B"
/>
</searchpanel>
</search> </search>
</field> </field>
</record> </record>
@@ -158,12 +176,16 @@
<field name="name">pms.room.tree</field> <field name="name">pms.room.tree</field>
<field name="model">pms.room</field> <field name="model">pms.room</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Property Room"> <tree string="Property Room" editable="bottom" multi_edit="1" sample="1">
<field name="sequence" widget="handle" /> <field name="sequence" widget="handle" />
<field name="pms_property_id" /> <field name="pms_property_id" />
<field name="name" /> <field name="name" />
<field name="room_type_id" /> <field name="room_type_id" />
<field name="ubication_id" />
<field name="capacity" /> <field name="capacity" />
<field name="extra_beds_allowed" />
<field name="room_amenity_ids" widget="many2many_tags" />
</tree> </tree>
</field> </field>
</record> </record>

12
pms/wizards/pms_booking_engine_views.xml
View File

@@ -5,6 +5,13 @@
<field name="model">pms.booking.engine</field> <field name="model">pms.booking.engine</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form class="pt-1"> <form class="pt-1">
<h2>
<field
name="pms_property_id"
required="1"
attrs="{'readonly':[('folio_id','!=',False)]}"
/>
</h2>
<div class="row"> <div class="row">
<div class="col-5 "> <div class="col-5 ">
<group> <group>
@@ -51,11 +58,6 @@
required="1" required="1"
attrs="{'invisible': [('reservation_type','!=','out')]}" attrs="{'invisible': [('reservation_type','!=','out')]}"
/> />
<field
name="pms_property_id"
required="1"
attrs="{'readonly':[('folio_id','!=',0)]}"
/>
<field <field
default_focus="1" default_focus="1"
name="pricelist_id" name="pricelist_id"