Skip to content

Commit 8f86277

Browse files
committed
Merge PR #826 into 17.0
Signed-off-by simahawk
2 parents 07d5ad8 + 9b07dd9 commit 8f86277

25 files changed

+1924
-0
lines changed

delivery_roulier/README.rst

+151
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
========================
2+
Delivery Carrier Roulier
3+
========================
4+
5+
..
6+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
7+
!! This file is generated by oca-gen-addon-readme !!
8+
!! changes will be overwritten. !!
9+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10+
!! source digest: sha256:f1b0fe3fd7a164fd66ce26ba17529c4b1124a199301d27f793e6c756f5a5ec61
11+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
12+
13+
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
14+
:target: https://odoo-community.org/page/development-status
15+
:alt: Beta
16+
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
17+
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
18+
:alt: License: AGPL-3
19+
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github
20+
:target: https://github.com/OCA/delivery-carrier/tree/17.0/delivery_roulier
21+
:alt: OCA/delivery-carrier
22+
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
23+
:target: https://translation.odoo-community.org/projects/delivery-carrier-17-0/delivery-carrier-17-0-delivery_roulier
24+
:alt: Translate me on Weblate
25+
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
26+
:target: https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=17.0
27+
:alt: Try me on Runboat
28+
29+
|badge1| |badge2| |badge3| |badge4| |badge5|
30+
31+
Integration of multiple carriers with Roulier library
32+
33+
Base module for integration with Roulier.
34+
35+
`Roulier <https://pypi.python.org/pypi/roulier>`__ is a python library
36+
which implements carriers API. This modules contains the core functions
37+
for this implementation.
38+
39+
You should install one of the specific modules :
40+
41+
- delivery_roulier_laposte
42+
- delivery_roulier_dpd
43+
- delivery_roulier_geodis
44+
- delivery_carrier_label_gls
45+
- more to come
46+
47+
**Table of contents**
48+
49+
.. contents::
50+
:local:
51+
52+
Configuration
53+
=============
54+
55+
This module needs package in order to work. To generate the carrier
56+
labels on the picking, each products need to be assigned to a
57+
destination package. In case you don't want to bother with the use of
58+
package because the whole content of the picking usually fit in a unique
59+
package, you may consider installing the module
60+
delivery_automatic_package from the same repository (delivery-carrier).
61+
The package will be assigned automatically when asking the carrier
62+
labels.
63+
64+
Usage
65+
=====
66+
67+
Here is some methods you can use for your carrier implementation
68+
allowing to have a consistent code accross different carrier modules:
69+
70+
.. code:: python
71+
72+
def _mycarrier_get_sender(...):
73+
74+
75+
def _mycarrier_get_receiver(...):
76+
77+
78+
def _mycarrier_get_shipping_date(...):
79+
80+
81+
def _mycarrier_get_account(...):
82+
83+
84+
def _mycarrier_get_auth(...):
85+
86+
87+
def _mycarrier_get_service(...):
88+
89+
90+
def _mycarrier_convert_address(...):
91+
92+
Instead of calling super() you can use:
93+
94+
.. code:: python
95+
96+
def _mycarrier_get_service(...):
97+
98+
result = _roulier_get_service(...)
99+
100+
result["specific_key"] = "blabla"
101+
102+
return result
103+
104+
Bug Tracker
105+
===========
106+
107+
Bugs are tracked on `GitHub Issues <https://github.com/OCA/delivery-carrier/issues>`_.
108+
In case of trouble, please check there if your issue has already been reported.
109+
If you spotted it first, help us to smash it by providing a detailed and welcomed
110+
`feedback <https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_roulier%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
111+
112+
Do not contact contributors directly about support or help with technical issues.
113+
114+
Credits
115+
=======
116+
117+
Authors
118+
-------
119+
120+
* Akretion
121+
122+
Contributors
123+
------------
124+
125+
- Raphaël Reverdy <sebastien.beau@akretion.com>
126+
- David Béal <david.beal@akretion.com>
127+
128+
Maintainers
129+
-----------
130+
131+
This module is maintained by the OCA.
132+
133+
.. image:: https://odoo-community.org/logo.png
134+
:alt: Odoo Community Association
135+
:target: https://odoo-community.org
136+
137+
OCA, or the Odoo Community Association, is a nonprofit organization whose
138+
mission is to support the collaborative development of Odoo features and
139+
promote its widespread use.
140+
141+
.. |maintainer-florian-dacosta| image:: https://github.com/florian-dacosta.png?size=40px
142+
:target: https://github.com/florian-dacosta
143+
:alt: florian-dacosta
144+
145+
Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
146+
147+
|maintainer-florian-dacosta|
148+
149+
This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/17.0/delivery_roulier>`_ project on GitHub.
150+
151+
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

delivery_roulier/__init__.py

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
from . import models
2+
3+
from .decorator import implemented_by_carrier

delivery_roulier/__manifest__.py

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# @author Raphael Reverdy <raphael.reverdy@akretion.com>
2+
# David BEAL <david.beal@akretion.com>
3+
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
4+
{
5+
"name": "Delivery Carrier Roulier",
6+
"version": "17.0.1.0.0",
7+
"author": "Akretion,Odoo Community Association (OCA)",
8+
"summary": "Integration of multiple carriers",
9+
"maintainers": ["florian-dacosta"],
10+
"category": "Delivery",
11+
"depends": [
12+
"base_delivery_carrier_label",
13+
"delivery_carrier_account",
14+
],
15+
"website": "https://github.com/OCA/delivery-carrier",
16+
"data": [],
17+
"demo": [
18+
"demo/product.xml",
19+
],
20+
"external_dependencies": {
21+
"python": [
22+
"roulier", # '>0.2.0'
23+
],
24+
},
25+
"installable": True,
26+
"license": "AGPL-3",
27+
}

delivery_roulier/decorator.py

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# @author Raphael Reverdy <raphael.reverdy@akretion.com>
2+
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
3+
4+
from functools import wraps
5+
6+
7+
def implemented_by_carrier(func):
8+
"""Decorator: call _carrier_prefixed method instead.
9+
10+
Usage:
11+
@implemented_by_carrier
12+
def _do_something()
13+
def _laposte_do_something()
14+
def _gls_do_something()
15+
16+
At runtime, picking._do_something() will try to call
17+
the carrier spectific method or fallback to generic _do_something
18+
19+
"""
20+
21+
@wraps(func)
22+
def wrapper(cls, *args, **kwargs):
23+
fun_name = func.__name__
24+
25+
def get_delivery_type(cls, *args, **kwargs):
26+
if hasattr(cls, "delivery_type"):
27+
return cls.delivery_type
28+
pickings = [
29+
obj for obj in args if getattr(obj, "_name", "") == "stock.picking"
30+
]
31+
if len(pickings) > 0:
32+
return pickings[0].delivery_type
33+
if cls[0].carrier_id:
34+
return cls[0].carrier_id.delivery_type
35+
36+
delivery_type = get_delivery_type(cls, *args, **kwargs)
37+
fun = f"_{delivery_type}{fun_name}"
38+
if not hasattr(cls, fun):
39+
fun = "_roulier%s" % (fun_name)
40+
return getattr(cls, fun)(*args, **kwargs)
41+
42+
return wrapper

delivery_roulier/demo/product.xml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<odoo>
3+
4+
<!-- product.product -->
5+
<record id="product_big" model="product.product">
6+
<field name="name">carrier 3.7 kg</field>
7+
<field name="type">product</field>
8+
<field name="weight">3.7</field>
9+
</record>
10+
<record id="product_small" model="product.product">
11+
<field name="name">carrier 1.3 kg</field>
12+
<field name="type">product</field>
13+
<field name="weight">1.3</field>
14+
</record>
15+
16+
</odoo>
+99
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
# Translation of Odoo Server.
2+
# This file contains the translation of the following modules:
3+
# * delivery_roulier
4+
#
5+
msgid ""
6+
msgstr ""
7+
"Project-Id-Version: Odoo Server 17.0\n"
8+
"Report-Msgid-Bugs-To: \n"
9+
"Last-Translator: \n"
10+
"Language-Team: \n"
11+
"MIME-Version: 1.0\n"
12+
"Content-Type: text/plain; charset=UTF-8\n"
13+
"Content-Transfer-Encoding: \n"
14+
"Plural-Forms: \n"
15+
16+
#. module: delivery_roulier
17+
#. odoo-python
18+
#: code:addons/delivery_roulier/models/stock_quant_package.py:0
19+
#, python-format
20+
msgid "Bad input: %s\n"
21+
msgstr ""
22+
23+
#. module: delivery_roulier
24+
#: model:ir.model.fields,field_description:delivery_roulier.field_stock_quant_package__carrier_id
25+
msgid "Carrier"
26+
msgstr ""
27+
28+
#. module: delivery_roulier
29+
#. odoo-python
30+
#: code:addons/delivery_roulier/models/stock_picking.py:0
31+
#, python-format
32+
msgid "No account available with name '%s' for this carrier"
33+
msgstr ""
34+
35+
#. module: delivery_roulier
36+
#. odoo-python
37+
#: code:addons/delivery_roulier/models/stock_picking.py:0
38+
#, python-format
39+
msgid "No packages found for this picking"
40+
msgstr ""
41+
42+
#. module: delivery_roulier
43+
#: model:ir.model,name:delivery_roulier.model_stock_quant_package
44+
msgid "Packages"
45+
msgstr ""
46+
47+
#. module: delivery_roulier
48+
#: model:ir.model,name:delivery_roulier.model_stock_move_line
49+
msgid "Product Moves (Stock Move Line)"
50+
msgstr ""
51+
52+
#. module: delivery_roulier
53+
#. odoo-python
54+
#: code:addons/delivery_roulier/models/stock_quant_package.py:0
55+
#, python-format
56+
msgid ""
57+
"Roulier library Exception for '%(carrier)s' carrier:\n"
58+
"\n"
59+
"%(exception)s\n"
60+
"\n"
61+
"Sent data:\n"
62+
"%(payload)s"
63+
msgstr ""
64+
65+
#. module: delivery_roulier
66+
#: model:ir.model,name:delivery_roulier.model_delivery_carrier
67+
msgid "Shipping Methods"
68+
msgstr ""
69+
70+
#. module: delivery_roulier
71+
#. odoo-python
72+
#: code:addons/delivery_roulier/models/stock_picking.py:0
73+
#, python-format
74+
msgid ""
75+
"Some products have no destination package in picking %s, please add a "
76+
"destination package in order to be able to generate the carrier label."
77+
msgstr ""
78+
79+
#. module: delivery_roulier
80+
#. odoo-python
81+
#: code:addons/delivery_roulier/models/stock_quant_package.py:0
82+
#, python-format
83+
msgid "The tracking url is not available."
84+
msgstr ""
85+
86+
#. module: delivery_roulier
87+
#: model:ir.model,name:delivery_roulier.model_stock_picking
88+
msgid "Transfer"
89+
msgstr ""
90+
91+
#. module: delivery_roulier
92+
#: model:product.template,name:delivery_roulier.product_small_product_template
93+
msgid "carrier 1.3 kg"
94+
msgstr ""
95+
96+
#. module: delivery_roulier
97+
#: model:product.template,name:delivery_roulier.product_big_product_template
98+
msgid "carrier 3.7 kg"
99+
msgstr ""

0 commit comments

Comments
 (0)