Skip to content

Commit

Permalink
Merge branch '14.0' into 14.0-connector_pms
Browse files Browse the repository at this point in the history
  • Loading branch information
DarioLodeiros authored Aug 2, 2021
2 parents 42ac139 + c29d07c commit f08df92
Show file tree
Hide file tree
Showing 35 changed files with 2,533 additions and 178 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ Available addons
addon | version | summary
--- | --- | ---
[multi_pms_properties](multi_pms_properties/) | 14.0.1.0.0 | Multi Properties Manager
[pms](pms/) | 14.0.2.14.0 | A property management system
[pms](pms/) | 14.0.2.15.1 | A property management system
[pms_housekeeping](pms_housekeeping/) | 14.0.1.0.1 | Housekeeping
[pms_l10n_es](pms_l10n_es/) | 14.0.2.0.0 | PMS Spanish Adaptation
[pms_l10n_es](pms_l10n_es/) | 14.0.2.0.1 | PMS Spanish Adaptation
[pms_rooming_xls](pms_rooming_xls/) | 14.0.1.0.0 | Rooming xlsx Management

[//]: # (end addons)
Expand Down
1 change: 1 addition & 0 deletions oca_dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ partner-contact
reporting-engine
queue
connector
community-data-files
2 changes: 1 addition & 1 deletion pms/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
"name": "PMS (Property Management System)",
"summary": "A property management system",
"version": "14.0.2.14.0",
"version": "14.0.2.15.1",
"development_status": "Alpha",
"category": "Generic Modules/Property Management System",
"website": "https://github.com/OCA/pms",
Expand Down
34 changes: 17 additions & 17 deletions pms/i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ msgstr ""
"'Order - %s' % (object.name)"

#. module: pms
#: model_terms:ir.ui.view,arch_db:pms.report_viajero
#: model_terms:ir.ui.view,arch_db:pms.traveller_report
msgid ", at"
msgstr ""

Expand Down Expand Up @@ -282,7 +282,7 @@ msgid "<strong>Checkout:</strong>"
msgstr "<strong>Total</strong>"

#. module: pms
#: model_terms:ir.ui.view,arch_db:pms.report_viajero
#: model_terms:ir.ui.view,arch_db:pms.traveller_report
msgid "<strong>Copy for the host</strong>"
msgstr ""

Expand Down Expand Up @@ -1176,7 +1176,7 @@ msgstr ""
#: model:ir.model.fields,field_description:pms.field_pms_property__birthdate_date
#: model:ir.model.fields,field_description:pms.field_res_partner__birthdate_date
#: model:ir.model.fields,field_description:pms.field_res_users__birthdate_date
#: model_terms:ir.ui.view,arch_db:pms.report_viajero
#: model_terms:ir.ui.view,arch_db:pms.traveller_report
msgid "Birthdate"
msgstr ""

Expand Down Expand Up @@ -1356,7 +1356,7 @@ msgid "By Week"
msgstr "Por Semana"

#. module: pms
#: model_terms:ir.ui.view,arch_db:pms.report_viajero
#: model_terms:ir.ui.view,arch_db:pms.traveller_report
msgid "CIF:"
msgstr ""

Expand Down Expand Up @@ -2700,12 +2700,12 @@ msgid "Document Type"
msgstr ""

#. module: pms
#: model_terms:ir.ui.view,arch_db:pms.report_viajero
#: model_terms:ir.ui.view,arch_db:pms.traveller_report
msgid "Document number"
msgstr ""

#. module: pms
#: model_terms:ir.ui.view,arch_db:pms.report_viajero
#: model_terms:ir.ui.view,arch_db:pms.traveller_report
msgid "Document number:"
msgstr ""

Expand Down Expand Up @@ -2873,7 +2873,7 @@ msgid "Enter"
msgstr "Entrada"

#. module: pms
#: model_terms:ir.ui.view,arch_db:pms.report_viajero
#: model_terms:ir.ui.view,arch_db:pms.traveller_report
msgid "Entry date"
msgstr ""

Expand All @@ -2898,7 +2898,7 @@ msgid "Exit"
msgstr "Salida"

#. module: pms
#: model_terms:ir.ui.view,arch_db:pms.report_viajero
#: model_terms:ir.ui.view,arch_db:pms.traveller_report
msgid "Exit date"
msgstr ""

Expand All @@ -2908,7 +2908,7 @@ msgid "Expedition Date"
msgstr ""

#. module: pms
#: model_terms:ir.ui.view,arch_db:pms.report_viajero
#: model_terms:ir.ui.view,arch_db:pms.traveller_report
msgid "Expedition date"
msgstr ""

Expand Down Expand Up @@ -3373,7 +3373,7 @@ msgstr ""
#: model:ir.model.fields,field_description:pms.field_pms_checkin_partner__gender
#: model:ir.model.fields,field_description:pms.field_pms_property__gender
#: model:ir.model.fields,field_description:pms.field_res_partner__gender
#: model_terms:ir.ui.view,arch_db:pms.report_viajero
#: model_terms:ir.ui.view,arch_db:pms.traveller_report
msgid "Gender"
msgstr ""

Expand Down Expand Up @@ -4595,7 +4595,7 @@ msgstr ""
"crédito no conciliado o si hace click en el botón \"Listo\"."

#. module: pms
#: model_terms:ir.ui.view,arch_db:pms.report_viajero
#: model_terms:ir.ui.view,arch_db:pms.traveller_report
msgid "Lastnames"
msgstr ""

Expand Down Expand Up @@ -4941,7 +4941,7 @@ msgstr "Mis reservas"
#: model_terms:ir.ui.view,arch_db:pms.availability_view_form
#: model_terms:ir.ui.view,arch_db:pms.pms_room_view_form
#: model_terms:ir.ui.view,arch_db:pms.pms_shared_room_view_form
#: model_terms:ir.ui.view,arch_db:pms.report_viajero
#: model_terms:ir.ui.view,arch_db:pms.traveller_report
msgid "Name"
msgstr "Nombre"

Expand Down Expand Up @@ -5501,7 +5501,7 @@ msgid "Overbookings"
msgstr "Overbookings"

#. module: pms
#: model_terms:ir.ui.view,arch_db:pms.report_viajero
#: model_terms:ir.ui.view,arch_db:pms.traveller_report
msgid "PART OF TRAVELERS ENTRY"
msgstr ""

Expand Down Expand Up @@ -7907,7 +7907,7 @@ msgid "System Parameter"
msgstr "Parámetro del sistema"

#. module: pms
#: model_terms:ir.ui.view,arch_db:pms.report_viajero
#: model_terms:ir.ui.view,arch_db:pms.traveller_report
msgid "TRAVELER'S DOCUMENT"
msgstr ""

Expand Down Expand Up @@ -8784,7 +8784,7 @@ msgid "Total amount"
msgstr "Cantidad total"

#. module: pms
#: model_terms:ir.ui.view,arch_db:pms.report_viajero
#: model_terms:ir.ui.view,arch_db:pms.traveller_report
msgid "Total amount (Reservation Card):"
msgstr ""

Expand Down Expand Up @@ -8872,7 +8872,7 @@ msgid "Transactions"
msgstr "Transacciones"

#. module: pms
#: model_terms:ir.ui.view,arch_db:pms.report_viajero
#: model_terms:ir.ui.view,arch_db:pms.traveller_report
msgid "Traveler's signature"
msgstr ""

Expand Down Expand Up @@ -8900,7 +8900,7 @@ msgstr "Martes"

#. module: pms
#: model:ir.model.fields,field_description:pms.field_pms_folio__reservation_type
#: model_terms:ir.ui.view,arch_db:pms.report_viajero
#: model_terms:ir.ui.view,arch_db:pms.traveller_report
msgid "Type"
msgstr "TIpo"

Expand Down
Loading

0 comments on commit f08df92

Please sign in to comment.