odoo-addon-delivery-state 16.0.1.1.0.9__py3-none-any.whl → 17.0.1.0.0.3__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- odoo/addons/delivery_state/README.rst +66 -58
- odoo/addons/delivery_state/__manifest__.py +2 -2
- odoo/addons/delivery_state/data/mail_template.xml +1 -1
- odoo/addons/delivery_state/i18n/delivery_state.pot +1 -2
- odoo/addons/delivery_state/i18n/es.po +0 -1
- odoo/addons/delivery_state/i18n/fr.po +5 -7
- odoo/addons/delivery_state/i18n/it.po +3 -5
- odoo/addons/delivery_state/models/stock_picking.py +3 -3
- odoo/addons/delivery_state/readme/CONFIGURE.md +12 -0
- odoo/addons/delivery_state/readme/CONTRIBUTORS.md +9 -0
- odoo/addons/delivery_state/readme/DESCRIPTION.md +4 -0
- odoo/addons/delivery_state/readme/USAGE.md +35 -0
- odoo/addons/delivery_state/static/description/index.html +40 -35
- odoo/addons/delivery_state/tests/test_delivery_state.py +12 -8
- odoo/addons/delivery_state/views/res_config_settings_view.xml +30 -31
- odoo/addons/delivery_state/views/stock_picking_views.xml +6 -3
- {odoo_addon_delivery_state-16.0.1.1.0.9.dist-info → odoo_addon_delivery_state-17.0.1.0.0.3.dist-info}/METADATA +72 -67
- odoo_addon_delivery_state-17.0.1.0.0.3.dist-info/RECORD +28 -0
- {odoo_addon_delivery_state-16.0.1.1.0.9.dist-info → odoo_addon_delivery_state-17.0.1.0.0.3.dist-info}/WHEEL +1 -1
- odoo_addon_delivery_state-17.0.1.0.0.3.dist-info/top_level.txt +1 -0
- odoo/addons/delivery_state/migrations/16.0.1.0.0/pre-migration.py +0 -15
- odoo/addons/delivery_state/readme/CONFIGURE.rst +0 -12
- odoo/addons/delivery_state/readme/CONTRIBUTORS.rst +0 -13
- odoo/addons/delivery_state/readme/DESCRIPTION.rst +0 -4
- odoo/addons/delivery_state/readme/USAGE.rst +0 -29
- odoo_addon_delivery_state-16.0.1.1.0.9.dist-info/RECORD +0 -29
- odoo_addon_delivery_state-16.0.1.1.0.9.dist-info/top_level.txt +0 -1
|
@@ -7,7 +7,7 @@ Delivery State
|
|
|
7
7
|
!! This file is generated by oca-gen-addon-readme !!
|
|
8
8
|
!! changes will be overwritten. !!
|
|
9
9
|
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
|
10
|
-
!! source digest: sha256:
|
|
10
|
+
!! source digest: sha256:996ce209cc2b49ef369604f39c2d5df92cd9c0f0f0cb639a789ad5ea76ffb091
|
|
11
11
|
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
|
12
12
|
|
|
13
13
|
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
|
|
@@ -17,21 +17,21 @@ Delivery State
|
|
|
17
17
|
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
|
|
18
18
|
:alt: License: AGPL-3
|
|
19
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/
|
|
20
|
+
:target: https://github.com/OCA/delivery-carrier/tree/17.0/delivery_state
|
|
21
21
|
:alt: OCA/delivery-carrier
|
|
22
22
|
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
|
|
23
|
-
:target: https://translation.odoo-community.org/projects/delivery-carrier-
|
|
23
|
+
:target: https://translation.odoo-community.org/projects/delivery-carrier-17-0/delivery-carrier-17-0-delivery_state
|
|
24
24
|
:alt: Translate me on Weblate
|
|
25
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=
|
|
26
|
+
:target: https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=17.0
|
|
27
27
|
:alt: Try me on Runboat
|
|
28
28
|
|
|
29
29
|
|badge1| |badge2| |badge3| |badge4| |badge5|
|
|
30
30
|
|
|
31
|
-
This module adds additional functions that will be needed for the
|
|
32
|
-
developments. It provides fields to be able to contemplate the
|
|
33
|
-
and also adds a global field so it can have generic
|
|
34
|
-
ones carrier gives us.
|
|
31
|
+
This module adds additional functions that will be needed for the
|
|
32
|
+
carrier developments. It provides fields to be able to contemplate the
|
|
33
|
+
tracking states and also adds a global field so it can have generic
|
|
34
|
+
states in addition to the ones carrier gives us.
|
|
35
35
|
|
|
36
36
|
**Table of contents**
|
|
37
37
|
|
|
@@ -41,51 +41,57 @@ ones carrier gives us.
|
|
|
41
41
|
Configuration
|
|
42
42
|
=============
|
|
43
43
|
|
|
44
|
-
A scheduled action for automating the tracking update for these pickings
|
|
45
|
-
configured going to *Settings > Technical > Scheduled Actions*
|
|
46
|
-
*Update deliveries states*. It will update the pending
|
|
47
|
-
pickings with service providers with tracking
|
|
48
|
-
state (not delivered or cancelled).
|
|
44
|
+
A scheduled action for automating the tracking update for these pickings
|
|
45
|
+
can be configured going to *Settings > Technical > Scheduled Actions*
|
|
46
|
+
and then choosing *Update deliveries states*. It will update the pending
|
|
47
|
+
delivery states for the pickings with service providers with tracking
|
|
48
|
+
methods configured, and in pending state (not delivered or cancelled).
|
|
49
49
|
|
|
50
|
-
In order to send automatic notifications to the customer when the
|
|
51
|
-
customer_delivered:
|
|
50
|
+
In order to send automatic notifications to the customer when the
|
|
51
|
+
picking is customer_delivered:
|
|
52
52
|
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
53
|
+
1. Go to *Inventory > Configuration > Settings*.
|
|
54
|
+
2. Enable the option *Email Confirmation (customer delivered)*.
|
|
55
|
+
3. Choose the template "Delivery: Picking delivered by Email".
|
|
56
56
|
|
|
57
57
|
Usage
|
|
58
58
|
=====
|
|
59
59
|
|
|
60
|
-
Depending on the delivery service provider, the state tracking could be
|
|
61
|
-
less complete, since it could have or not the necessary API
|
|
60
|
+
Depending on the delivery service provider, the state tracking could be
|
|
61
|
+
more or less complete, since it could have or not the necessary API
|
|
62
|
+
calls implemented.
|
|
62
63
|
|
|
63
64
|
With regular methods (fixed, based on rules):
|
|
64
65
|
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
66
|
+
1. Go to Inventory / Operations and open an outgoing pending picking.
|
|
67
|
+
2. In the *Additional Info* tab, assign it a delivery carrier which
|
|
68
|
+
is fixed or based on rules.
|
|
69
|
+
3. Validate the picking and you'll see in the same tab the delivery
|
|
70
|
+
state info with the shipping date and the shipping state.
|
|
71
|
+
4. If enabled, an automatic notification will be sent to the picking
|
|
72
|
+
customer.
|
|
73
|
+
|
|
74
|
+
When service provider methods are implemented, we can follow the same
|
|
75
|
+
steps as described before, but we'll get additionally:
|
|
76
|
+
|
|
77
|
+
1. In the *Additional Info* tab, we'll see button *Update tracking
|
|
78
|
+
state* to manually query the provider API for tracking updates for
|
|
79
|
+
this expedition.
|
|
80
|
+
|
|
81
|
+
2. Depending on the stated returned by the provider, we could get
|
|
82
|
+
these states (field *Carrier State*):
|
|
83
|
+
|
|
84
|
+
- Shipping recorded in carrier
|
|
85
|
+
- In transit
|
|
86
|
+
- Canceled shipment (finished)
|
|
87
|
+
- Incident
|
|
88
|
+
- Warehouse delivered
|
|
89
|
+
- Customer delivered (finished)
|
|
90
|
+
|
|
91
|
+
3. In the field *Tracking state* we'll get the tracking state name
|
|
92
|
+
given by the provider (which is mapped to the ones in this module)
|
|
93
|
+
|
|
94
|
+
4. In the field *Tracking history* we'll get the former states log.
|
|
89
95
|
|
|
90
96
|
Bug Tracker
|
|
91
97
|
===========
|
|
@@ -93,7 +99,7 @@ Bug Tracker
|
|
|
93
99
|
Bugs are tracked on `GitHub Issues <https://github.com/OCA/delivery-carrier/issues>`_.
|
|
94
100
|
In case of trouble, please check there if your issue has already been reported.
|
|
95
101
|
If you spotted it first, help us to smash it by providing a detailed and welcomed
|
|
96
|
-
`feedback <https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_state%0Aversion:%
|
|
102
|
+
`feedback <https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_state%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
|
|
97
103
|
|
|
98
104
|
Do not contact contributors directly about support or help with technical issues.
|
|
99
105
|
|
|
@@ -101,31 +107,33 @@ Credits
|
|
|
101
107
|
=======
|
|
102
108
|
|
|
103
109
|
Authors
|
|
104
|
-
|
|
110
|
+
-------
|
|
105
111
|
|
|
106
112
|
* Trey (www.trey.es)
|
|
107
113
|
* FactorLibre
|
|
108
114
|
* Tecnativa
|
|
109
115
|
|
|
110
116
|
Contributors
|
|
111
|
-
|
|
117
|
+
------------
|
|
118
|
+
|
|
119
|
+
- `Trey <https://www.trey.es>`__:
|
|
120
|
+
|
|
121
|
+
- Roberto Lizana <roberto@trey.es>
|
|
112
122
|
|
|
113
|
-
|
|
123
|
+
- `FactorLibre <https://www.factorlibre.com>`__:
|
|
114
124
|
|
|
115
|
-
|
|
125
|
+
- Zahra Velasco <zahra.velasco@factorlibre.com>
|
|
116
126
|
|
|
117
|
-
|
|
127
|
+
- `Tecnativa <https://www.tecnativa.com>`__:
|
|
118
128
|
|
|
119
|
-
|
|
120
|
-
|
|
129
|
+
- Pedro M. Baeza
|
|
130
|
+
- David Vidal
|
|
131
|
+
- Víctor Martínez
|
|
121
132
|
|
|
122
|
-
|
|
123
|
-
* David Vidal
|
|
124
|
-
* Víctor Martínez
|
|
125
|
-
* Marçal Isern <marsal.isern@qubiq.es>
|
|
133
|
+
- Marçal Isern <marsal.isern@qubiq.es>
|
|
126
134
|
|
|
127
135
|
Maintainers
|
|
128
|
-
|
|
136
|
+
-----------
|
|
129
137
|
|
|
130
138
|
This module is maintained by the OCA.
|
|
131
139
|
|
|
@@ -137,6 +145,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
|
|
|
137
145
|
mission is to support the collaborative development of Odoo features and
|
|
138
146
|
promote its widespread use.
|
|
139
147
|
|
|
140
|
-
This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/
|
|
148
|
+
This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/17.0/delivery_state>`_ project on GitHub.
|
|
141
149
|
|
|
142
150
|
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
|
|
@@ -13,8 +13,8 @@
|
|
|
13
13
|
"website": "https://github.com/OCA/delivery-carrier",
|
|
14
14
|
"license": "AGPL-3",
|
|
15
15
|
"category": "Delivery",
|
|
16
|
-
"version": "
|
|
17
|
-
"depends": ["delivery"],
|
|
16
|
+
"version": "17.0.1.0.0",
|
|
17
|
+
"depends": ["delivery", "stock_delivery"],
|
|
18
18
|
"data": [
|
|
19
19
|
"data/ir_cron_data.xml",
|
|
20
20
|
"data/mail_template.xml",
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<odoo noupdate="1">
|
|
3
3
|
<record id="delivery_state_delivered_notification" model="mail.template">
|
|
4
4
|
<field name="name">Delivery: Picking delivered by Email</field>
|
|
5
|
-
<field name="model_id" ref="
|
|
5
|
+
<field name="model_id" ref="stock.model_stock_picking" />
|
|
6
6
|
<field
|
|
7
7
|
name="subject"
|
|
8
8
|
>Your order {{ object.carrier_tracking_ref or object.name }} from {{ object.company_id.name }}</field>
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
#
|
|
5
5
|
msgid ""
|
|
6
6
|
msgstr ""
|
|
7
|
-
"Project-Id-Version: Odoo Server
|
|
7
|
+
"Project-Id-Version: Odoo Server 17.0\n"
|
|
8
8
|
"Report-Msgid-Bugs-To: \n"
|
|
9
9
|
"Last-Translator: \n"
|
|
10
10
|
"Language-Team: \n"
|
|
@@ -148,7 +148,6 @@ msgstr ""
|
|
|
148
148
|
|
|
149
149
|
#. module: delivery_state
|
|
150
150
|
#: model:ir.actions.server,name:delivery_state.ir_cron_delivery_state_ir_actions_server
|
|
151
|
-
#: model:ir.cron,cron_name:delivery_state.ir_cron_delivery_state
|
|
152
151
|
msgid "Update deliveries states"
|
|
153
152
|
msgstr ""
|
|
154
153
|
|
|
@@ -168,7 +168,6 @@ msgstr "Albarán"
|
|
|
168
168
|
|
|
169
169
|
#. module: delivery_state
|
|
170
170
|
#: model:ir.actions.server,name:delivery_state.ir_cron_delivery_state_ir_actions_server
|
|
171
|
-
#: model:ir.cron,cron_name:delivery_state.ir_cron_delivery_state
|
|
172
171
|
msgid "Update deliveries states"
|
|
173
172
|
msgstr "Actualizar estados de entrega"
|
|
174
173
|
|
|
@@ -117,8 +117,7 @@ msgstr "Plus de mises à jour du transporteur"
|
|
|
117
117
|
|
|
118
118
|
#. module: delivery_state
|
|
119
119
|
#: model_terms:ir.ui.view,arch_db:delivery_state.res_config_settings_view_form
|
|
120
|
-
msgid ""
|
|
121
|
-
"Send an automatic confirmation email when Delivery Orders are delivered"
|
|
120
|
+
msgid "Send an automatic confirmation email when Delivery Orders are delivered"
|
|
122
121
|
msgstr ""
|
|
123
122
|
"Envoyer un email de confirmation automatique quand les Livraisons sont "
|
|
124
123
|
"livrées"
|
|
@@ -155,7 +154,6 @@ msgstr "Transfert"
|
|
|
155
154
|
|
|
156
155
|
#. module: delivery_state
|
|
157
156
|
#: model:ir.actions.server,name:delivery_state.ir_cron_delivery_state_ir_actions_server
|
|
158
|
-
#: model:ir.cron,cron_name:delivery_state.ir_cron_delivery_state
|
|
159
157
|
msgid "Update deliveries states"
|
|
160
158
|
msgstr "Mettre à jour les état de livraison"
|
|
161
159
|
|
|
@@ -172,8 +170,8 @@ msgstr "Livré à l'entrepôt"
|
|
|
172
170
|
#. module: delivery_state
|
|
173
171
|
#: model:mail.template,subject:delivery_state.delivery_state_delivered_notification
|
|
174
172
|
msgid ""
|
|
175
|
-
"Your order {{ object.carrier_tracking_ref or object.name }} from {{ "
|
|
176
|
-
"
|
|
173
|
+
"Your order {{ object.carrier_tracking_ref or object.name }} from {{ object."
|
|
174
|
+
"company_id.name }}"
|
|
177
175
|
msgstr ""
|
|
178
|
-
"Votre commande {{ object.carrier_tracking_ref or object.name }} de {{ "
|
|
179
|
-
"
|
|
176
|
+
"Votre commande {{ object.carrier_tracking_ref or object.name }} de {{ object."
|
|
177
|
+
"company_id.name }}"
|
|
@@ -113,8 +113,7 @@ msgstr ""
|
|
|
113
113
|
|
|
114
114
|
#. module: delivery_state
|
|
115
115
|
#: model_terms:ir.ui.view,arch_db:delivery_state.res_config_settings_view_form
|
|
116
|
-
msgid ""
|
|
117
|
-
"Send an automatic confirmation email when Delivery Orders are delivered"
|
|
116
|
+
msgid "Send an automatic confirmation email when Delivery Orders are delivered"
|
|
118
117
|
msgstr ""
|
|
119
118
|
|
|
120
119
|
#. module: delivery_state
|
|
@@ -149,7 +148,6 @@ msgstr ""
|
|
|
149
148
|
|
|
150
149
|
#. module: delivery_state
|
|
151
150
|
#: model:ir.actions.server,name:delivery_state.ir_cron_delivery_state_ir_actions_server
|
|
152
|
-
#: model:ir.cron,cron_name:delivery_state.ir_cron_delivery_state
|
|
153
151
|
msgid "Update deliveries states"
|
|
154
152
|
msgstr ""
|
|
155
153
|
|
|
@@ -166,6 +164,6 @@ msgstr ""
|
|
|
166
164
|
#. module: delivery_state
|
|
167
165
|
#: model:mail.template,subject:delivery_state.delivery_state_delivered_notification
|
|
168
166
|
msgid ""
|
|
169
|
-
"Your order {{ object.carrier_tracking_ref or object.name }} from {{ "
|
|
170
|
-
"
|
|
167
|
+
"Your order {{ object.carrier_tracking_ref or object.name }} from {{ object."
|
|
168
|
+
"company_id.name }}"
|
|
171
169
|
msgstr ""
|
|
@@ -75,9 +75,9 @@ class StockPicking(models.Model):
|
|
|
75
75
|
and p.picking_type_id.code == "outgoing"
|
|
76
76
|
and p.delivery_state == "customer_delivered"
|
|
77
77
|
):
|
|
78
|
-
|
|
79
|
-
item.with_context(force_send=True).
|
|
80
|
-
|
|
78
|
+
source_ref = item.company_id.delivery_state_delivered_mail_template_id
|
|
79
|
+
item.with_context(force_send=True).message_post_with_source(
|
|
80
|
+
source_ref, email_layout_xmlid="mail.mail_notification_light"
|
|
81
81
|
)
|
|
82
82
|
|
|
83
83
|
def write(self, vals):
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
A scheduled action for automating the tracking update for these pickings
|
|
2
|
+
can be configured going to *Settings \> Technical \> Scheduled Actions*
|
|
3
|
+
and then choosing *Update deliveries states*. It will update the pending
|
|
4
|
+
delivery states for the pickings with service providers with tracking
|
|
5
|
+
methods configured, and in pending state (not delivered or cancelled).
|
|
6
|
+
|
|
7
|
+
In order to send automatic notifications to the customer when the
|
|
8
|
+
picking is customer_delivered:
|
|
9
|
+
|
|
10
|
+
> 1. Go to *Inventory \> Configuration \> Settings*.
|
|
11
|
+
> 2. Enable the option *Email Confirmation (customer delivered)*.
|
|
12
|
+
> 3. Choose the template "Delivery: Picking delivered by Email".
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
- [Trey](https://www.trey.es):
|
|
2
|
+
- Roberto Lizana \<<roberto@trey.es>\>
|
|
3
|
+
- [FactorLibre](https://www.factorlibre.com):
|
|
4
|
+
- Zahra Velasco \<<zahra.velasco@factorlibre.com>\>
|
|
5
|
+
- [Tecnativa](https://www.tecnativa.com):
|
|
6
|
+
- Pedro M. Baeza
|
|
7
|
+
- David Vidal
|
|
8
|
+
- Víctor Martínez
|
|
9
|
+
- Marçal Isern \<<marsal.isern@qubiq.es>\>
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
Depending on the delivery service provider, the state tracking could be
|
|
2
|
+
more or less complete, since it could have or not the necessary API
|
|
3
|
+
calls implemented.
|
|
4
|
+
|
|
5
|
+
With regular methods (fixed, based on rules):
|
|
6
|
+
|
|
7
|
+
> 1. Go to Inventory / Operations and open an outgoing pending picking.
|
|
8
|
+
> 2. In the *Additional Info* tab, assign it a delivery carrier which
|
|
9
|
+
> is fixed or based on rules.
|
|
10
|
+
> 3. Validate the picking and you'll see in the same tab the delivery
|
|
11
|
+
> state info with the shipping date and the shipping state.
|
|
12
|
+
> 4. If enabled, an automatic notification will be sent to the picking
|
|
13
|
+
> customer.
|
|
14
|
+
|
|
15
|
+
When service provider methods are implemented, we can follow the same
|
|
16
|
+
steps as described before, but we'll get additionally:
|
|
17
|
+
|
|
18
|
+
> 1. In the *Additional Info* tab, we'll see button *Update tracking
|
|
19
|
+
> state* to manually query the provider API for tracking updates for
|
|
20
|
+
> this expedition.
|
|
21
|
+
>
|
|
22
|
+
> 2. Depending on the stated returned by the provider, we could get
|
|
23
|
+
> these states (field *Carrier State*):
|
|
24
|
+
>
|
|
25
|
+
> > - Shipping recorded in carrier
|
|
26
|
+
> > - In transit
|
|
27
|
+
> > - Canceled shipment (finished)
|
|
28
|
+
> > - Incident
|
|
29
|
+
> > - Warehouse delivered
|
|
30
|
+
> > - Customer delivered (finished)
|
|
31
|
+
>
|
|
32
|
+
> 3. In the field *Tracking state* we'll get the tracking state name
|
|
33
|
+
> given by the provider (which is mapped to the ones in this module)
|
|
34
|
+
>
|
|
35
|
+
> 4. In the field *Tracking history* we'll get the former states log.
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
<?xml version="1.0" encoding="utf-8"?>
|
|
2
1
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
|
3
2
|
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
|
|
4
3
|
<head>
|
|
@@ -9,10 +8,11 @@
|
|
|
9
8
|
|
|
10
9
|
/*
|
|
11
10
|
:Author: David Goodger (goodger@python.org)
|
|
12
|
-
:Id: $Id: html4css1.css
|
|
11
|
+
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
|
|
13
12
|
:Copyright: This stylesheet has been placed in the public domain.
|
|
14
13
|
|
|
15
14
|
Default cascading style sheet for the HTML output of Docutils.
|
|
15
|
+
Despite the name, some widely supported CSS2 features are used.
|
|
16
16
|
|
|
17
17
|
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
|
|
18
18
|
customize this style sheet.
|
|
@@ -275,7 +275,7 @@ pre.literal-block, pre.doctest-block, pre.math, pre.code {
|
|
|
275
275
|
margin-left: 2em ;
|
|
276
276
|
margin-right: 2em }
|
|
277
277
|
|
|
278
|
-
pre.code .ln { color:
|
|
278
|
+
pre.code .ln { color: gray; } /* line numbers */
|
|
279
279
|
pre.code, code { background-color: #eeeeee }
|
|
280
280
|
pre.code .comment, code .comment { color: #5C6576 }
|
|
281
281
|
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
|
|
@@ -301,7 +301,7 @@ span.option {
|
|
|
301
301
|
span.pre {
|
|
302
302
|
white-space: pre }
|
|
303
303
|
|
|
304
|
-
span.problematic {
|
|
304
|
+
span.problematic, pre.problematic {
|
|
305
305
|
color: red }
|
|
306
306
|
|
|
307
307
|
span.section-subtitle {
|
|
@@ -367,13 +367,13 @@ ul.auto-toc {
|
|
|
367
367
|
!! This file is generated by oca-gen-addon-readme !!
|
|
368
368
|
!! changes will be overwritten. !!
|
|
369
369
|
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
|
370
|
-
!! source digest: sha256:
|
|
370
|
+
!! source digest: sha256:996ce209cc2b49ef369604f39c2d5df92cd9c0f0f0cb639a789ad5ea76ffb091
|
|
371
371
|
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
|
|
372
|
-
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/delivery-carrier/tree/
|
|
373
|
-
<p>This module adds additional functions that will be needed for the
|
|
374
|
-
developments. It provides fields to be able to contemplate the
|
|
375
|
-
and also adds a global field so it can have generic
|
|
376
|
-
ones carrier gives us.</p>
|
|
372
|
+
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/delivery-carrier/tree/17.0/delivery_state"><img alt="OCA/delivery-carrier" src="https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/delivery-carrier-17-0/delivery-carrier-17-0-delivery_state"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
|
|
373
|
+
<p>This module adds additional functions that will be needed for the
|
|
374
|
+
carrier developments. It provides fields to be able to contemplate the
|
|
375
|
+
tracking states and also adds a global field so it can have generic
|
|
376
|
+
states in addition to the ones carrier gives us.</p>
|
|
377
377
|
<p><strong>Table of contents</strong></p>
|
|
378
378
|
<div class="contents local topic" id="contents">
|
|
379
379
|
<ul class="simple">
|
|
@@ -390,13 +390,13 @@ ones carrier gives us.</p>
|
|
|
390
390
|
</div>
|
|
391
391
|
<div class="section" id="configuration">
|
|
392
392
|
<h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
|
|
393
|
-
<p>A scheduled action for automating the tracking update for these pickings
|
|
394
|
-
configured going to <em>Settings > Technical > Scheduled Actions</em>
|
|
395
|
-
<em>Update deliveries states</em>. It will update the pending
|
|
396
|
-
pickings with service providers with tracking
|
|
397
|
-
state (not delivered or cancelled).</p>
|
|
398
|
-
<p>In order to send automatic notifications to the customer when the
|
|
399
|
-
customer_delivered:</p>
|
|
393
|
+
<p>A scheduled action for automating the tracking update for these pickings
|
|
394
|
+
can be configured going to <em>Settings > Technical > Scheduled Actions</em>
|
|
395
|
+
and then choosing <em>Update deliveries states</em>. It will update the pending
|
|
396
|
+
delivery states for the pickings with service providers with tracking
|
|
397
|
+
methods configured, and in pending state (not delivered or cancelled).</p>
|
|
398
|
+
<p>In order to send automatic notifications to the customer when the
|
|
399
|
+
picking is customer_delivered:</p>
|
|
400
400
|
<blockquote>
|
|
401
401
|
<ol class="arabic simple">
|
|
402
402
|
<li>Go to <em>Inventory > Configuration > Settings</em>.</li>
|
|
@@ -407,28 +407,31 @@ customer_delivered:</p>
|
|
|
407
407
|
</div>
|
|
408
408
|
<div class="section" id="usage">
|
|
409
409
|
<h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
|
|
410
|
-
<p>Depending on the delivery service provider, the state tracking could be
|
|
411
|
-
less complete, since it could have or not the necessary API
|
|
410
|
+
<p>Depending on the delivery service provider, the state tracking could be
|
|
411
|
+
more or less complete, since it could have or not the necessary API
|
|
412
|
+
calls implemented.</p>
|
|
412
413
|
<p>With regular methods (fixed, based on rules):</p>
|
|
413
414
|
<blockquote>
|
|
414
415
|
<ol class="arabic simple">
|
|
415
416
|
<li>Go to Inventory / Operations and open an outgoing pending picking.</li>
|
|
416
|
-
<li>In the <em>Additional Info</em> tab, assign it a delivery carrier which
|
|
417
|
-
based on rules.</li>
|
|
418
|
-
<li>Validate the picking and you’ll see in the same tab the delivery
|
|
419
|
-
info with the shipping date and the shipping state.</li>
|
|
420
|
-
<li>If enabled, an automatic notification will be sent to the picking
|
|
417
|
+
<li>In the <em>Additional Info</em> tab, assign it a delivery carrier which
|
|
418
|
+
is fixed or based on rules.</li>
|
|
419
|
+
<li>Validate the picking and you’ll see in the same tab the delivery
|
|
420
|
+
state info with the shipping date and the shipping state.</li>
|
|
421
|
+
<li>If enabled, an automatic notification will be sent to the picking
|
|
422
|
+
customer.</li>
|
|
421
423
|
</ol>
|
|
422
424
|
</blockquote>
|
|
423
|
-
<p>When service provider methods are implemented, we can follow the same
|
|
424
|
-
described before, but we’ll get additionally:</p>
|
|
425
|
+
<p>When service provider methods are implemented, we can follow the same
|
|
426
|
+
steps as described before, but we’ll get additionally:</p>
|
|
425
427
|
<blockquote>
|
|
426
428
|
<ol class="arabic">
|
|
427
|
-
<li><p class="first">In the <em>Additional Info</em> tab, we’ll see button <em>Update tracking
|
|
428
|
-
manually query the provider API for tracking updates for
|
|
429
|
+
<li><p class="first">In the <em>Additional Info</em> tab, we’ll see button <em>Update tracking
|
|
430
|
+
state</em> to manually query the provider API for tracking updates for
|
|
431
|
+
this expedition.</p>
|
|
429
432
|
</li>
|
|
430
|
-
<li><p class="first">Depending on the stated returned by the provider, we could get
|
|
431
|
-
states (field <em>Carrier State</em>):</p>
|
|
433
|
+
<li><p class="first">Depending on the stated returned by the provider, we could get
|
|
434
|
+
these states (field <em>Carrier State</em>):</p>
|
|
432
435
|
<blockquote>
|
|
433
436
|
<ul class="simple">
|
|
434
437
|
<li>Shipping recorded in carrier</li>
|
|
@@ -440,8 +443,8 @@ states (field <em>Carrier State</em>):</p>
|
|
|
440
443
|
</ul>
|
|
441
444
|
</blockquote>
|
|
442
445
|
</li>
|
|
443
|
-
<li><p class="first">In the field <em>Tracking state</em> we’ll get the tracking state name
|
|
444
|
-
the provider (which is mapped to the ones in this module)</p>
|
|
446
|
+
<li><p class="first">In the field <em>Tracking state</em> we’ll get the tracking state name
|
|
447
|
+
given by the provider (which is mapped to the ones in this module)</p>
|
|
445
448
|
</li>
|
|
446
449
|
<li><p class="first">In the field <em>Tracking history</em> we’ll get the former states log.</p>
|
|
447
450
|
</li>
|
|
@@ -453,7 +456,7 @@ the provider (which is mapped to the ones in this module)</p>
|
|
|
453
456
|
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/delivery-carrier/issues">GitHub Issues</a>.
|
|
454
457
|
In case of trouble, please check there if your issue has already been reported.
|
|
455
458
|
If you spotted it first, help us to smash it by providing a detailed and welcomed
|
|
456
|
-
<a class="reference external" href="https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_state%0Aversion:%
|
|
459
|
+
<a class="reference external" href="https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_state%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
|
|
457
460
|
<p>Do not contact contributors directly about support or help with technical issues.</p>
|
|
458
461
|
</div>
|
|
459
462
|
<div class="section" id="credits">
|
|
@@ -489,11 +492,13 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
|
|
|
489
492
|
<div class="section" id="maintainers">
|
|
490
493
|
<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
|
|
491
494
|
<p>This module is maintained by the OCA.</p>
|
|
492
|
-
<a class="reference external image-reference" href="https://odoo-community.org"
|
|
495
|
+
<a class="reference external image-reference" href="https://odoo-community.org">
|
|
496
|
+
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
|
|
497
|
+
</a>
|
|
493
498
|
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
|
|
494
499
|
mission is to support the collaborative development of Odoo features and
|
|
495
500
|
promote its widespread use.</p>
|
|
496
|
-
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/delivery-carrier/tree/
|
|
501
|
+
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/delivery-carrier/tree/17.0/delivery_state">OCA/delivery-carrier</a> project on GitHub.</p>
|
|
497
502
|
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
|
|
498
503
|
</div>
|
|
499
504
|
</div>
|
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
# Copyright 2020 FactorLibre
|
|
3
3
|
# Copyright 2022 Tecnativa - Víctor Martínez
|
|
4
4
|
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
|
|
5
|
+
from unittest.mock import patch
|
|
6
|
+
|
|
5
7
|
from odoo import fields
|
|
6
8
|
from odoo.tests import Form
|
|
7
9
|
from odoo.tests.common import TransactionCase
|
|
@@ -88,13 +90,15 @@ class TestDeliveryState(TransactionCase):
|
|
|
88
90
|
picking.date_delivered = fields.Datetime.now()
|
|
89
91
|
with self.assertRaises(NotImplementedError):
|
|
90
92
|
picking.cancel_shipment()
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
93
|
+
self.assertEqual(picking.delivery_state, "canceled_shipment")
|
|
94
|
+
with patch.object(
|
|
95
|
+
self.env["delivery.carrier"].__class__,
|
|
96
|
+
"fixed_cancel_shipment",
|
|
97
|
+
return_value=True,
|
|
98
|
+
):
|
|
99
|
+
result = self.env["delivery.carrier"].fixed_cancel_shipment()
|
|
100
|
+
self.assertTrue(result)
|
|
101
|
+
self.env["delivery.carrier"].fixed_cancel_shipment.assert_called_once()
|
|
98
102
|
|
|
99
103
|
def test_delivery_confirmation_send(self):
|
|
100
104
|
template = self.env.ref("delivery_state.delivery_state_delivered_notification")
|
|
@@ -104,7 +108,7 @@ class TestDeliveryState(TransactionCase):
|
|
|
104
108
|
picking.company_id.delivery_state_delivered_email_validation = True
|
|
105
109
|
picking.company_id.delivery_state_delivered_mail_template_id = template
|
|
106
110
|
picking.carrier_tracking_ref = "XX-0000"
|
|
107
|
-
picking.move_ids.
|
|
111
|
+
picking.move_ids.quantity = 1
|
|
108
112
|
picking._action_done()
|
|
109
113
|
picking.write({"delivery_state": "customer_delivered"})
|
|
110
114
|
mails = picking.message_ids.filtered(
|
|
@@ -5,42 +5,41 @@
|
|
|
5
5
|
<field name="model">res.config.settings</field>
|
|
6
6
|
<field name="inherit_id" ref="stock.res_config_settings_view_form" />
|
|
7
7
|
<field name="arch" type="xml">
|
|
8
|
-
<xpath expr="//
|
|
9
|
-
<
|
|
10
|
-
|
|
11
|
-
|
|
8
|
+
<xpath expr="//setting[@id='stock_move_email']" position="after">
|
|
9
|
+
<setting
|
|
10
|
+
class="col-12 col-lg-6 o_setting_box"
|
|
11
|
+
id="delivery:state_email"
|
|
12
|
+
>
|
|
13
|
+
<field name="delivery_state_delivered_email_validation" />
|
|
14
|
+
<label
|
|
15
|
+
for="delivery_state_delivered_email_validation"
|
|
16
|
+
string="Email Confirmation (customer delivered)"
|
|
17
|
+
/>
|
|
18
|
+
<span
|
|
19
|
+
class="fa fa-lg fa-building-o"
|
|
20
|
+
title="Values set here are company-specific."
|
|
21
|
+
groups="base.group_multi_company"
|
|
22
|
+
/>
|
|
23
|
+
<div class="text-muted">
|
|
24
|
+
Send an automatic confirmation email when Delivery Orders are delivered
|
|
12
25
|
</div>
|
|
13
|
-
<div
|
|
26
|
+
<div
|
|
27
|
+
class="row mt16"
|
|
28
|
+
invisible="not delivery_state_delivered_email_validation"
|
|
29
|
+
>
|
|
14
30
|
<label
|
|
15
|
-
for="
|
|
16
|
-
string="Email
|
|
31
|
+
for="delivery_state_delivered_mail_template_id"
|
|
32
|
+
string="Email Template"
|
|
33
|
+
class="col-lg-4 o_light_label"
|
|
17
34
|
/>
|
|
18
|
-
<
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
35
|
+
<field
|
|
36
|
+
name="delivery_state_delivered_mail_template_id"
|
|
37
|
+
class="oe_inline"
|
|
38
|
+
required="delivery_state_delivered_email_validation"
|
|
39
|
+
context="{'default_model': 'stock.picking'}"
|
|
22
40
|
/>
|
|
23
|
-
<div class="text-muted">
|
|
24
|
-
Send an automatic confirmation email when Delivery Orders are delivered
|
|
25
|
-
</div>
|
|
26
|
-
<div
|
|
27
|
-
class="row mt16"
|
|
28
|
-
attrs="{'invisible': [('delivery_state_delivered_email_validation', '=', False)]}"
|
|
29
|
-
>
|
|
30
|
-
<label
|
|
31
|
-
for="delivery_state_delivered_mail_template_id"
|
|
32
|
-
string="Email Template"
|
|
33
|
-
class="col-lg-4 o_light_label"
|
|
34
|
-
/>
|
|
35
|
-
<field
|
|
36
|
-
name="delivery_state_delivered_mail_template_id"
|
|
37
|
-
class="oe_inline"
|
|
38
|
-
attrs="{'required': [('delivery_state_delivered_email_validation', '=', True)]}"
|
|
39
|
-
context="{'default_model': 'stock.picking'}"
|
|
40
|
-
/>
|
|
41
|
-
</div>
|
|
42
41
|
</div>
|
|
43
|
-
</
|
|
42
|
+
</setting>
|
|
44
43
|
</xpath>
|
|
45
44
|
</field>
|
|
46
45
|
</record>
|
|
@@ -8,12 +8,15 @@ License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
|
|
|
8
8
|
<odoo>
|
|
9
9
|
<record id="view_picking_withcarrier_out_form" model="ir.ui.view">
|
|
10
10
|
<field name="model">stock.picking</field>
|
|
11
|
-
<field
|
|
11
|
+
<field
|
|
12
|
+
name="inherit_id"
|
|
13
|
+
ref="stock_delivery.view_picking_withcarrier_out_form"
|
|
14
|
+
/>
|
|
12
15
|
<field name="arch" type="xml">
|
|
13
16
|
<xpath expr="//group[@name='carrier_data']" position="after">
|
|
14
17
|
<group
|
|
15
18
|
name="delivery_tracking"
|
|
16
|
-
|
|
19
|
+
invisible="state != 'done' or not carrier_id"
|
|
17
20
|
>
|
|
18
21
|
<field name="date_shipped" />
|
|
19
22
|
<field name="date_delivered" />
|
|
@@ -24,7 +27,7 @@ License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
|
|
|
24
27
|
string="Update tracking state"
|
|
25
28
|
type="object"
|
|
26
29
|
class="oe_inline"
|
|
27
|
-
|
|
30
|
+
invisible="delivery_state in ['customer_delivered', 'canceled_shipment'] or delivery_type in ['base_one_rule', 'fixed']"
|
|
28
31
|
/>
|
|
29
32
|
<field name="tracking_state_history" colspan="3" />
|
|
30
33
|
</group>
|
|
@@ -1,18 +1,17 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
|
-
Name: odoo-addon-
|
|
3
|
-
Version:
|
|
2
|
+
Name: odoo-addon-delivery_state
|
|
3
|
+
Version: 17.0.1.0.0.3
|
|
4
|
+
Requires-Python: >=3.10
|
|
5
|
+
Requires-Dist: odoo>=17.0a,<17.1dev
|
|
4
6
|
Summary: Provides fields to be able to contemplate the tracking statesand also adds a global fields
|
|
5
7
|
Home-page: https://github.com/OCA/delivery-carrier
|
|
8
|
+
License: AGPL-3
|
|
6
9
|
Author: Trey (www.trey.es), FactorLibre, Tecnativa, Odoo Community Association (OCA)
|
|
7
10
|
Author-email: support@odoo-community.org
|
|
8
|
-
License: AGPL-3
|
|
9
|
-
Platform: UNKNOWN
|
|
10
11
|
Classifier: Programming Language :: Python
|
|
11
12
|
Classifier: Framework :: Odoo
|
|
12
|
-
Classifier: Framework :: Odoo ::
|
|
13
|
+
Classifier: Framework :: Odoo :: 17.0
|
|
13
14
|
Classifier: License :: OSI Approved :: GNU Affero General Public License v3
|
|
14
|
-
Requires-Python: >=3.10
|
|
15
|
-
Requires-Dist: odoo <16.1dev,>=16.0a
|
|
16
15
|
|
|
17
16
|
==============
|
|
18
17
|
Delivery State
|
|
@@ -23,7 +22,7 @@ Delivery State
|
|
|
23
22
|
!! This file is generated by oca-gen-addon-readme !!
|
|
24
23
|
!! changes will be overwritten. !!
|
|
25
24
|
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
|
26
|
-
!! source digest: sha256:
|
|
25
|
+
!! source digest: sha256:996ce209cc2b49ef369604f39c2d5df92cd9c0f0f0cb639a789ad5ea76ffb091
|
|
27
26
|
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
|
28
27
|
|
|
29
28
|
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
|
|
@@ -33,21 +32,21 @@ Delivery State
|
|
|
33
32
|
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
|
|
34
33
|
:alt: License: AGPL-3
|
|
35
34
|
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github
|
|
36
|
-
:target: https://github.com/OCA/delivery-carrier/tree/
|
|
35
|
+
:target: https://github.com/OCA/delivery-carrier/tree/17.0/delivery_state
|
|
37
36
|
:alt: OCA/delivery-carrier
|
|
38
37
|
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
|
|
39
|
-
:target: https://translation.odoo-community.org/projects/delivery-carrier-
|
|
38
|
+
:target: https://translation.odoo-community.org/projects/delivery-carrier-17-0/delivery-carrier-17-0-delivery_state
|
|
40
39
|
:alt: Translate me on Weblate
|
|
41
40
|
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
|
|
42
|
-
:target: https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=
|
|
41
|
+
:target: https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=17.0
|
|
43
42
|
:alt: Try me on Runboat
|
|
44
43
|
|
|
45
44
|
|badge1| |badge2| |badge3| |badge4| |badge5|
|
|
46
45
|
|
|
47
|
-
This module adds additional functions that will be needed for the
|
|
48
|
-
developments. It provides fields to be able to contemplate the
|
|
49
|
-
and also adds a global field so it can have generic
|
|
50
|
-
ones carrier gives us.
|
|
46
|
+
This module adds additional functions that will be needed for the
|
|
47
|
+
carrier developments. It provides fields to be able to contemplate the
|
|
48
|
+
tracking states and also adds a global field so it can have generic
|
|
49
|
+
states in addition to the ones carrier gives us.
|
|
51
50
|
|
|
52
51
|
**Table of contents**
|
|
53
52
|
|
|
@@ -57,51 +56,57 @@ ones carrier gives us.
|
|
|
57
56
|
Configuration
|
|
58
57
|
=============
|
|
59
58
|
|
|
60
|
-
A scheduled action for automating the tracking update for these pickings
|
|
61
|
-
configured going to *Settings > Technical > Scheduled Actions*
|
|
62
|
-
*Update deliveries states*. It will update the pending
|
|
63
|
-
pickings with service providers with tracking
|
|
64
|
-
state (not delivered or cancelled).
|
|
59
|
+
A scheduled action for automating the tracking update for these pickings
|
|
60
|
+
can be configured going to *Settings > Technical > Scheduled Actions*
|
|
61
|
+
and then choosing *Update deliveries states*. It will update the pending
|
|
62
|
+
delivery states for the pickings with service providers with tracking
|
|
63
|
+
methods configured, and in pending state (not delivered or cancelled).
|
|
65
64
|
|
|
66
|
-
In order to send automatic notifications to the customer when the
|
|
67
|
-
customer_delivered:
|
|
65
|
+
In order to send automatic notifications to the customer when the
|
|
66
|
+
picking is customer_delivered:
|
|
68
67
|
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
68
|
+
1. Go to *Inventory > Configuration > Settings*.
|
|
69
|
+
2. Enable the option *Email Confirmation (customer delivered)*.
|
|
70
|
+
3. Choose the template "Delivery: Picking delivered by Email".
|
|
72
71
|
|
|
73
72
|
Usage
|
|
74
73
|
=====
|
|
75
74
|
|
|
76
|
-
Depending on the delivery service provider, the state tracking could be
|
|
77
|
-
less complete, since it could have or not the necessary API
|
|
75
|
+
Depending on the delivery service provider, the state tracking could be
|
|
76
|
+
more or less complete, since it could have or not the necessary API
|
|
77
|
+
calls implemented.
|
|
78
78
|
|
|
79
79
|
With regular methods (fixed, based on rules):
|
|
80
80
|
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
81
|
+
1. Go to Inventory / Operations and open an outgoing pending picking.
|
|
82
|
+
2. In the *Additional Info* tab, assign it a delivery carrier which
|
|
83
|
+
is fixed or based on rules.
|
|
84
|
+
3. Validate the picking and you'll see in the same tab the delivery
|
|
85
|
+
state info with the shipping date and the shipping state.
|
|
86
|
+
4. If enabled, an automatic notification will be sent to the picking
|
|
87
|
+
customer.
|
|
88
|
+
|
|
89
|
+
When service provider methods are implemented, we can follow the same
|
|
90
|
+
steps as described before, but we'll get additionally:
|
|
91
|
+
|
|
92
|
+
1. In the *Additional Info* tab, we'll see button *Update tracking
|
|
93
|
+
state* to manually query the provider API for tracking updates for
|
|
94
|
+
this expedition.
|
|
95
|
+
|
|
96
|
+
2. Depending on the stated returned by the provider, we could get
|
|
97
|
+
these states (field *Carrier State*):
|
|
98
|
+
|
|
99
|
+
- Shipping recorded in carrier
|
|
100
|
+
- In transit
|
|
101
|
+
- Canceled shipment (finished)
|
|
102
|
+
- Incident
|
|
103
|
+
- Warehouse delivered
|
|
104
|
+
- Customer delivered (finished)
|
|
105
|
+
|
|
106
|
+
3. In the field *Tracking state* we'll get the tracking state name
|
|
107
|
+
given by the provider (which is mapped to the ones in this module)
|
|
108
|
+
|
|
109
|
+
4. In the field *Tracking history* we'll get the former states log.
|
|
105
110
|
|
|
106
111
|
Bug Tracker
|
|
107
112
|
===========
|
|
@@ -109,7 +114,7 @@ Bug Tracker
|
|
|
109
114
|
Bugs are tracked on `GitHub Issues <https://github.com/OCA/delivery-carrier/issues>`_.
|
|
110
115
|
In case of trouble, please check there if your issue has already been reported.
|
|
111
116
|
If you spotted it first, help us to smash it by providing a detailed and welcomed
|
|
112
|
-
`feedback <https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_state%0Aversion:%
|
|
117
|
+
`feedback <https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_state%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
|
|
113
118
|
|
|
114
119
|
Do not contact contributors directly about support or help with technical issues.
|
|
115
120
|
|
|
@@ -117,31 +122,33 @@ Credits
|
|
|
117
122
|
=======
|
|
118
123
|
|
|
119
124
|
Authors
|
|
120
|
-
|
|
125
|
+
-------
|
|
121
126
|
|
|
122
127
|
* Trey (www.trey.es)
|
|
123
128
|
* FactorLibre
|
|
124
129
|
* Tecnativa
|
|
125
130
|
|
|
126
131
|
Contributors
|
|
127
|
-
|
|
132
|
+
------------
|
|
133
|
+
|
|
134
|
+
- `Trey <https://www.trey.es>`__:
|
|
128
135
|
|
|
129
|
-
|
|
136
|
+
- Roberto Lizana <roberto@trey.es>
|
|
130
137
|
|
|
131
|
-
|
|
138
|
+
- `FactorLibre <https://www.factorlibre.com>`__:
|
|
132
139
|
|
|
133
|
-
|
|
140
|
+
- Zahra Velasco <zahra.velasco@factorlibre.com>
|
|
134
141
|
|
|
135
|
-
|
|
136
|
-
* `Tecnativa <https://www.tecnativa.com>`_:
|
|
142
|
+
- `Tecnativa <https://www.tecnativa.com>`__:
|
|
137
143
|
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
144
|
+
- Pedro M. Baeza
|
|
145
|
+
- David Vidal
|
|
146
|
+
- Víctor Martínez
|
|
147
|
+
|
|
148
|
+
- Marçal Isern <marsal.isern@qubiq.es>
|
|
142
149
|
|
|
143
150
|
Maintainers
|
|
144
|
-
|
|
151
|
+
-----------
|
|
145
152
|
|
|
146
153
|
This module is maintained by the OCA.
|
|
147
154
|
|
|
@@ -153,8 +160,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
|
|
|
153
160
|
mission is to support the collaborative development of Odoo features and
|
|
154
161
|
promote its widespread use.
|
|
155
162
|
|
|
156
|
-
This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/
|
|
163
|
+
This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/17.0/delivery_state>`_ project on GitHub.
|
|
157
164
|
|
|
158
165
|
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
|
|
159
|
-
|
|
160
|
-
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
odoo/addons/delivery_state/README.rst,sha256=1fCh_eGzrd8T9n5mVHu90ryjiIGE-u-CkkEE_qhmbUE,5483
|
|
2
|
+
odoo/addons/delivery_state/__init__.py,sha256=vjC7oVOHhST0bMtkabfH6FeMaqB-PHV4o8HQvIB_5NM,86
|
|
3
|
+
odoo/addons/delivery_state/__manifest__.py,sha256=qmX4AmWkZpIr0PH5XeANVNYds909Xd5906ujgnHI9Jc,809
|
|
4
|
+
odoo/addons/delivery_state/data/ir_cron_data.xml,sha256=HHjOHKSuUPPrGkZ7jhaerKSgxOC_NeGiXQ5OO9Dxszs,551
|
|
5
|
+
odoo/addons/delivery_state/data/mail_template.xml,sha256=Wq6yXmtvzOU7am1lkhovqAkmPK2DIn7fVUIex8KYtTU,1356
|
|
6
|
+
odoo/addons/delivery_state/i18n/delivery_state.pot,sha256=NArFsWLthQLtMuc5bbpAkepEAbhWfTqvZjO9WfSqhiQ,5729
|
|
7
|
+
odoo/addons/delivery_state/i18n/es.po,sha256=t548exglxSJ7yAxKBOIzOp6qGn-wrGee5DalNxZfLhU,8844
|
|
8
|
+
odoo/addons/delivery_state/i18n/fr.po,sha256=AVgT5k2gldpaEMcygME88rpedTP7MJRe7328k2xoNw4,6657
|
|
9
|
+
odoo/addons/delivery_state/i18n/it.po,sha256=6p17QR19oIzUCWaDl3qq08jB4YEdIG2UWLirlPaxHjU,5796
|
|
10
|
+
odoo/addons/delivery_state/models/__init__.py,sha256=cpomDITzUjM_K1CWge5kZH7Geo-FdIyDKzyn-Zkz8B8,184
|
|
11
|
+
odoo/addons/delivery_state/models/delivery_carrier.py,sha256=l65TjoKhwiAAtDAhqGdfcMLiE7QMRGz0szbqYS2xd6c,838
|
|
12
|
+
odoo/addons/delivery_state/models/res_company.py,sha256=TmiRVODzdSApqG8oALxder-cR8gDEkIjQQp2Hu7IbpA,560
|
|
13
|
+
odoo/addons/delivery_state/models/res_config_settings.py,sha256=o8_pVps9gOceamgKwJO1IHyzXhbSoL5KKntFU3fAUNY,548
|
|
14
|
+
odoo/addons/delivery_state/models/stock_picking.py,sha256=sPz4_Wgf7PDLuQxpigVNBwFbK8ZXZJB7zUN6dSigFmw,3238
|
|
15
|
+
odoo/addons/delivery_state/readme/CONFIGURE.md,sha256=qTUnJHkLOG67b53gXQIVaMiw7DerJ54x4TQNRQfqwpM,645
|
|
16
|
+
odoo/addons/delivery_state/readme/CONTRIBUTORS.md,sha256=z9acHu_jLy9kE6Sl3BVDxJuyP7af206ckJ0sgcklsmA,315
|
|
17
|
+
odoo/addons/delivery_state/readme/DESCRIPTION.md,sha256=XvCND-7CFgybGm3C2S6adPRFSJjbU9UXqxa54jeE_JU,254
|
|
18
|
+
odoo/addons/delivery_state/readme/USAGE.md,sha256=bBK1O4dDBWeaYVLiI1o-Vuw-SVic7VHvPmzj0-5wEb8,1424
|
|
19
|
+
odoo/addons/delivery_state/static/description/icon.png,sha256=6xBPJauaFOF0KDHfHgQopSc28kKvxMaeoQFQWZtfZDo,9455
|
|
20
|
+
odoo/addons/delivery_state/static/description/index.html,sha256=bwt1u4tM96uKrIwTAgRGZ3rHbhMuN92o2il6XLZUZsQ,15902
|
|
21
|
+
odoo/addons/delivery_state/tests/__init__.py,sha256=giksTYtSXScTPW6jKMPrb3DDCqTX_0HL1G76G5IJhQY,175
|
|
22
|
+
odoo/addons/delivery_state/tests/test_delivery_state.py,sha256=sjKEFchGQJkFukb1_kI-w-x3nzFPz11dxzKo5waehKg,4726
|
|
23
|
+
odoo/addons/delivery_state/views/res_config_settings_view.xml,sha256=LspyMgUk7H3Ocv9YPEZHMGjUJv7joIMOnPEdTjFmDWs,2129
|
|
24
|
+
odoo/addons/delivery_state/views/stock_picking_views.xml,sha256=lBogGKJvunwI2AhFK1IstgLXTRwDToexQXzZFX_C8-E,1504
|
|
25
|
+
odoo_addon_delivery_state-17.0.1.0.0.3.dist-info/METADATA,sha256=08bm6fm5ohengF2OOHNzabstzAvTKHUwz2Fn3APHrEc,6100
|
|
26
|
+
odoo_addon_delivery_state-17.0.1.0.0.3.dist-info/WHEEL,sha256=8Rd4enx1PCuyDWP4SABqO5Fv8rpaknqp3VzjoFFLa6c,83
|
|
27
|
+
odoo_addon_delivery_state-17.0.1.0.0.3.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
|
|
28
|
+
odoo_addon_delivery_state-17.0.1.0.0.3.dist-info/RECORD,,
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
odoo
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
# Copyright 2022 Tecnativa - David Vidal
|
|
2
|
-
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
|
3
|
-
from openupgradelib import openupgrade
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
@openupgrade.migrate()
|
|
7
|
-
def migrate(env, version):
|
|
8
|
-
openupgrade.logged_query(
|
|
9
|
-
env.cr,
|
|
10
|
-
"""
|
|
11
|
-
UPDATE stock_picking
|
|
12
|
-
SET delivery_state = 'incident'
|
|
13
|
-
WHERE delivery_state = 'incidence'
|
|
14
|
-
""",
|
|
15
|
-
)
|
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
A scheduled action for automating the tracking update for these pickings can be
|
|
2
|
-
configured going to *Settings > Technical > Scheduled Actions* and then choosing
|
|
3
|
-
*Update deliveries states*. It will update the pending delivery states for the
|
|
4
|
-
pickings with service providers with tracking methods configured, and in pending
|
|
5
|
-
state (not delivered or cancelled).
|
|
6
|
-
|
|
7
|
-
In order to send automatic notifications to the customer when the picking is
|
|
8
|
-
customer_delivered:
|
|
9
|
-
|
|
10
|
-
#. Go to *Inventory > Configuration > Settings*.
|
|
11
|
-
#. Enable the option *Email Confirmation (customer delivered)*.
|
|
12
|
-
#. Choose the template "Delivery: Picking delivered by Email".
|
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
* `Trey <https://www.trey.es>`_:
|
|
2
|
-
|
|
3
|
-
* Roberto Lizana <roberto@trey.es>
|
|
4
|
-
|
|
5
|
-
* `FactorLibre <https://www.factorlibre.com>`_:
|
|
6
|
-
|
|
7
|
-
* Zahra Velasco <zahra.velasco@factorlibre.com>
|
|
8
|
-
* `Tecnativa <https://www.tecnativa.com>`_:
|
|
9
|
-
|
|
10
|
-
* Pedro M. Baeza
|
|
11
|
-
* David Vidal
|
|
12
|
-
* Víctor Martínez
|
|
13
|
-
* Marçal Isern <marsal.isern@qubiq.es>
|
|
@@ -1,29 +0,0 @@
|
|
|
1
|
-
Depending on the delivery service provider, the state tracking could be more or
|
|
2
|
-
less complete, since it could have or not the necessary API calls implemented.
|
|
3
|
-
|
|
4
|
-
With regular methods (fixed, based on rules):
|
|
5
|
-
|
|
6
|
-
#. Go to Inventory / Operations and open an outgoing pending picking.
|
|
7
|
-
#. In the *Additional Info* tab, assign it a delivery carrier which is fixed or
|
|
8
|
-
based on rules.
|
|
9
|
-
#. Validate the picking and you'll see in the same tab the delivery state
|
|
10
|
-
info with the shipping date and the shipping state.
|
|
11
|
-
#. If enabled, an automatic notification will be sent to the picking customer.
|
|
12
|
-
|
|
13
|
-
When service provider methods are implemented, we can follow the same steps as
|
|
14
|
-
described before, but we'll get additionally:
|
|
15
|
-
|
|
16
|
-
#. In the *Additional Info* tab, we'll see button *Update tracking state* to
|
|
17
|
-
manually query the provider API for tracking updates for this expedition.
|
|
18
|
-
#. Depending on the stated returned by the provider, we could get these
|
|
19
|
-
states (field *Carrier State*):
|
|
20
|
-
|
|
21
|
-
* Shipping recorded in carrier
|
|
22
|
-
* In transit
|
|
23
|
-
* Canceled shipment (finished)
|
|
24
|
-
* Incident
|
|
25
|
-
* Warehouse delivered
|
|
26
|
-
* Customer delivered (finished)
|
|
27
|
-
#. In the field *Tracking state* we'll get the tracking state name given by
|
|
28
|
-
the provider (which is mapped to the ones in this module)
|
|
29
|
-
#. In the field *Tracking history* we'll get the former states log.
|
|
@@ -1,29 +0,0 @@
|
|
|
1
|
-
odoo/addons/delivery_state/README.rst,sha256=juTINEQK89d-hkxjmjeN5ktxNYQC2EYdDn9WPwh_uqQ,5421
|
|
2
|
-
odoo/addons/delivery_state/__init__.py,sha256=vjC7oVOHhST0bMtkabfH6FeMaqB-PHV4o8HQvIB_5NM,86
|
|
3
|
-
odoo/addons/delivery_state/__manifest__.py,sha256=hR9eUFelFwwkj1NPAk2kkrkcoK_jG8WIcgpvXqyabcY,791
|
|
4
|
-
odoo/addons/delivery_state/data/ir_cron_data.xml,sha256=HHjOHKSuUPPrGkZ7jhaerKSgxOC_NeGiXQ5OO9Dxszs,551
|
|
5
|
-
odoo/addons/delivery_state/data/mail_template.xml,sha256=z4YO06vKidXLbKJjzwiaK21qRebVrdmY7wPZWUBgvHQ,1359
|
|
6
|
-
odoo/addons/delivery_state/i18n/delivery_state.pot,sha256=AacuTAVTqJ7r6S4djDAQlGeyzQMKGedJr7rmtrSs7I0,5794
|
|
7
|
-
odoo/addons/delivery_state/i18n/es.po,sha256=Vj8iKWENfNYQLm9s1r9b_gotW41DLR4uQfquzb5myVU,8909
|
|
8
|
-
odoo/addons/delivery_state/i18n/fr.po,sha256=Gm4hULDIx1umbDb7Gw_C5nJzdqdNnEMBnGYJ6L3lsa4,6725
|
|
9
|
-
odoo/addons/delivery_state/i18n/it.po,sha256=uYb9DBNMkNG5TeeB59I4rOww11qcnR4yyrgzl6vn-9Q,5864
|
|
10
|
-
odoo/addons/delivery_state/migrations/16.0.1.0.0/pre-migration.py,sha256=2urK8m63fvTBQRuY7OmxtvPSmab_DhNxbCAyu1PZkDk,390
|
|
11
|
-
odoo/addons/delivery_state/models/__init__.py,sha256=cpomDITzUjM_K1CWge5kZH7Geo-FdIyDKzyn-Zkz8B8,184
|
|
12
|
-
odoo/addons/delivery_state/models/delivery_carrier.py,sha256=l65TjoKhwiAAtDAhqGdfcMLiE7QMRGz0szbqYS2xd6c,838
|
|
13
|
-
odoo/addons/delivery_state/models/res_company.py,sha256=TmiRVODzdSApqG8oALxder-cR8gDEkIjQQp2Hu7IbpA,560
|
|
14
|
-
odoo/addons/delivery_state/models/res_config_settings.py,sha256=o8_pVps9gOceamgKwJO1IHyzXhbSoL5KKntFU3fAUNY,548
|
|
15
|
-
odoo/addons/delivery_state/models/stock_picking.py,sha256=OYKIEfHD3KCywrqSsNhyB00Y1onr2enesRzgFV0kjnM,3245
|
|
16
|
-
odoo/addons/delivery_state/readme/CONFIGURE.rst,sha256=E88kQgIyEb_vz2wBdOp3IDLFTv5_r9dZpMcQGiMW1es,638
|
|
17
|
-
odoo/addons/delivery_state/readme/CONTRIBUTORS.rst,sha256=IB9_aXCxvOrR93CAqd67ZXmR00T7YAhP8pF_2oPwPXY,313
|
|
18
|
-
odoo/addons/delivery_state/readme/DESCRIPTION.rst,sha256=t1duNHlZ6fyvaO4ipfGB54Qz5Sgy05eh_qPnl2zSBQc,254
|
|
19
|
-
odoo/addons/delivery_state/readme/USAGE.rst,sha256=-eRwxxthi-E3BvmCnhUl5jhsVuLotdXgohIEN_m99nE,1392
|
|
20
|
-
odoo/addons/delivery_state/static/description/icon.png,sha256=6xBPJauaFOF0KDHfHgQopSc28kKvxMaeoQFQWZtfZDo,9455
|
|
21
|
-
odoo/addons/delivery_state/static/description/index.html,sha256=Y9QaXzQJhd0B6ZNq8k4t7mJk1t37Eeoc3nUVFBsdaXM,15858
|
|
22
|
-
odoo/addons/delivery_state/tests/__init__.py,sha256=giksTYtSXScTPW6jKMPrb3DDCqTX_0HL1G76G5IJhQY,175
|
|
23
|
-
odoo/addons/delivery_state/tests/test_delivery_state.py,sha256=VEEVjlK2Wn_7IhYhqagbeg4mEq4Tn-dJToHLepJSbFg,4590
|
|
24
|
-
odoo/addons/delivery_state/views/res_config_settings_view.xml,sha256=oNPtfXmCSV24dQxg2OMYA5tYRJIbYM7qKPuFie1Hbck,2392
|
|
25
|
-
odoo/addons/delivery_state/views/stock_picking_views.xml,sha256=mWUUz5asAtdyjcrHfrWMOZ8gjXqimSz9n1c40lzChPg,1534
|
|
26
|
-
odoo_addon_delivery_state-16.0.1.1.0.9.dist-info/METADATA,sha256=9qPz72Dzlze5JmJFFIMrAU-fCfwDJVEPZ3UQjMSF3aM,6059
|
|
27
|
-
odoo_addon_delivery_state-16.0.1.1.0.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
|
|
28
|
-
odoo_addon_delivery_state-16.0.1.1.0.9.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
|
|
29
|
-
odoo_addon_delivery_state-16.0.1.1.0.9.dist-info/RECORD,,
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
odoo
|