Skip to content

Commit 41ba48d

Browse files
OCA-git-botOCA-git-bot
committed
Merge PR #899 into 16.0
Signed-off-by hparfr
2 parents 22f7950 + ec12ac6 commit 41ba48d

24 files changed

+1094
-0
lines changed

‎delivery_package_fee/tests/test_package_fee.py

+11
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,16 @@ def test_package_fee_simple_with_fiscal_position_tax(self):
154154
"include_base_amount": True,
155155
}
156156
)
157+
tax_price_include2 = self.env["account.tax"].create(
158+
{
159+
"name": "15% inc",
160+
"type_tax_use": "sale",
161+
"amount_type": "percent",
162+
"amount": 15,
163+
"price_include": True,
164+
"include_base_amount": True,
165+
}
166+
)
157167
tax_price_exclude = self.env["account.tax"].create(
158168
{
159169
"name": "15% exc",
@@ -180,6 +190,7 @@ def test_package_fee_simple_with_fiscal_position_tax(self):
180190
)
181191

182192
# Setting tax in fiscal position on fee2 product
193+
self.fee1.taxes_id = tax_price_include2
183194
self.fee2.taxes_id = tax_price_include
184195
self.sale.fiscal_position_id = fiscal_position
185196

‎delivery_roulier_geodis_fr/README.rst

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
Delivery Carrier Geodis
2+
=======================
3+
4+
5+
Description
6+
-----------
7+
Send parcels with Geodis.
8+
Labels are generated from WebServices.
9+
Edi file is generated locally and should be sent
10+
by another module.
11+
12+
Glossary
13+
--------
14+
15+
Agency: Geodis's hub your warehouse depends upon.
16+
17+
Configuration
18+
19+
## Create a partner for your agency.
20+
21+
This modules comes with only one partner "Geodis". It's the head quarters of Geodis.
22+
You need to create partners for the agency you depends :
23+
- create a sub contact of "Geodis HQ",
24+
- pay attention to fill correctly name, streets, phone, zip code, country and *SIRET*
25+
- fill "ref" (internal reference) field with the agency id.
26+
27+
28+
Features:
29+
- Multiple Agencies.
30+
31+
Known Issues:
32+
~~~~~~~~~~~~~
33+
34+
- each pack is sent on his own : no handling of numbers of picking
35+
36+
37+
Technical references
38+
--------------------
39+
40+
'Geodis documentation: www.geodis.fr'
41+
42+
Contributors
43+
------------
44+
45+
* Raphaël REVERDY <raphael.reverdy@akretion.com>
46+
* Eric Bouhana <monsieurb@saaslys.com>
47+

‎delivery_roulier_geodis_fr/__init__.py

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
from . import models

‎delivery_roulier_geodis_fr/__manifest__.py

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
2+
3+
{
4+
"name": "Delivery Carrier Geodis (fr)",
5+
"version": "16.0.1.0.0",
6+
"author": "Akretion, Odoo Community Association (OCA)",
7+
"summary": "Generate Label for Geodis logistic",
8+
"maintainers": ["florian-dacosta"],
9+
"category": "Warehouse",
10+
"depends": [
11+
"delivery_roulier",
12+
"delivery_carrier_agency",
13+
"delivery_carrier_deposit",
14+
"delivery_roulier_option",
15+
"partner_address_split",
16+
"l10n_fr_siret",
17+
],
18+
"website": "https://github.com/OCA/delivery-carrier",
19+
"data": [
20+
"data/product.xml",
21+
"data/delivery.xml",
22+
"data/sequence_geodis.xml",
23+
"views/carrier_account_views.xml",
24+
"views/delivery_carrier_agency_views.xml",
25+
],
26+
"demo": [],
27+
"installable": True,
28+
"license": "AGPL-3",
29+
}

‎delivery_roulier_geodis_fr/data/delivery.xml

+130
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<odoo noupdate="1">
3+
4+
<!-- PARTNER -->
5+
<record id="partner_geodis" model="res.partner">
6+
<field name="name">Geodis</field>
7+
<field name="is_company" eval="True" />
8+
<field name="street">26 Quai Charles Pasqua</field>
9+
<field name="zip">92300</field>
10+
<field name="phone">+33156762600</field>
11+
<field name="city">Levallois-Perret</field>
12+
</record>
13+
14+
<record id="default_geodis_calberson_agency_partner" model="res.partner">
15+
<field name="parent_id" ref="partner_geodis" />
16+
<field name="name">Geodis Lille Europe</field>
17+
<field name="is_company" eval="True" />
18+
<field name="street">7 Avenue de la Rotonde</field>
19+
<field name="zip">59160</field>
20+
<field name="phone">+33320085555</field>
21+
<field name="country_id" ref="base.fr" />
22+
<field name="city">Lomme</field>
23+
<field name="siren">457507358</field>
24+
<field name="nic">00044</field>
25+
</record>
26+
27+
<record id="default_geodis_france_exress_agency_partner" model="res.partner">
28+
<field name="parent_id" ref="partner_geodis" />
29+
<field name="name">France Express Lille</field>
30+
<field name="is_company" eval="True" />
31+
<field name="street">2 RUE DES SAPINS</field>
32+
<field name="zip">59810</field>
33+
<field name="phone">+336320161718</field>
34+
<field name="city">LESQUIN</field>
35+
<field name="siren">300089174</field>
36+
<field name="country_id" ref="base.fr" />
37+
<field name="nic">00035</field>
38+
</record>
39+
40+
<!-- DELIVERY CARRIER TEMPLATE OPTION -->
41+
<record id="carrier_opt_tmpl_RDW" model="delivery.carrier.template.option">
42+
<field name="name">On Demand</field>
43+
<field name="code">RDW</field>
44+
</record>
45+
46+
<!-- DELIVERY CARRIER -->
47+
<record id="delivery_carrier_exp" model="delivery.carrier">
48+
<field name="name">Geodis Express</field>
49+
<field name="code">EXP</field>
50+
<field name="delivery_type">geodis_fr</field>
51+
<field name="product_id" ref="geodis_shipping_fee" />
52+
</record>
53+
54+
<record id="delivery_carrier_rap" model="delivery.carrier">
55+
<field name="name">Geodis Rapide</field>
56+
<field name="delivery_type">geodis_fr</field>
57+
<field name="product_id" ref="geodis_shipping_fee" />
58+
<field name="code">RAP</field>
59+
</record>
60+
61+
<record id="delivery_carrier_mes" model="delivery.carrier">
62+
<field name="name">Geodis Messagerie</field>
63+
<field name="delivery_type">geodis_fr</field>
64+
<field name="product_id" ref="geodis_shipping_fee" />
65+
<field name="code">MES</field>
66+
</record>
67+
<record id="delivery_carrier_top24" model="delivery.carrier">
68+
<field name="name">Geodis Top24</field>
69+
<field name="delivery_type">geodis_fr</field>
70+
<field name="product_id" ref="geodis_shipping_fee" />
71+
<field name="code">T24</field>
72+
</record>
73+
74+
<record id="delivery_carrier_cal" model="delivery.carrier">
75+
<field name="name">Geodis Calpack</field>
76+
<field name="delivery_type">geodis_fr</field>
77+
<field name="product_id" ref="geodis_shipping_fee" />
78+
<field name="code">CAL</field>
79+
</record>
80+
81+
<record id="delivery_carrier_p30" model="delivery.carrier">
82+
<field name="name">Geodis Pack30</field>
83+
<field name="delivery_type">geodis_fr</field>
84+
<field name="product_id" ref="geodis_shipping_fee" />
85+
<field name="code">P30</field>
86+
</record>
87+
88+
<record id="delivery_carrier_inp" model="delivery.carrier">
89+
<field name="name">Geodis InterPack</field>
90+
<field name="delivery_type">geodis_fr</field>
91+
<field name="product_id" ref="geodis_shipping_fee" />
92+
<field name="code">INP</field>
93+
</record>
94+
95+
<record id="delivery_carrier_mei" model="delivery.carrier">
96+
<field name="name">Geodis Messagerie Internationnale</field>
97+
<field name="delivery_type">geodis_fr</field>
98+
<field name="product_id" ref="geodis_shipping_fee" />
99+
<field name="code">MEI</field>
100+
</record>
101+
102+
<record id="delivery_carrier_cxi" model="delivery.carrier">
103+
<field name="name">Geodis CXI France Express</field>
104+
<field name="delivery_type">geodis_fr</field>
105+
<field name="product_id" ref="geodis_shipping_fee" />
106+
<field name="code">CXI</field>
107+
</record>
108+
109+
<record id="delivery_carrier_cx" model="delivery.carrier">
110+
<field name="name">Geodis CX Expres</field>
111+
<field name="delivery_type">geodis_fr</field>
112+
<field name="product_id" ref="geodis_shipping_fee" />
113+
<field name="code">CX</field>
114+
</record>
115+
116+
<record id="delivery_carrier_ine" model="delivery.carrier">
117+
<field name="name">Geodis Inter Express</field>
118+
<field name="delivery_type">geodis_fr</field>
119+
<field name="product_id" ref="geodis_shipping_fee" />
120+
<field name="code">INE</field>
121+
</record>
122+
123+
<record id="delivery_carrier_eex" model="delivery.carrier">
124+
<field name="name">Geodis Euro Express</field>
125+
<field name="delivery_type">geodis_fr</field>
126+
<field name="product_id" ref="geodis_shipping_fee" />
127+
<field name="code">EEX</field>
128+
</record>
129+
130+
</odoo>

‎delivery_roulier_geodis_fr/data/product.xml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<odoo noupdate="1">
3+
4+
<record id="geodis_shipping_fee" model="product.product">
5+
<field name="default_code">SHIP_GEODIS</field>
6+
<field name="type">service</field>
7+
<field name="name">Coûts de livraison - GEODIS</field>
8+
</record>
9+
10+
</odoo>

‎delivery_roulier_geodis_fr/data/sequence_geodis.xml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<odoo>
2+
<record model="ir.sequence" id="geodis_nrecep_sequence">
3+
<field name="name">Numerotation des colis geodis</field>
4+
<field name="code">geodis.nrecep.number</field>
5+
<field name="prefix">%(year)s_</field>
6+
<field name="padding">8</field>
7+
<field name="implementation">no_gap</field>
8+
</record>
9+
</odoo>

‎delivery_roulier_geodis_fr/models/__init__.py

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
from . import stock_picking
2+
from . import delivery_carrier
3+
from . import carrier_account
4+
from . import delivery_carrier_agency
5+
from . import deposit
6+
from . import stock_quant_package

‎delivery_roulier_geodis_fr/models/carrier_account.py

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
2+
3+
from odoo import fields, models
4+
5+
6+
class CarrierAccount(models.Model):
7+
_inherit = "carrier.account"
8+
9+
geodis_fr_customer_id = fields.Char(string="Customer Id")
10+
geodis_fr_file_format = fields.Selection(
11+
[("ZPL", "ZPL")], default="ZPL", string="Geodis File Format"
12+
)
13+
geodis_fr_tracking_account = fields.Boolean(
14+
string="Is a Tracking Account",
15+
help="Check this box if this account is used to get the tracking links for geodis",
16+
)

‎delivery_roulier_geodis_fr/models/delivery_carrier.py

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
2+
3+
from odoo import fields, models
4+
5+
6+
class DeliveryCarrier(models.Model):
7+
_inherit = "delivery.carrier"
8+
9+
delivery_type = fields.Selection(
10+
selection_add=[("geodis_fr", "Geodis")],
11+
ondelete={"geodis_fr": "set default"},
12+
)

‎delivery_roulier_geodis_fr/models/delivery_carrier_agency.py

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
2+
3+
from odoo import fields, models
4+
5+
6+
class DeliveryCarrierAgency(models.Model):
7+
_inherit = "delivery.carrier.agency"
8+
9+
geodis_fr_interchange_sender = fields.Char()
10+
geodis_fr_interchange_recipient = fields.Char()
11+
geodis_fr_hub_id = fields.Char()

0 commit comments

Comments
 (0)