Skip to content

Commit 1b1e866

Browse files
[ADD] dependencies
1 parent c7786e7 commit 1b1e866

29 files changed

+728
-92
lines changed

.copier-answers.yml

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11
# Do NOT update manually; changes here will be overwritten by Copier
2-
_commit: v1.14.1
2+
_commit: v1.24
33
_src_path: https://github.com/OCA/oca-addons-repo-template.git
44
ci: GitHub
5-
dependency_installation_mode: PIP
5+
convert_readme_fragments_to_markdown: false
66
generate_requirements_txt: true
77
github_check_license: true
88
github_ci_extra_env: {}
9-
github_enable_codecov: true
9+
github_enable_codecov: false
1010
github_enable_makepot: false
11-
github_enable_stale_action: true
12-
github_enforce_dev_status_compatibility: true
11+
github_enable_stale_action: false
12+
github_enforce_dev_status_compatibility: false
1313
include_wkhtmltopdf: false
14+
odoo_test_flavor: OCB
1415
odoo_version: 10.0
15-
org_name: Quartile Limited
16+
org_name: ''
1617
org_slug: qrtl
1718
rebel_module_groups: []
1819
repo_description: PCI Custom
19-
repo_name: null
20+
repo_name: ''
2021
repo_slug: pci-custom
2122
repo_website: https://www.quartile.co
22-
travis_apt_packages: []
23-
travis_apt_sources: []
2423

.github/workflows/pre-commit.yml

+10-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
pre-commit:
1414
runs-on: ubuntu-20.04
1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v3
1717
- uses: actions/setup-python@v2
1818
with:
1919
python-version: "2.7"
@@ -27,6 +27,15 @@ jobs:
2727
run: pip install pre-commit
2828
- name: Run pre-commit
2929
run: pre-commit run --all-files --show-diff-on-failure --color=always
30+
env:
31+
# Consider valid a PR that changes README fragments but doesn't
32+
# change the README.rst file itself. It's not really a problem
33+
# because the bot will update it anyway after merge. This way, we
34+
# lower the barrier for functional contributors that want to fix the
35+
# readme fragments, while still letting developers get README
36+
# auto-generated (which also helps functionals when using runboat).
37+
# DOCS https://pre-commit.com/#temporarily-disabling-hooks
38+
SKIP: oca-gen-addon-readme
3039
- name: Check that all files generated by pre-commit are in git
3140
run: |
3241
newfiles="$(git ls-files --others --exclude-from=.gitignore)"

.github/workflows/stale.yml

-69
This file was deleted.

.github/workflows/test.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
include:
3838
- container: ghcr.io/oca/oca-ci/py2.7-ocb10.0:latest
3939
name: test with OCB
40+
makepot: "false"
4041
services:
4142
postgres:
4243
image: postgres:9.6
@@ -47,7 +48,7 @@ jobs:
4748
ports:
4849
- 5432:5432
4950
steps:
50-
- uses: actions/checkout@v2
51+
- uses: actions/checkout@v3
5152
with:
5253
persist-credentials: false
5354
- name: Install addons and dependencies
@@ -56,11 +57,11 @@ jobs:
5657
run: manifestoo -d . check-licenses
5758
- name: Check development status
5859
run: manifestoo -d . check-dev-status --default-dev-status=Beta
60+
continue-on-error: true
5961
- name: Initialize test db
6062
run: oca_init_test_database
6163
- name: Run tests
6264
run: oca_run_tests
63-
- uses: codecov/codecov-action@v1
6465
- name: Update .pot files
6566
run: oca_export_and_push_pot https://x-access-token:${{ secrets.GIT_PUSH_TOKEN }}@github.com/${{ github.repository }}
6667
if: ${{ matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'qrtl' }}

.gitignore

+10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ __pycache__/
33
*.py[cod]
44
/.venv
55
/.pytest_cache
6+
/.ruff_cache
67

78
# C extensions
89
*.so
@@ -24,6 +25,15 @@ var/
2425
*.egg
2526
*.eggs
2627

28+
# Debian packages
29+
*.deb
30+
31+
# Redhat packages
32+
*.rpm
33+
34+
# MacOS packages
35+
*.dmg
36+
2737
# Installer logs
2838
pip-log.txt
2939
pip-delete-this-directory.txt

.oca_hooks.cfg

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[MESSAGES_CONTROL]
2+
disable=xml-deprecated-data-node,xml-deprecated-tree-attribute

.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ exclude: |
1515
# You don't usually want a bot to modify your legal texts
1616
(LICENSE.*|COPYING.*)
1717
default_language_version:
18-
python: python3
18+
python: python3.6
1919
repos:
2020
- repo: https://github.com/oca/maintainer-tools
2121
rev: ab1d7f6

.pylintrc

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ score=n
44

55
[ODOOLINT]
66
readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
7-
manifest_required_authors=Quartile Limited
7+
; manifest_required_authors=
88
manifest_required_keys=license
99
manifest_deprecated_keys=description,active
1010
license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
@@ -103,7 +103,7 @@ enable=anomalous-backslash-in-string,
103103
eval-referenced,
104104
license-allowed,
105105
manifest-author-string,
106-
manifest-required-author,
106+
; manifest-required-author,
107107
manifest-required-key,
108108
manifest-version-format,
109109
api-one-deprecated,

.pylintrc-mandatory

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ score=n
44

55
[ODOOLINT]
66
readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
7-
manifest_required_authors=Quartile Limited
7+
<!-- manifest_required_authors= -->
88
manifest_required_keys=license
99
manifest_deprecated_keys=description,active
1010
license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
@@ -57,7 +57,7 @@ enable=anomalous-backslash-in-string,
5757
eval-referenced,
5858
license-allowed,
5959
manifest-author-string,
60-
manifest-required-author,
60+
<!-- manifest-required-author, -->
6161
manifest-required-key,
6262
manifest-version-format
6363

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ This part will be replaced when running the oca-gen-addons-table script from OCA
2727

2828
This repository is licensed under [AGPL-3.0](LICENSE).
2929

30-
However, each module can have a totally different license, as long as they adhere to Quartile Limited
30+
However, each module can have a totally different license, as long as they adhere to
3131
policy. Consult each module's `__manifest__.py` file, which contains a `license` key
3232
that explains its license.
3333

purchase_received_qty_adj/__manifest__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
- Add transfer reference to stock move tree view
1616
""",
1717
'depends': [
18-
'purchase',
1918
'purchase_stock_picking_return_invoicing',
19+
'purchase_open_qty',
2020
],
2121
'data': [
2222
'views/purchase_order_view.xml',

purchase_received_qty_adj/views/purchase_order_view.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<record id="purchase_order_form" model="ir.ui.view">
44
<field name="name">purchase.order.form</field>
55
<field name="model">purchase.order</field>
6-
<field name="inherit_id" ref="purchase.purchase_order_form"/>
6+
<field name="inherit_id" ref="purchase_stock_picking_return_invoicing.purchase_order_form"/>
77
<field name="arch" type="xml">
88
<xpath expr="//field[@name='order_line']/tree/field[@name='qty_to_refund']"
9-
position="attributes">
9+
position="attributes">
1010
<attribute name="invisible">True</attribute>
1111
</xpath>
1212
<xpath expr="//field[@name='order_line']/tree/field[@name='qty_refunded']"

sale_pricelist_auto_update/tests/test_sale_pricelist_auto_update.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
44

55
from odoo.tests.common import SavepointCase
6+
from odoo import fields
67

78

89
class TestSalePricelistAutoUpdate(SavepointCase):
@@ -20,7 +21,7 @@ def setUpClass(cls):
2021
{
2122
"name": "FY2022",
2223
"date_start": "2022-01-01",
23-
"date_end": "2022-12-31",
24+
"date_end": fields.date.today(),
2425
"type_id": range_type.id,
2526
}
2627
)
@@ -53,7 +54,7 @@ def test_confirm_and_cancel_sales_order(self):
5354
yearly_sales_dom = [
5455
("partner_id", "=", self.partner.id),
5556
("start_date", "=", "2022-01-01"),
56-
("end_date", "=", "2022-12-31"),
57+
("end_date", "=", fields.date.today()),
5758
]
5859
yearly_sales = self.yearly_sales.search(yearly_sales_dom)
5960
# No corresponding yearly sales record before sales order confirmation.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
__import__('pkg_resources').declare_namespace(__name__)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
__import__('pkg_resources').declare_namespace(__name__)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../stock_shipment_schedule_report
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import setuptools
2+
3+
setuptools.setup(
4+
setup_requires=['setuptools-odoo'],
5+
odoo_addon=True,
6+
)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# -*- coding: utf-8 -*-
2+
3+
from . import wizards
4+
from . import reports
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# -*- coding: utf-8 -*-
2+
# Copyright 2017 Quartile Limited
3+
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
4+
{
5+
"name": "Shipment Schedule Report",
6+
"summary": "",
7+
"version": "10.0.1.1.0",
8+
"category": "Reporting",
9+
"website": "https://www.quartile.co",
10+
"author": "Quartile Limited",
11+
"license": "LGPL-3",
12+
"installable": True,
13+
"depends": [
14+
"sale_stock",
15+
"abstract_report_xlsx",
16+
"sale_order_dates_ext",
17+
"website_product_stock",
18+
],
19+
"data": [
20+
"wizards/shipment_schedule_report_wizard_view.xml",
21+
"reports.xml",
22+
],
23+
}
+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<odoo>
3+
4+
<record id="action_shipment_schedule_report_xlsx" model="ir.actions.report.xml">
5+
<field name="name">Shipment Schedule Report</field>
6+
<field name="model">shipment.schedule.report</field>
7+
<field name="type">ir.actions.report.xml</field>
8+
<field name="report_name">stock_shipment_schedule_report.shipment_schedule_report</field>
9+
<field name="report_type">xlsx</field>
10+
<field name="auto" eval="False"/>
11+
</record>
12+
13+
</odoo>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# -*- coding: utf-8 -*-
2+
3+
from . import shipment_schedule_report
4+
from . import shipment_schedule_report_line
5+
from . import shipment_schedule_report_compute
6+
from . import shipment_schedule_xlsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# -*- coding: utf-8 -*-
2+
# Copyright 2017 Quartile Limited
3+
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
4+
5+
from odoo import models, fields
6+
7+
8+
class ShipmentScheduleReport(models.TransientModel):
9+
# class fields are defined here
10+
_name = 'shipment.schedule.report'
11+
12+
threshold_date = fields.Date()
13+
limit_locs = fields.Boolean()
14+
website_published = fields.Boolean()
15+
categ_name = fields.Char()
16+
p2 = fields.Char()
17+
p3 = fields.Char()
18+
p4 = fields.Char()
19+
p5 = fields.Char()
20+
p6 = fields.Char()
21+
22+
# # Data fields, used to browse report data
23+
categ_id = fields.Many2one(
24+
comodel_name='product.category',
25+
)
26+
line_ids = fields.One2many(
27+
comodel_name='shipment.schedule.report.line',
28+
inverse_name='report_id'
29+
)

0 commit comments

Comments
 (0)