Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[14.0] dotfiles update needs manual intervention #205

Closed
wants to merge 1 commit into from
Closed

[14.0] dotfiles update needs manual intervention #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .copier-answers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
# Do NOT update manually; changes here will be overwritten by Copier
_commit: v1.14.2
_commit: v1.17.2
_src_path: gh:oca/oca-addons-repo-template
ci: Travis
dependency_installation_mode: PIP
generate_requirements_txt: true
github_check_license: true
github_ci_extra_env: {}
github_enable_codecov: true
github_enable_makepot: true
github_enable_stale_action: true
github_enforce_dev_status_compatibility: true
include_wkhtmltopdf: false
odoo_test_flavor: Both
odoo_version: 14.0
org_name: Odoo Community Association (OCA)
org_slug: OCA
Expand Down
1 change: 1 addition & 0 deletions .eslintrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ globals:
odoo: readonly
openerp: readonly
owl: readonly
luxon: readonly

# 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
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/pre-commit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ jobs:
pre-commit:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v2
with:
python-version: "3.11"
- name: Get python version
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
- uses: actions/cache@v1
Expand All @@ -25,6 +27,15 @@ jobs:
run: pip install pre-commit
- name: Run pre-commit
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
run: |
newfiles="$(git ls-files --others --exclude-from=.gitignore)"
Expand Down
16 changes: 15 additions & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ exclude: |
/static/(src/)?lib/|
# Repos using Sphinx to generate docs don't need prettying
^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
(LICENSE.*|COPYING.*)
default_language_version:
Expand All @@ -33,12 +35,24 @@ repos:
language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/oca/maintainer-tools
rev: ab1d7f6
rev: 969238e47c07d0c40573acff81d170f63245d738
hooks:
# update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons
- id: oca-fix-manifest-website
args: ["https://github.com/OCA/vertical-hotel"]
- id: oca-gen-addon-readme
args:
- --addons-dir=.
- --branch=14.0
- --org-name=OCA
- --repo-name=vertical-hotel
- --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
rev: v1.4
hooks:
Expand Down
2 changes: 1 addition & 1 deletion hotel_reservation/models/hotel_reservation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ def set_to_draft_reservation(self):
self.folio_id = []
self.update({"state": "draft"})
self.create_folio()

def action_send_reservation_mail(self):
"""
This function opens a window to compose an email,
Expand Down
47 changes: 29 additions & 18 deletions hotel_reservation/models/hotel_room.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,12 +182,11 @@ def get_room_summary(self): # noqa C901 (function is too complex)
)
chk_date = c.strftime(dt)


reservline_ids = self.env['hotel.reservation'].search(
reservline_ids = self.env["hotel.reservation"].search(
[
("checkin", "<=", chk_date),
("checkout", ">=", chk_date),
("state", "=", "draft")
("state", "=", "draft"),
]
)
for reservation in reservline_ids:
Expand All @@ -196,15 +195,15 @@ def get_room_summary(self): # noqa C901 (function is too complex)
):
# room_list_stats.append({"is_draft": "Yes"})
room_list_stats.append(
{
"state": "Reserved",
"date": chk_date,
"room_id": room.id,
"is_draft": "Yes",
"data_model": "",
"data_id": 0,
}
)
{
"state": "Reserved",
"date": chk_date,
"room_id": room.id,
"is_draft": "Yes",
"data_model": "",
"data_id": 0,
}
)
else:
for chk_date in date_range_list:
ch_dt = chk_date[:10] + " 23:59:59"
Expand Down Expand Up @@ -246,10 +245,22 @@ def get_room_summary(self): # noqa C901 (function is too complex)
cidst = datetime.strftime(cid, dt)
codst = datetime.strftime(cod, dt)
rm_id = res_room.room_id.id
ci = rlist.get("date") and rlist.get("date") >= cidst
co = rlist.get("date") and rlist.get("date") <= codst
rm = rlist.get("room_id") and rlist.get("room_id") == rm_id
st = rlist.get("state") and rlist.get("state") == "Reserved"
ci = (
rlist.get("date")
and rlist.get("date") >= cidst
)
co = (
rlist.get("date")
and rlist.get("date") <= codst
)
rm = (
rlist.get("room_id")
and rlist.get("room_id") == rm_id
)
st = (
rlist.get("state")
and rlist.get("state") == "Reserved"
)
if ci and co and rm and st:
count += 1
if count - dur.days == 0:
Expand Down Expand Up @@ -304,11 +315,11 @@ def get_room_summary(self): # noqa C901 (function is too complex)
}
)
else:
reservline_ids = self.env['hotel.reservation'].search(
reservline_ids = self.env["hotel.reservation"].search(
[
("checkin", "<=", chk_date),
("checkout", ">=", chk_date),
("state", "=", "draft")
("state", "=", "draft"),
]
)
for reservation in reservline_ids:
Expand Down
Loading