Skip to content

Commit

Permalink
[ADD][IMP] shipment_advice
Browse files Browse the repository at this point in the history
- modified shipment_advice, so whenever we set stock move to done, and if autovalidate shipment advice is enabled in company settings - we set shipment advice to done
- updated tests, covered backorder.
  • Loading branch information
vnikolayev1 committed Jun 20, 2024
1 parent 993996b commit f0a4e11
Show file tree
Hide file tree
Showing 238 changed files with 3,639 additions and 11,971 deletions.
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ github_enable_stale_action: true
github_enforce_dev_status_compatibility: true
include_wkhtmltopdf: false
odoo_test_flavor: Both
odoo_version: 16.0
odoo_version: 14.0
org_name: Odoo Community Association (OCA)
org_slug: OCA
rebel_module_groups: []
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: pre-commit
on:
pull_request:
branches:
- "16.0*"
- "14.0*"
push:
branches:
- "16.0"
- "16.0-ocabot-*"
- "14.0"
- "14.0-ocabot-*"

jobs:
pre-commit:
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ name: tests
on:
pull_request:
branches:
- "16.0*"
- "14.0*"
push:
branches:
- "16.0"
- "16.0-ocabot-*"
- "14.0"
- "14.0-ocabot-*"

jobs:
unreleased-deps:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
name: Detect unreleased dependencies
steps:
- uses: actions/checkout@v3
Expand All @@ -28,21 +28,21 @@ jobs:
fi
done
test:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
container: ${{ matrix.container }}
name: ${{ matrix.name }}
strategy:
fail-fast: false
matrix:
include:
- container: ghcr.io/oca/oca-ci/py3.10-odoo16.0:latest
- container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest
name: test with Odoo
- container: ghcr.io/oca/oca-ci/py3.10-ocb16.0:latest
- container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest
name: test with OCB
makepot: "true"
services:
postgres:
image: postgres:12.0
image: postgres:9.6
env:
POSTGRES_USER: odoo
POSTGRES_PASSWORD: odoo
Expand Down
2 changes: 2 additions & 0 deletions .oca_hooks.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[MESSAGES_CONTROL]
disable=xml-deprecated-data-node,xml-deprecated-tree-attribute
26 changes: 13 additions & 13 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ exclude: |
(LICENSE.*|COPYING.*)
default_language_version:
python: python3
node: "16.17.0"
node: "14.13.0"
repos:
- repo: local
hooks:
Expand All @@ -48,7 +48,7 @@ repos:
- id: oca-gen-addon-readme
args:
- --addons-dir=.
- --branch=16.0
- --branch=14.0
- --org-name=OCA
- --repo-name=stock-logistics-transport
- --if-source-changed
Expand All @@ -59,7 +59,7 @@ repos:
- id: oca-checks-odoo-module
- id: oca-checks-po
- repo: https://github.com/myint/autoflake
rev: v1.6.1
rev: v1.4
hooks:
- id: autoflake
args:
Expand All @@ -70,30 +70,30 @@ repos:
- --remove-duplicate-keys
- --remove-unused-variables
- repo: https://github.com/psf/black
rev: 22.8.0
rev: 22.3.0
hooks:
- id: black
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.7.1
rev: v2.1.2
hooks:
- id: prettier
name: prettier (with plugin-xml)
additional_dependencies:
- "prettier@2.7.1"
- "@prettier/plugin-xml@2.2.0"
- "prettier@2.1.2"
- "@prettier/plugin-xml@0.12.0"
args:
- --plugin=@prettier/plugin-xml
files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$
- repo: https://github.com/pre-commit/mirrors-eslint
rev: v8.24.0
rev: v7.8.1
hooks:
- id: eslint
verbose: true
args:
- --color
- --fix
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v3.2.0
hooks:
- id: trailing-whitespace
# exclude autogenerated files
Expand All @@ -115,7 +115,7 @@ repos:
- id: mixed-line-ending
args: ["--fix=lf"]
- repo: https://github.com/asottile/pyupgrade
rev: v2.38.2
rev: v2.7.2
hooks:
- id: pyupgrade
args: ["--keep-percent-format"]
Expand All @@ -138,13 +138,13 @@ repos:
- --header
- "# generated from manifests external_dependencies"
- repo: https://github.com/PyCQA/flake8
rev: 3.9.2
rev: 3.8.3
hooks:
- id: flake8
name: flake8
additional_dependencies: ["flake8-bugbear==21.9.2"]
additional_dependencies: ["flake8-bugbear==20.1.4"]
- repo: https://github.com/OCA/pylint-odoo
rev: v8.0.19
rev: 7.0.2
hooks:
- id: pylint_odoo
name: pylint with optional checks
Expand Down
45 changes: 6 additions & 39 deletions .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ load-plugins=pylint_odoo
score=n

[ODOOLINT]
readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
manifest-required-authors=Odoo Community Association (OCA)
manifest-required-keys=license
manifest-deprecated-keys=description,active
license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
valid-odoo-versions=16.0
readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
manifest_required_authors=Odoo Community Association (OCA)
manifest_required_keys=license
manifest_deprecated_keys=description,active
license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
valid_odoo_versions=14.0

[MESSAGES CONTROL]
disable=all
Expand Down Expand Up @@ -66,39 +66,6 @@ enable=anomalous-backslash-in-string,
use-vim-comment,
wrong-tabs-instead-of-spaces,
xml-syntax-error,
attribute-string-redundant,
character-not-valid-in-resource-link,
consider-merging-classes-inherited,
context-overridden,
create-user-wo-reset-password,
dangerous-filter-wo-user,
dangerous-qweb-replace-wo-priority,
deprecated-data-xml-node,
deprecated-openerp-xml-node,
duplicate-po-message-definition,
except-pass,
file-not-used,
invalid-commit,
manifest-maintainers-list,
missing-newline-extrafiles,
missing-readme,
missing-return,
odoo-addons-relative-import,
old-api7-method-defined,
po-msgstr-variables,
po-syntax-error,
renamed-field-parameter,
resource-not-exist,
str-format-used,
test-folder-imported,
translation-contains-variable,
translation-positional-used,
unnecessary-utf8-coding-comment,
website-manifest-key-not-valid-uri,
xml-attribute-translatable,
xml-deprecated-qweb-directive,
xml-deprecated-tree-attribute,
external-request-timeout,
# messages that do not cause the lint step to fail
consider-merging-classes-inherited,
create-user-wo-reset-password,
Expand Down
47 changes: 7 additions & 40 deletions .pylintrc-mandatory
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ load-plugins=pylint_odoo
score=n

[ODOOLINT]
readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
manifest-required-authors=Odoo Community Association (OCA)
manifest-required-keys=license
manifest-deprecated-keys=description,active
license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
valid-odoo-versions=16.0
readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
manifest_required_authors=Odoo Community Association (OCA)
manifest_required_keys=license
manifest_deprecated_keys=description,active
license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
valid_odoo_versions=14.0

[MESSAGES CONTROL]
disable=all
Expand Down Expand Up @@ -57,40 +57,7 @@ enable=anomalous-backslash-in-string,
unreachable,
use-vim-comment,
wrong-tabs-instead-of-spaces,
xml-syntax-error,
attribute-string-redundant,
character-not-valid-in-resource-link,
consider-merging-classes-inherited,
context-overridden,
create-user-wo-reset-password,
dangerous-filter-wo-user,
dangerous-qweb-replace-wo-priority,
deprecated-data-xml-node,
deprecated-openerp-xml-node,
duplicate-po-message-definition,
except-pass,
file-not-used,
invalid-commit,
manifest-maintainers-list,
missing-newline-extrafiles,
missing-readme,
missing-return,
odoo-addons-relative-import,
old-api7-method-defined,
po-msgstr-variables,
po-syntax-error,
renamed-field-parameter,
resource-not-exist,
str-format-used,
test-folder-imported,
translation-contains-variable,
translation-positional-used,
unnecessary-utf8-coding-comment,
website-manifest-key-not-valid-uri,
xml-attribute-translatable,
xml-deprecated-qweb-directive,
xml-deprecated-tree-attribute,
external-request-timeout
xml-syntax-error

[REPORTS]
msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg}
Expand Down
22 changes: 12 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

[![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.odoo-community.org/builds?repo=OCA/stock-logistics-transport&target_branch=16.0)
[![Pre-commit Status](https://github.com/OCA/stock-logistics-transport/actions/workflows/pre-commit.yml/badge.svg?branch=16.0)](https://github.com/OCA/stock-logistics-transport/actions/workflows/pre-commit.yml?query=branch%3A16.0)
[![Build Status](https://github.com/OCA/stock-logistics-transport/actions/workflows/test.yml/badge.svg?branch=16.0)](https://github.com/OCA/stock-logistics-transport/actions/workflows/test.yml?query=branch%3A16.0)
[![codecov](https://codecov.io/gh/OCA/stock-logistics-transport/branch/16.0/graph/badge.svg)](https://codecov.io/gh/OCA/stock-logistics-transport)
[![Translation Status](https://translation.odoo-community.org/widgets/stock-logistics-transport-16-0/-/svg-badge.svg)](https://translation.odoo-community.org/engage/stock-logistics-transport-16-0/?utm_source=widget)
[![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.odoo-community.org/builds?repo=OCA/stock-logistics-transport&target_branch=14.0)
[![Pre-commit Status](https://github.com/OCA/stock-logistics-transport/actions/workflows/pre-commit.yml/badge.svg?branch=14.0)](https://github.com/OCA/stock-logistics-transport/actions/workflows/pre-commit.yml?query=branch%3A14.0)
[![Build Status](https://github.com/OCA/stock-logistics-transport/actions/workflows/test.yml/badge.svg?branch=14.0)](https://github.com/OCA/stock-logistics-transport/actions/workflows/test.yml?query=branch%3A14.0)
[![codecov](https://codecov.io/gh/OCA/stock-logistics-transport/branch/14.0/graph/badge.svg)](https://codecov.io/gh/OCA/stock-logistics-transport)
[![Translation Status](https://translation.odoo-community.org/widgets/stock-logistics-transport-14-0/-/svg-badge.svg)](https://translation.odoo-community.org/engage/stock-logistics-transport-14-0/?utm_source=widget)

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

Expand All @@ -21,11 +21,13 @@ Available addons
----------------
addon | version | maintainers | summary
--- | --- | --- | ---
[shipment_advice](shipment_advice/) | 16.0.1.4.1 | | Manage your (un)loading process through shipment advices.
[shipment_advice_planner](shipment_advice_planner/) | 16.0.1.1.0 | [![jbaudoux](https://github.com/jbaudoux.png?size=30px)](https://github.com/jbaudoux) | This module is used to plan ready transfers in shipment advices.
[shipment_advice_planner_toursolver](shipment_advice_planner_toursolver/) | 16.0.1.0.0 | | Shipment advices planning by geo-optimization (TourSolver)
[shipment_advice_planner_toursolver_queue_job](shipment_advice_planner_toursolver_queue_job/) | 16.0.1.0.0 | | Run TourSolver queries in queue jobs
[stock_dock](stock_dock/) | 16.0.1.0.1 | | Manage the loading docks of your warehouse.
[shipment_advice](shipment_advice/) | 14.0.2.4.0 | | Manage your (un)loading process through shipment advices.
[shipment_advice_bill_auto_complete](shipment_advice_bill_auto_complete/) | 14.0.1.0.0 | [![TDu](https://github.com/TDu.png?size=30px)](https://github.com/TDu) [![jbaudoux](https://github.com/jbaudoux.png?size=30px)](https://github.com/jbaudoux) | Generate vendor bill lines for incoming shipment advice
[shipment_advice_bill_auto_complete_mrp](shipment_advice_bill_auto_complete_mrp/) | 14.0.1.0.0 | [![TDu](https://github.com/TDu.png?size=30px)](https://github.com/TDu) | Glue module between Shipment Advice Bill Auto Complete and MRP
[shipment_advice_reception_planner](shipment_advice_reception_planner/) | 14.0.0.1.0 | | Plan your reception into shipment advices.
[stock_dock](stock_dock/) | 14.0.1.2.0 | | Manage the loading docks of your warehouse.
[stock_location_address](stock_location_address/) | 14.0.1.0.0 | | Adds an address on locations
[stock_location_address_purchase](stock_location_address_purchase/) | 14.0.1.0.0 | | Uses the location address on purchases

[//]: # (end addons)

Expand Down
1 change: 1 addition & 0 deletions oca_dependencies.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# See https://github.com/OCA/odoo-community.org/blob/master/website/Contribution/CONTRIBUTING.rst#oca_dependencies-txt
1 change: 0 additions & 1 deletion requirements.txt

This file was deleted.

2 changes: 1 addition & 1 deletion setup/_metapackage/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.0.20240228.0
14.0.20240602.0
16 changes: 9 additions & 7 deletions setup/_metapackage/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,21 @@
version = f.read().strip()

setuptools.setup(
name="odoo-addons-oca-stock-logistics-transport",
name="odoo14-addons-oca-stock-logistics-transport",
description="Meta package for oca-stock-logistics-transport Odoo addons",
version=version,
install_requires=[
'odoo-addon-shipment_advice>=16.0dev,<16.1dev',
'odoo-addon-shipment_advice_planner>=16.0dev,<16.1dev',
'odoo-addon-shipment_advice_planner_toursolver>=16.0dev,<16.1dev',
'odoo-addon-shipment_advice_planner_toursolver_queue_job>=16.0dev,<16.1dev',
'odoo-addon-stock_dock>=16.0dev,<16.1dev',
'odoo14-addon-shipment_advice',
'odoo14-addon-shipment_advice_bill_auto_complete',
'odoo14-addon-shipment_advice_bill_auto_complete_mrp',
'odoo14-addon-shipment_advice_reception_planner',
'odoo14-addon-stock_dock',
'odoo14-addon-stock_location_address',
'odoo14-addon-stock_location_address_purchase',
],
classifiers=[
'Programming Language :: Python',
'Framework :: Odoo',
'Framework :: Odoo :: 16.0',
'Framework :: Odoo :: 14.0',
]
)
File renamed without changes.

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 6 additions & 0 deletions setup/stock_location_address/setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import setuptools

setuptools.setup(
setup_requires=['setuptools-odoo'],
odoo_addon=True,
)
6 changes: 6 additions & 0 deletions setup/stock_location_address_purchase/setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import setuptools

setuptools.setup(
setup_requires=['setuptools-odoo'],
odoo_addon=True,
)
Loading

0 comments on commit f0a4e11

Please sign in to comment.