Merge PR #1418 into 14.0

Signed-off-by rousseldenis
This commit is contained in:
OCA-git-bot
2022-05-16 20:26:35 +00:00
16 changed files with 52 additions and 29 deletions

View File

@@ -1,14 +1,17 @@
# Do NOT update manually; changes here will be overwritten by Copier
_commit: v1.3.6
_commit: v1.7.0
_src_path: gh:oca/oca-addons-repo-template
ci: Travis
dependency_installation_mode: PIP
generate_requirements_txt: true
include_wkhtmltopdf: false
odoo_version: 14.0
org_name: Odoo Community Association (OCA)
org_slug: OCA
rebel_module_groups: []
repo_description: 'TODO: add repo description.'
repo_name: stock-logistics-warehouse
repo_slug: stock-logistics-warehouse
repo_website: https://github.com/OCA/stock-logistics-warehouse
travis_apt_packages: []
travis_apt_sources: []

View File

@@ -4,7 +4,7 @@ env:
# See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449
parserOptions:
ecmaVersion: 2017
ecmaVersion: 2019
overrides:
- files:

View File

@@ -2,7 +2,12 @@ name: pre-commit
on:
pull_request:
branches:
- "14.0*"
push:
branches:
- "14.0"
- "14.0-ocabot-*"
jobs:
pre-commit:
@@ -10,11 +15,21 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- name: Get python version
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
- uses: actions/cache@v1
with:
# The pylint-odoo version we use here does not support python 3.10
# https://github.com/OCA/oca-addons-repo-template/issues/80
# We also need to pin to an older version of python for older odoo versions
# where we are not using black > 21. Older black versions won't work with
# Python 3.9.8+, and we can't bump black without reformatting.
python-version: "3.9.7"
- uses: pre-commit/action@v2.0.0
path: ~/.cache/pre-commit
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
- name: Install pre-commit
run: pip install pre-commit
- name: Run pre-commit
run: pre-commit run --all-files --show-diff-on-failure --color=always
- name: Check that all files generated by pre-commit are in git
run: |
newfiles="$(git ls-files --others --exclude-from=.gitignore)"
if [ "$newfiles" != "" ] ; then
echo "Please check-in the following files:"
echo "$newfiles"
exit 1
fi

View File

@@ -46,7 +46,7 @@ repos:
- --remove-duplicate-keys
- --remove-unused-variables
- repo: https://github.com/psf/black
rev: 20.8b1
rev: 22.3.0
hooks:
- id: black
- repo: https://github.com/pre-commit/mirrors-prettier
@@ -120,7 +120,7 @@ repos:
name: flake8
additional_dependencies: ["flake8-bugbear==20.1.4"]
- repo: https://github.com/PyCQA/pylint
rev: pylint-2.5.3
rev: v2.11.1
hooks:
- id: pylint
name: pylint with optional checks
@@ -129,7 +129,7 @@ repos:
- --exit-zero
verbose: true
additional_dependencies: &pylint_deps
- pylint-odoo==3.5.0
- pylint-odoo==5.0.5
- id: pylint
name: pylint with mandatory checks
args:

View File

@@ -1,3 +1,5 @@
[MASTER]
load-plugins=pylint_odoo
score=n

View File

@@ -1,3 +1,4 @@
[MASTER]
load-plugins=pylint_odoo
score=n

View File

@@ -1,4 +1,5 @@
[![Runbot Status](https://runbot.odoo-community.org/runbot/badge/flat/153/14.0.svg)](https://runbot.odoo-community.org/runbot/repo/github-com-oca-stock-logistics-warehouse-153)
[![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.odoo-community.org/builds?repo=OCA/stock-logistics-warehouse&target_branch=14.0)
[![Build Status](https://travis-ci.com/OCA/stock-logistics-warehouse.svg?branch=14.0)](https://travis-ci.com/OCA/stock-logistics-warehouse)
[![codecov](https://codecov.io/gh/OCA/stock-logistics-warehouse/branch/14.0/graph/badge.svg)](https://codecov.io/gh/OCA/stock-logistics-warehouse)
[![Translation Status](https://translation.odoo-community.org/widgets/stock-logistics-warehouse-14-0/-/svg-badge.svg)](https://translation.odoo-community.org/engage/stock-logistics-warehouse-14-0/?utm_source=widget)
@@ -101,12 +102,11 @@ addon | version | maintainers | summary
This repository is licensed under [AGPL-3.0](LICENSE).
However, each module can have a totally different license, as long as they adhere to OCA
However, each module can have a totally different license, as long as they adhere to Odoo Community Association (OCA)
policy. Consult each module's `__manifest__.py` file, which contains a `license` key
that explains its license.
----
OCA, or the [Odoo Community Association](http://odoo-community.org/), is a nonprofit
organization whose mission is to support the collaborative development of Odoo features
and promote its widespread use.

View File

@@ -59,7 +59,7 @@ class TestAccountMoveLineStockInfo(TransactionCase):
)
def _create_user(self, login, groups, company):
""" Create a user."""
"""Create a user."""
group_ids = [group.id for group in groups]
user = self.res_users_model.with_context({"no_reset_password": True}).create(
{

View File

@@ -14,6 +14,7 @@
<field name="name">stock.inventory.line.tree.reason.code</field>
<field name="model">stock.inventory.line</field>
<field name="inherit_id" ref="reason_stock_inventory_line_tree" />
<field name="priority">99</field>
<field
name="groups_id"
eval="[(4, ref('stock_change_qty_reason.group_qty_reason_preset'))]"

View File

@@ -16,6 +16,7 @@
<field name="name">stock.inventory.reason.form.inherit.code</field>
<field name="model">stock.inventory</field>
<field name="inherit_id" ref="reason_stock_inventory_form_inherit" />
<field name="priority">99</field>
<field
name="groups_id"
eval="[(4, ref('stock_change_qty_reason.group_qty_reason_preset'))]"

View File

@@ -38,7 +38,7 @@ class MeasuringWizardLine(models.TransientModel):
for line in self:
line.volume = (
line.packaging_length * line.width * line.height
) / 1000.0 ** 3
) / 1000.0**3
def measuring_select_for_measure(self):
"""Current line has been selected for measurement

View File

@@ -80,7 +80,7 @@ class TestZippcubeWizard(SavepointComponentCase):
fields = ["packaging_length", "width", "height", "max_weight", "volume"]
for idx, line in enumerate(self.wizard.line_ids):
return_value = TestZippcubeWizard.get_measure_result(
100 * 2 ** idx, 100, 100, 3 ** idx
100 * 2**idx, 100, 100, 3**idx
)
line.measuring_select_for_measure()
self.device._update_packaging_measures(return_value)
@@ -90,11 +90,11 @@ class TestZippcubeWizard(SavepointComponentCase):
line.read(fields)[0],
{
"id": line.id,
"packaging_length": (2 ** idx) * 1000,
"packaging_length": (2**idx) * 1000,
"width": 1000,
"height": 1000,
"max_weight": 3.0 ** idx,
"volume": 2.0 ** idx,
"max_weight": 3.0**idx,
"volume": 2.0**idx,
},
)
self.wizard.action_save()
@@ -133,11 +133,11 @@ class TestZippcubeWizard(SavepointComponentCase):
)[0],
{
"id": packaging.id,
"packaging_length": (2 ** idx) * 1000,
"packaging_length": (2**idx) * 1000,
"width": 1000,
"height": 1000,
"max_weight": 3.0 ** idx,
"volume": 2.0 ** idx,
"max_weight": 3.0**idx,
"volume": 2.0**idx,
},
)

View File

@@ -63,7 +63,7 @@ class TestStockWarehouseOrderpoint(common.TransactionCase):
self.reorder = self.create_orderpoint()
def _create_user(self, login, groups, company):
""" Create a user."""
"""Create a user."""
group_ids = [group.id for group in groups]
user = self.user_model.with_context({"no_reset_password": True}).create(
{

View File

@@ -57,7 +57,7 @@ class TestStockWarehouseOrderpoint(common.TransactionCase):
self.reorder = self.create_orderpoint()
def _create_user(self, login, groups, company):
""" Create a user."""
"""Create a user."""
group_ids = [group.id for group in groups]
user = self.user_model.with_context({"no_reset_password": True}).create(
{

View File

@@ -142,7 +142,7 @@ class StockRequest(models.AbstractModel):
"company_id", "product_id", "warehouse_id", "location_id", "route_id"
)
def _check_company_constrains(self):
""" Check if the related models have the same company """
"""Check if the related models have the same company"""
for rec in self:
if (
rec.product_id.company_id
@@ -209,7 +209,7 @@ class StockRequest(models.AbstractModel):
@api.onchange("warehouse_id")
def onchange_warehouse_id(self):
""" Finds location id for changed warehouse. """
"""Finds location id for changed warehouse."""
res = {"domain": {}}
if self._name == "stock.request" and self.order_id:
# When the stock request is created from an order the wh and

View File

@@ -47,7 +47,7 @@ class TestPick(VerticalLiftCase):
return new_inventory
def test_location_empty_is_empty(self):
""" Location is indicated as being empty, and it is"""
"""Location is indicated as being empty, and it is"""
operation = self._open_screen("pick")
tray_location = operation.tray_location_id
tray_product = operation.current_move_line_id.product_id