[IMP] update dotfiles

This commit is contained in:
oca-git-bot
2023-10-27 23:12:23 +02:00
committed by Darío Lodeiros
parent 72b0f3e499
commit b1dc8758bb
9 changed files with 45 additions and 15 deletions

View File

@@ -1,8 +1,7 @@
# Do NOT update manually; changes here will be overwritten by Copier # Do NOT update manually; changes here will be overwritten by Copier
_commit: v1.14.2 _commit: v1.17.2
_src_path: https://github.com/OCA/oca-addons-repo-template.git _src_path: https://github.com/OCA/oca-addons-repo-template.git
ci: GitHub ci: GitHub
dependency_installation_mode: OCA
generate_requirements_txt: true generate_requirements_txt: true
github_check_license: true github_check_license: true
github_ci_extra_env: {} github_ci_extra_env: {}
@@ -11,6 +10,7 @@ github_enable_makepot: true
github_enable_stale_action: true github_enable_stale_action: true
github_enforce_dev_status_compatibility: true github_enforce_dev_status_compatibility: true
include_wkhtmltopdf: false include_wkhtmltopdf: false
odoo_test_flavor: Both
odoo_version: 14.0 odoo_version: 14.0
org_name: Odoo Community Association (OCA) org_name: Odoo Community Association (OCA)
org_slug: OCA org_slug: OCA
@@ -19,6 +19,4 @@ repo_description: All-in-One Property Management System (PMS) focused on medium-
repo_name: Property Management System repo_name: Property Management System
repo_slug: pms repo_slug: pms
repo_website: https://github.com/OCA/pms repo_website: https://github.com/OCA/pms
travis_apt_packages: []
travis_apt_sources: []

View File

@@ -22,6 +22,7 @@ globals:
odoo: readonly odoo: readonly
openerp: readonly openerp: readonly
owl: readonly owl: readonly
luxon: readonly
# Styling is handled by Prettier, so we only need to enable AST rules; # Styling is handled by Prettier, so we only need to enable AST rules;
# see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890 # see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890

View File

@@ -13,8 +13,10 @@ jobs:
pre-commit: pre-commit:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions/setup-python@v2 - uses: actions/setup-python@v2
with:
python-version: "3.11"
- name: Get python version - name: Get python version
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
- uses: actions/cache@v1 - uses: actions/cache@v1
@@ -25,6 +27,15 @@ jobs:
run: pip install pre-commit run: pip install pre-commit
- name: Run pre-commit - name: Run pre-commit
run: pre-commit run --all-files --show-diff-on-failure --color=always run: pre-commit run --all-files --show-diff-on-failure --color=always
env:
# Consider valid a PR that changes README fragments but doesn't
# change the README.rst file itself. It's not really a problem
# because the bot will update it anyway after merge. This way, we
# lower the barrier for functional contributors that want to fix the
# readme fragments, while still letting developers get README
# auto-generated (which also helps functionals when using runboat).
# DOCS https://pre-commit.com/#temporarily-disabling-hooks
SKIP: oca-gen-addon-readme
- name: Check that all files generated by pre-commit are in git - name: Check that all files generated by pre-commit are in git
run: | run: |
newfiles="$(git ls-files --others --exclude-from=.gitignore)" newfiles="$(git ls-files --others --exclude-from=.gitignore)"

View File

@@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Detect unreleased dependencies name: Detect unreleased dependencies
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- run: | - run: |
for reqfile in requirements.txt test-requirements.txt ; do for reqfile in requirements.txt test-requirements.txt ; do
if [ -f ${reqfile} ] ; then if [ -f ${reqfile} ] ; then
@@ -36,10 +36,10 @@ jobs:
matrix: matrix:
include: include:
- container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest - container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest
makepot: "true"
name: test with Odoo name: test with Odoo
- container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest - container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest
name: test with OCB name: test with OCB
makepot: "true"
services: services:
postgres: postgres:
image: postgres:9.6 image: postgres:9.6
@@ -50,7 +50,7 @@ jobs:
ports: ports:
- 5432:5432 - 5432:5432
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
persist-credentials: false persist-credentials: false
- name: Install addons and dependencies - name: Install addons and dependencies

View File

@@ -12,6 +12,8 @@ exclude: |
/static/(src/)?lib/| /static/(src/)?lib/|
# Repos using Sphinx to generate docs don't need prettying # Repos using Sphinx to generate docs don't need prettying
^docs/_templates/.*\.html$| ^docs/_templates/.*\.html$|
# Don't bother non-technical authors with formatting issues in docs
readme/.*\.(rst|md)$|
# You don't usually want a bot to modify your legal texts # You don't usually want a bot to modify your legal texts
(LICENSE.*|COPYING.*) (LICENSE.*|COPYING.*)
default_language_version: default_language_version:
@@ -33,12 +35,24 @@ repos:
language: fail language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$' files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/oca/maintainer-tools - repo: https://github.com/oca/maintainer-tools
rev: ab1d7f6 rev: 969238e47c07d0c40573acff81d170f63245d738
hooks: hooks:
# update the NOT INSTALLABLE ADDONS section above # update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons - id: oca-update-pre-commit-excluded-addons
- id: oca-fix-manifest-website - id: oca-fix-manifest-website
args: ["https://github.com/OCA/pms"] args: ["https://github.com/OCA/pms"]
- id: oca-gen-addon-readme
args:
- --addons-dir=.
- --branch=14.0
- --org-name=OCA
- --repo-name=pms
- --if-source-changed
- repo: https://github.com/OCA/odoo-pre-commit-hooks
rev: v0.0.25
hooks:
- id: oca-checks-odoo-module
- id: oca-checks-po
- repo: https://github.com/myint/autoflake - repo: https://github.com/myint/autoflake
rev: v1.4 rev: v1.4
hooks: hooks:

View File

@@ -49,17 +49,17 @@
<record id="main_pms_sale_channel_door" model="pms.sale.channel"> <record id="main_pms_sale_channel_door" model="pms.sale.channel">
<field name="name">Door</field> <field name="name">Door</field>
<field name="channel_type">direct</field> <field name="channel_type">direct</field>
<field name="icon" type="base64" file="pms/data/icon-door.svg"/> <field name="icon" type="base64" file="pms/data/icon-door.svg" />
</record> </record>
<record id="main_pms_sale_channel_phone" model="pms.sale.channel"> <record id="main_pms_sale_channel_phone" model="pms.sale.channel">
<field name="name">Phone</field> <field name="name">Phone</field>
<field name="channel_type">direct</field> <field name="channel_type">direct</field>
<field name="icon" type="base64" file="pms/data/icon-phone.svg"/> <field name="icon" type="base64" file="pms/data/icon-phone.svg" />
</record> </record>
<record id="main_pms_sale_channel_mail" model="pms.sale.channel"> <record id="main_pms_sale_channel_mail" model="pms.sale.channel">
<field name="name">Mail</field> <field name="name">Mail</field>
<field name="channel_type">direct</field> <field name="channel_type">direct</field>
<field name="icon" type="base64" file="pms/data/icon-mail.svg"/> <field name="icon" type="base64" file="pms/data/icon-mail.svg" />
</record> </record>
<record id="main_pms_sale_channel_agency" model="pms.sale.channel"> <record id="main_pms_sale_channel_agency" model="pms.sale.channel">
<field name="name">Agency</field> <field name="name">Agency</field>

View File

@@ -51,7 +51,9 @@ odoo.define("web.SwitchPmsMenu", function (require) {
}); });
this.user_pms_properties = this.user_pms_properties =
session.user_pms_properties.allowed_pms_properties; session.user_pms_properties.allowed_pms_properties;
this.user_pms_properties.sort(function(a,b){return a[1] > b[1] ? 1 : a[1] < b[1] ?-1 :0}); this.user_pms_properties.sort(function (a, b) {
return a[1] > b[1] ? 1 : a[1] < b[1] ? -1 : 0;
});
this.current_pms_property = this.allowed_pms_property_ids[0]; this.current_pms_property = this.allowed_pms_property_ids[0];
this.current_pms_property_name = _.find( this.current_pms_property_name = _.find(
session.user_pms_properties.allowed_pms_properties, session.user_pms_properties.allowed_pms_properties,

View File

@@ -808,7 +808,9 @@ class TestPmsBookingEngine(TestPms):
room_price = self.test_room_type_double.list_price room_price = self.test_room_type_double.list_price
days = (checkout - checkin).days days = (checkout - checkin).days
board_service_price = self.board_service_test.amount board_service_price = self.board_service_test.amount
room_capacity = self.test_room_type_double.get_room_type_capacity(self.pms_property1.id) room_capacity = self.test_room_type_double.get_room_type_capacity(
self.pms_property1.id
)
expected_price = room_price * days + ( expected_price = room_price * days + (
board_service_price * room_capacity * days board_service_price * room_capacity * days
) )

View File

@@ -278,7 +278,9 @@ class BookingEngine(models.TransientModel):
record.discount * 100 record.discount * 100
) )
action = self.sudo().env.ref("pms.open_pms_folio1_form_tree_all").read()[0] action = self.sudo().env.ref("pms.open_pms_folio1_form_tree_all").read()[0]
action["views"] = [(self.sudo().env.ref("pms.pms_folio_view_form").id, "form")] action["views"] = [
(self.sudo().env.ref("pms.pms_folio_view_form").id, "form")
]
action["res_id"] = folio.id action["res_id"] = folio.id
return action return action