Skip to content

Commit f306c1b

Browse files
author
Andrii Kompaniiets
committed
FIX repository : test stock_picking_report_delivery_custom_name without stock_picking_group_by_partner_by_carrier_sale_line_position
1 parent 9165487 commit f306c1b

File tree

9 files changed

+98
-66
lines changed

9 files changed

+98
-66
lines changed

.copier-answers.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Do NOT update manually; changes here will be overwritten by Copier
2-
_commit: v1.29
2+
_commit: v1.36
33
_src_path: git+https://github.com/OCA/oca-addons-repo-template
44
additional_ruff_rules: []
55
ci: GitHub
@@ -12,12 +12,13 @@ github_enable_codecov: true
1212
github_enable_makepot: true
1313
github_enable_stale_action: true
1414
github_enforce_dev_status_compatibility: true
15-
include_wkhtmltopdf: false
15+
include_wkhtmltopdf: true
1616
odoo_test_flavor: Both
1717
odoo_version: 18.0
1818
org_name: Odoo Community Association (OCA)
1919
org_slug: OCA
20-
rebel_module_groups: []
20+
rebel_module_groups:
21+
- stock_picking_group_by_partner_by_carrier_sale_line_position,stock_picking_report_delivery_custom_name
2122
repo_description: stock-logistics-reporting
2223
repo_name: stock-logistics-reporting
2324
repo_slug: stock-logistics-reporting

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
test-requirements.txt merge=union

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
- uses: actions/setup-python@v5
1818
with:
1919
python-version: "3.11"
20+
cache: 'pip'
2021
- name: Get python version
2122
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
2223
- uses: actions/cache@v4

.github/workflows/test.yml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,31 @@ jobs:
3636
matrix:
3737
include:
3838
- container: ghcr.io/oca/oca-ci/py3.10-odoo18.0:latest
39+
include: "stock_picking_group_by_partner_by_carrier_sale_line_position,stock_picking_report_delivery_custom_name"
3940
name: test with Odoo
4041
- container: ghcr.io/oca/oca-ci/py3.10-ocb18.0:latest
42+
include: "stock_picking_group_by_partner_by_carrier_sale_line_position,stock_picking_report_delivery_custom_name"
43+
name: test with OCB
44+
makepot: "true"
45+
- container: ghcr.io/oca/oca-ci/py3.10-odoo18.0:latest
46+
exclude: "stock_picking_group_by_partner_by_carrier_sale_line_position,stock_picking_report_delivery_custom_name"
47+
name: test with Odoo
48+
- container: ghcr.io/oca/oca-ci/py3.10-ocb18.0:latest
49+
exclude: "stock_picking_group_by_partner_by_carrier_sale_line_position,stock_picking_report_delivery_custom_name"
4150
name: test with OCB
4251
makepot: "true"
4352
services:
4453
postgres:
45-
image: postgres:12.0
54+
image: postgres:12
4655
env:
4756
POSTGRES_USER: odoo
4857
POSTGRES_PASSWORD: odoo
4958
POSTGRES_DB: odoo
5059
ports:
5160
- 5432:5432
5261
env:
62+
INCLUDE: "${{ matrix.include }}"
63+
EXCLUDE: "${{ matrix.exclude }}"
5364
OCA_ENABLE_CHECKLOG_ODOO: "1"
5465
steps:
5566
- uses: actions/checkout@v4
@@ -65,6 +76,13 @@ jobs:
6576
run: oca_init_test_database
6677
- name: Run tests
6778
run: oca_run_tests
79+
- name: Upload screenshots from JS tests
80+
uses: actions/upload-artifact@v4
81+
if: ${{ failure() }}
82+
with:
83+
name: Screenshots of failed JS tests - ${{ matrix.name }}${{ join(matrix.include) }}
84+
path: /tmp/odoo_tests/${{ env.PGDATABASE }}
85+
if-no-files-found: ignore
6886
- uses: codecov/codecov-action@v4
6987
with:
7088
token: ${{ secrets.CODECOV_TOKEN }}

.pre-commit-config.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ repos:
3939
language: fail
4040
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
4141
- repo: https://github.com/sbidoul/whool
42-
rev: v1.2
42+
rev: v1.3
4343
hooks:
4444
- id: whool-init
4545
- repo: https://github.com/oca/maintainer-tools
46-
rev: bf9ecb9938b6a5deca0ff3d870fbd3f33341fded
46+
rev: b89f767503be6ab2b11e4f50a7557cb20066e667
4747
hooks:
4848
# update the NOT INSTALLABLE ADDONS section above
4949
- id: oca-update-pre-commit-excluded-addons
@@ -95,6 +95,7 @@ repos:
9595
additional_dependencies:
9696
- "eslint@9.12.0"
9797
- "eslint-plugin-jsdoc@50.3.1"
98+
- "globals@16.0.0"
9899
- repo: https://github.com/pre-commit/pre-commit-hooks
99100
rev: v4.6.0
100101
hooks:

.pylintrc

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,25 @@ disable=all
2525
enable=anomalous-backslash-in-string,
2626
api-one-deprecated,
2727
api-one-multi-together,
28-
assignment-from-none,
29-
attribute-deprecated,
3028
class-camelcase,
31-
dangerous-default-value,
3229
dangerous-view-replace-wo-priority,
33-
development-status-allowed,
3430
duplicate-id-csv,
35-
duplicate-key,
3631
duplicate-xml-fields,
3732
duplicate-xml-record-id,
3833
eval-referenced,
39-
eval-used,
4034
incoherent-interpreter-exec-perm,
35+
openerp-exception-warning,
36+
redundant-modulename-xml,
37+
relative-import,
38+
rst-syntax-error,
39+
wrong-tabs-instead-of-spaces,
40+
xml-syntax-error,
41+
assignment-from-none,
42+
attribute-deprecated,
43+
dangerous-default-value,
44+
development-status-allowed,
45+
duplicate-key,
46+
eval-used,
4147
license-allowed,
4248
manifest-author-string,
4349
manifest-deprecated-key,
@@ -48,73 +54,68 @@ enable=anomalous-backslash-in-string,
4854
method-inverse,
4955
method-required-super,
5056
method-search,
51-
openerp-exception-warning,
5257
pointless-statement,
5358
pointless-string-statement,
5459
print-used,
5560
redundant-keyword-arg,
56-
redundant-modulename-xml,
5761
reimported,
58-
relative-import,
5962
return-in-init,
60-
rst-syntax-error,
6163
sql-injection,
6264
too-few-format-args,
6365
translation-field,
6466
translation-required,
6567
unreachable,
6668
use-vim-comment,
67-
wrong-tabs-instead-of-spaces,
68-
xml-syntax-error,
69-
attribute-string-redundant,
7069
character-not-valid-in-resource-link,
71-
consider-merging-classes-inherited,
72-
context-overridden,
7370
create-user-wo-reset-password,
7471
dangerous-filter-wo-user,
7572
dangerous-qweb-replace-wo-priority,
7673
deprecated-data-xml-node,
7774
deprecated-openerp-xml-node,
7875
duplicate-po-message-definition,
79-
except-pass,
8076
file-not-used,
77+
missing-newline-extrafiles,
78+
old-api7-method-defined,
79+
po-msgstr-variables,
80+
po-syntax-error,
81+
str-format-used,
82+
unnecessary-utf8-coding-comment,
83+
xml-attribute-translatable,
84+
xml-deprecated-qweb-directive,
85+
xml-deprecated-tree-attribute,
86+
attribute-string-redundant,
87+
consider-merging-classes-inherited,
88+
context-overridden,
89+
except-pass,
8190
invalid-commit,
8291
manifest-maintainers-list,
83-
missing-newline-extrafiles,
8492
missing-readme,
8593
missing-return,
8694
odoo-addons-relative-import,
87-
old-api7-method-defined,
88-
po-msgstr-variables,
89-
po-syntax-error,
9095
renamed-field-parameter,
9196
resource-not-exist,
92-
str-format-used,
9397
test-folder-imported,
9498
translation-contains-variable,
9599
translation-positional-used,
96-
unnecessary-utf8-coding-comment,
97100
website-manifest-key-not-valid-uri,
98-
xml-attribute-translatable,
99-
xml-deprecated-qweb-directive,
100-
xml-deprecated-tree-attribute,
101101
external-request-timeout,
102-
# messages that do not cause the lint step to fail
103-
consider-merging-classes-inherited,
102+
missing-manifest-dependency,
103+
too-complex,,
104104
create-user-wo-reset-password,
105105
dangerous-filter-wo-user,
106-
deprecated-module,
107106
file-not-used,
108-
invalid-commit,
109-
missing-manifest-dependency,
110107
missing-newline-extrafiles,
111-
missing-readme,
112108
no-utf8-coding-comment,
113-
odoo-addons-relative-import,
114109
old-api7-method-defined,
110+
unnecessary-utf8-coding-comment,
111+
# messages that do not cause the lint step to fail
112+
consider-merging-classes-inherited,
113+
deprecated-module,
114+
invalid-commit,
115+
missing-readme,
116+
odoo-addons-relative-import,
115117
redefined-builtin,
116-
too-complex,
117-
unnecessary-utf8-coding-comment
118+
manifest-external-assets
118119

119120

120121
[REPORTS]

.pylintrc-mandatory

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,25 @@ disable=all
1717
enable=anomalous-backslash-in-string,
1818
api-one-deprecated,
1919
api-one-multi-together,
20-
assignment-from-none,
21-
attribute-deprecated,
2220
class-camelcase,
23-
dangerous-default-value,
2421
dangerous-view-replace-wo-priority,
25-
development-status-allowed,
2622
duplicate-id-csv,
27-
duplicate-key,
2823
duplicate-xml-fields,
2924
duplicate-xml-record-id,
3025
eval-referenced,
31-
eval-used,
3226
incoherent-interpreter-exec-perm,
27+
openerp-exception-warning,
28+
redundant-modulename-xml,
29+
relative-import,
30+
rst-syntax-error,
31+
wrong-tabs-instead-of-spaces,
32+
xml-syntax-error,
33+
assignment-from-none,
34+
attribute-deprecated,
35+
dangerous-default-value,
36+
development-status-allowed,
37+
duplicate-key,
38+
eval-used,
3339
license-allowed,
3440
manifest-author-string,
3541
manifest-deprecated-key,
@@ -40,56 +46,50 @@ enable=anomalous-backslash-in-string,
4046
method-inverse,
4147
method-required-super,
4248
method-search,
43-
openerp-exception-warning,
4449
pointless-statement,
4550
pointless-string-statement,
4651
print-used,
4752
redundant-keyword-arg,
48-
redundant-modulename-xml,
4953
reimported,
50-
relative-import,
5154
return-in-init,
52-
rst-syntax-error,
5355
sql-injection,
5456
too-few-format-args,
5557
translation-field,
5658
translation-required,
5759
unreachable,
5860
use-vim-comment,
59-
wrong-tabs-instead-of-spaces,
60-
xml-syntax-error,
61-
attribute-string-redundant,
6261
character-not-valid-in-resource-link,
63-
consider-merging-classes-inherited,
64-
context-overridden,
6562
create-user-wo-reset-password,
6663
dangerous-filter-wo-user,
6764
dangerous-qweb-replace-wo-priority,
6865
deprecated-data-xml-node,
6966
deprecated-openerp-xml-node,
7067
duplicate-po-message-definition,
71-
except-pass,
7268
file-not-used,
69+
missing-newline-extrafiles,
70+
old-api7-method-defined,
71+
po-msgstr-variables,
72+
po-syntax-error,
73+
str-format-used,
74+
unnecessary-utf8-coding-comment,
75+
xml-attribute-translatable,
76+
xml-deprecated-qweb-directive,
77+
xml-deprecated-tree-attribute,
78+
attribute-string-redundant,
79+
consider-merging-classes-inherited,
80+
context-overridden,
81+
except-pass,
7382
invalid-commit,
7483
manifest-maintainers-list,
75-
missing-newline-extrafiles,
7684
missing-readme,
7785
missing-return,
7886
odoo-addons-relative-import,
79-
old-api7-method-defined,
80-
po-msgstr-variables,
81-
po-syntax-error,
8287
renamed-field-parameter,
8388
resource-not-exist,
84-
str-format-used,
8589
test-folder-imported,
8690
translation-contains-variable,
8791
translation-positional-used,
88-
unnecessary-utf8-coding-comment,
8992
website-manifest-key-not-valid-uri,
90-
xml-attribute-translatable,
91-
xml-deprecated-qweb-directive,
92-
xml-deprecated-tree-attribute,
9393
external-request-timeout
9494

9595
[REPORTS]

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
[![Support the OCA](https://odoo-community.org/readme-banner-image)](https://odoo-community.org/get-involved?utm_source=repo-readme)
12

3+
# stock-logistics-reporting
24
[![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.odoo-community.org/builds?repo=OCA/stock-logistics-reporting&target_branch=18.0)
35
[![Pre-commit Status](https://github.com/OCA/stock-logistics-reporting/actions/workflows/pre-commit.yml/badge.svg?branch=18.0)](https://github.com/OCA/stock-logistics-reporting/actions/workflows/pre-commit.yml?query=branch%3A18.0)
46
[![Build Status](https://github.com/OCA/stock-logistics-reporting/actions/workflows/test.yml/badge.svg?branch=18.0)](https://github.com/OCA/stock-logistics-reporting/actions/workflows/test.yml?query=branch%3A18.0)
@@ -7,11 +9,15 @@
79

810
<!-- /!\ do not modify above this line -->
911

12+
<<<<<<< before updating
1013
# Stock Reporting
1114

1215
Are you looking for modules related to logistics? Or would like to contribute
1316
to? There are many repositories with specific purposes. Have a look at this
1417
[README](https://github.com/OCA/wms/blob/18.0/README.md).
18+
=======
19+
stock-logistics-reporting
20+
>>>>>>> after updating
1521
1622
<!-- /!\ do not modify below this line -->
1723

eslint.config.cjs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
var globals = require('globals');
12
jsdoc = require("eslint-plugin-jsdoc");
23

34
const config = [{
@@ -16,6 +17,8 @@ const config = [{
1617
openerp: "readonly",
1718
owl: "readonly",
1819
luxon: "readonly",
20+
QUnit: "readonly",
21+
...globals.browser,
1922
},
2023

2124
ecmaVersion: 2024,
@@ -191,7 +194,7 @@ const config = [{
191194
},
192195

193196
}, {
194-
files: ["**/*.esm.js"],
197+
files: ["**/*.esm.js", "**/*test.js"],
195198

196199
languageOptions: {
197200
ecmaVersion: 2024,

0 commit comments

Comments
 (0)