Skip to content

Commit cc3cb7d

Browse files
authored
Merge pull request #2377 from ForgeFlow/13.0-mig-delivery-script
[13.0][MIG] delivery
2 parents efbada3 + bd45b0d commit cc3cb7d

File tree

5 files changed

+82
-2
lines changed

5 files changed

+82
-2
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version='1.0' encoding='utf-8'?>
22
<odoo>
33
<record id="delivery_carrier_comp_rule" model="ir.rule">
4-
<field name="active"/>
4+
<field name="active" eval="True"/>
55
<field name="domain_force"> ['|', ('company_id', 'in', company_ids), ('company_id', '=', False)]</field>
66
</record>
77
</odoo>
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
---Models in module 'delivery'---
2+
new model choose.delivery.carrier [transient]
3+
# NOTHING TO DO
4+
5+
---Fields in module 'delivery'---
6+
delivery / delivery.carrier / get_return_label_from_portal (boolean): NEW
7+
delivery / delivery.carrier / return_label_on_delivery (boolean): NEW
8+
# NOTHING TO DO: New feature for allowing to print the return label. Default False value is OK for preserving previous behavior (no return label).
9+
10+
delivery / delivery.carrier / invoice_policy (selection) : NEW required, selection_keys: ['estimated', 'real'], req_default: function, hasdefault
11+
# DONE: post-migration: Fill all delivery.carrier records to have `real` value in invoice_policy, as this is the most similar one to the v12 behavior
12+
13+
delivery / delivery.carrier / margin (integer) : type is now 'float' ('integer')
14+
# NOTHING TO DO: ORM/PG does the switch automatically
15+
16+
delivery / sale.order / delivery_price (float) : DEL
17+
# NOTHING TO DO: There's no carrier selection now in sale.order, only via wizard, so no computed price is shown in header
18+
19+
delivery / sale.order / invoice_shipping_on_delivery (boolean): DEL
20+
# NOTHING TO DO: The control for adding delivery line on picking is done with delivery.carrier.invoice_policy
21+
22+
delivery / sale.order / recompute_delivery_price (boolean): NEW
23+
# DONE: post-migration: marked as True if it has carrier and still quotation, for having the button "Update shipping cost" as highlighted
24+
25+
---XML records in module 'delivery'---
26+
NEW ir.ui.view: delivery.choose_delivery_carrier_view_form
27+
NEW ir.ui.view: delivery.product_template_hs_code
28+
NEW ir.ui.view: delivery.sale_order_portal_content_inherit_sale_stock_inherit_website_sale_delivery
29+
NEW ir.ui.view: delivery.vpicktree_view_tree
30+
DEL ir.ui.view: delivery.assets_backend
31+
DEL ir.ui.view: delivery_hs_code.product_template_hs_code
32+
# NOTHING TO DO: noupdate="0" records
33+
34+
DEL mail.template: delivery.mail_template_data_delivery_confirmation [renamed to stock module] (noupdate)
35+
# NOTHING TO DO: handled in stock
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Copyright 2020 ForgeFlow <http://www.forgeflow.com>
2+
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
3+
from openupgradelib import openupgrade
4+
5+
6+
def fill_delivery_carrier_invoice_policy(env):
7+
"""Fill all delivery.carrier records to have `real` value in invoice_policy,
8+
as this is the most similar one to the v12 behavior.
9+
"""
10+
openupgrade.logged_query(
11+
env.cr, "UPDATE delivery_carrier SET invoice_policy = 'real'"
12+
)
13+
14+
15+
def fill_sale_order_recompute_delivery_price(env):
16+
openupgrade.logged_query(
17+
env.cr, """
18+
UPDATE sale_order
19+
SET recompute_delivery_price = TRUE
20+
WHERE carrier_id IS NOT NULL
21+
AND state IN ('draft', 'sent')"""
22+
)
23+
24+
25+
@openupgrade.migrate()
26+
def migrate(env, version):
27+
fill_delivery_carrier_invoice_policy(env)
28+
fill_sale_order_recompute_delivery_price(env)
29+
openupgrade.load_data(
30+
env.cr, "delivery", "migrations/13.0.1.0/noupdate_changes.xml")
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Copyright 2020 ForgeFlow <http://www.forgeflow.com>
2+
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
3+
from openupgradelib import openupgrade
4+
5+
6+
_column_renames = {
7+
'sale_order': [
8+
('delivery_price', None), # save value just in case
9+
],
10+
}
11+
12+
13+
@openupgrade.migrate()
14+
def migrate(env, version):
15+
openupgrade.rename_columns(env.cr, _column_renames)

odoo/openupgrade/doc/source/modules120-130.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ missing in the new release are marked with |del|.
123123
+----------------------------------------------+-------------------------------------------------+
124124
| |del| decimal_precision | |
125125
+----------------------------------------------+-------------------------------------------------+
126-
|delivery | |
126+
|delivery | Done |
127127
+----------------------------------------------+-------------------------------------------------+
128128
| |del| delivery_hs_code | |
129129
+----------------------------------------------+-------------------------------------------------+

0 commit comments

Comments
 (0)