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

[IMP] adapt xml structure and update dotfiles #38

Merged
merged 3 commits into from
Feb 5, 2024
Merged

[IMP] adapt xml structure and update dotfiles #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bac7e4
[IMP] adapt xml structure, remove data tag
chandni299 Feb 1, 2024
ae9ee25
[IMP] dotfiles update
chandni299 Feb 1, 2024
0965efc
[IMP] remove data tags and string attribute from tree tag
chandni299 Feb 1, 2024
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
6 changes: 2 additions & 4 deletions .copier-answers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# 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
ci: GitHub
dependency_installation_mode: OCA
generate_requirements_txt: true
github_check_license: true
github_ci_extra_env: {}
Expand All @@ -11,6 +10,7 @@ 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 All @@ -19,6 +19,4 @@ repo_description: Addons for managing rental operations in Odoo
repo_name: Vertical Rental
repo_slug: vertical-rental
repo_website: https://github.com/OCA/vertical-rental
travis_apt_packages: []
travis_apt_sources: []

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
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
name: Detect unreleased dependencies
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: |
for reqfile in requirements.txt test-requirements.txt ; do
if [ -f ${reqfile} ] ; then
Expand All @@ -36,10 +36,10 @@ jobs:
matrix:
include:
- container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest
makepot: "true"
name: test with Odoo
- container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest
name: test with OCB
makepot: "true"
services:
postgres:
image: postgres:9.6
Expand All @@ -50,7 +50,7 @@ jobs:
ports:
- 5432:5432
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
persist-credentials: false
- name: Install addons and dependencies
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-rental"]
- id: oca-gen-addon-readme
args:
- --addons-dir=.
- --branch=14.0
- --org-name=OCA
- --repo-name=vertical-rental
- --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
4 changes: 1 addition & 3 deletions rental_base/data/ir_sequence_data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<data noupdate="1">
<odoo noupdate="1">

<!-- Sequences for sale.order for rental-->
<record id="seq_rental_order" model="ir.sequence">
Expand All @@ -11,5 +10,4 @@
<field name="company_id" eval="False" />
</record>

</data>
</odoo>
2 changes: 0 additions & 2 deletions rental_base/data/product_uom_data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<data>
<record id="product_uom_month" model="uom.uom">
<field name="name">Month(s)</field>
<field name="uom_type">bigger</field>
<field ref="uom.uom_categ_wtime" name="category_id" />
<field name="factor" eval="0.033" />
</record>
</data>
</odoo>
54 changes: 26 additions & 28 deletions rental_base/views/product_views.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,30 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<data>
<record id="product_template_form_view" model="ir.ui.view">
<field name="model">product.template</field>
<field name="inherit_id" ref="product.product_template_form_view" />
<field name="arch" type="xml">
<xpath expr="//div[@name='options']" position="inside">
<div>
<field name="rental" />
<label for="rental" />
</div>
</xpath>
</field>
</record>
<record id="product_template_form_view" model="ir.ui.view">
<field name="model">product.template</field>
<field name="inherit_id" ref="product.product_template_form_view" />
<field name="arch" type="xml">
<xpath expr="//div[@name='options']" position="inside">
<div>
<field name="rental" />
<label for="rental" />
</div>
</xpath>
</field>
</record>

<record id="rental_product_search_view" model="ir.ui.view">
<field name="model">product.product</field>
<field name="mode">primary</field>
<field name="inherit_id" ref="product.product_search_form_view" />
<field name="arch" type="xml">
<xpath expr="//filter[@name='filter_to_purchase']" position="after">
<filter
name="rental"
string="Can be Rented"
domain="[('rental','=',True), ('type','=','product')]"
/>
</xpath>
</field>
</record>
</data>
<record id="rental_product_search_view" model="ir.ui.view">
<field name="model">product.product</field>
<field name="mode">primary</field>
<field name="inherit_id" ref="product.product_search_form_view" />
<field name="arch" type="xml">
<xpath expr="//filter[@name='filter_to_purchase']" position="after">
<filter
name="rental"
string="Can be Rented"
domain="[('rental','=',True), ('type','=','product')]"
/>
</xpath>
</field>
</record>
</odoo>
96 changes: 46 additions & 50 deletions rental_base/views/res_config_settings_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,60 +1,56 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<data>

<record id="res_config_settings_view_form" model="ir.ui.view">
<field name="model">res.config.settings</field>
<field name="priority" eval="10" />
<field name="inherit_id" ref="base.res_config_settings_view_form" />
<field name="arch" type="xml">
<xpath expr="//div[hasclass('settings')]" position="inside">
<div
class="app_settings_block"
data-string="Rental"
string="Rental"
data-key="rental_base"
>
<h2>Product</h2>
<div class="row mt16 o_settings_container">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="group_product_variant" />
<record id="res_config_settings_view_form" model="ir.ui.view">
<field name="model">res.config.settings</field>
<field name="priority" eval="10" />
<field name="inherit_id" ref="base.res_config_settings_view_form" />
<field name="arch" type="xml">
<xpath expr="//div[hasclass('settings')]" position="inside">
<div
class="app_settings_block"
data-string="Rental"
string="Rental"
data-key="rental_base"
>
<h2>Product</h2>
<div class="row mt16 o_settings_container">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="group_product_variant" />
</div>
<div class="o_setting_right_pane">
<label for="group_product_variant" />
<div class="text-muted">
Configure your products with variants
</div>
<div class="o_setting_right_pane">
<label for="group_product_variant" />
<div class="text-muted">
Configure your products with variants
</div>
<div
class="content-group"
attrs="{'invisible': [('group_product_variant','=',False)]}"
>
<div class="mt16">
<button
name="%(product.attribute_action)d"
icon="fa-arrow-right"
type="action"
string="Attributes"
class="btn-link"
/>
</div>
<div
class="content-group"
attrs="{'invisible': [('group_product_variant','=',False)]}"
>
<div class="mt16">
<button
name="%(product.attribute_action)d"
icon="fa-arrow-right"
type="action"
string="Attributes"
class="btn-link"
/>
</div>
</div>
</div>
</div>
</div>
</xpath>
</field>
</record>

<record id="action_rental_configuration" model="ir.actions.act_window">
<field name="name">Settings</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.config.settings</field>
<field name="view_mode">form</field>
<field name="target">inline</field>
<field name="context">{'module' : 'rental_base'}</field>
</record>
</div>
</xpath>
</field>
</record>

</data>
<record id="action_rental_configuration" model="ir.actions.act_window">
<field name="name">Settings</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.config.settings</field>
<field name="view_mode">form</field>
<field name="target">inline</field>
<field name="context">{'module' : 'rental_base'}</field>
</record>
</odoo>
Loading
Loading