Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/delivery/migrations/13.0.1.0/noupdate_changes.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<odoo>
<record id="delivery_carrier_comp_rule" model="ir.rule">
<field name="active"/>
<field name="active" eval="True"/>
<field name="domain_force"> ['|', ('company_id', 'in', company_ids), ('company_id', '=', False)]</field>
</record>
</odoo>
35 changes: 35 additions & 0 deletions addons/delivery/migrations/13.0.1.0/openupgrade_analysis_work.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
---Models in module 'delivery'---
new model choose.delivery.carrier [transient]
# NOTHING TO DO

---Fields in module 'delivery'---
delivery / delivery.carrier / get_return_label_from_portal (boolean): NEW
delivery / delivery.carrier / return_label_on_delivery (boolean): NEW
# NOTHING TO DO: New feature for allowing to print the return label. Default False value is OK for preserving previous behavior (no return label).

delivery / delivery.carrier / invoice_policy (selection) : NEW required, selection_keys: ['estimated', 'real'], req_default: function, hasdefault
# 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

delivery / delivery.carrier / margin (integer) : type is now 'float' ('integer')
# NOTHING TO DO: ORM/PG does the switch automatically

delivery / sale.order / delivery_price (float) : DEL
# NOTHING TO DO: There's no carrier selection now in sale.order, only via wizard, so no computed price is shown in header

delivery / sale.order / invoice_shipping_on_delivery (boolean): DEL
# NOTHING TO DO: The control for adding delivery line on picking is done with delivery.carrier.invoice_policy

delivery / sale.order / recompute_delivery_price (boolean): NEW
# DONE: post-migration: marked as True if it has carrier and still quotation, for having the button "Update shipping cost" as highlighted

---XML records in module 'delivery'---
NEW ir.ui.view: delivery.choose_delivery_carrier_view_form
NEW ir.ui.view: delivery.product_template_hs_code
NEW ir.ui.view: delivery.sale_order_portal_content_inherit_sale_stock_inherit_website_sale_delivery
NEW ir.ui.view: delivery.vpicktree_view_tree
DEL ir.ui.view: delivery.assets_backend
DEL ir.ui.view: delivery_hs_code.product_template_hs_code
# NOTHING TO DO: noupdate="0" records

DEL mail.template: delivery.mail_template_data_delivery_confirmation [renamed to stock module] (noupdate)
# NOTHING TO DO: handled in stock
30 changes: 30 additions & 0 deletions addons/delivery/migrations/13.0.1.0/post-migration.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Copyright 2020 ForgeFlow <http://www.forgeflow.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from openupgradelib import openupgrade


def fill_delivery_carrier_invoice_policy(env):
"""Fill all delivery.carrier records to have `real` value in invoice_policy,
as this is the most similar one to the v12 behavior.
"""
openupgrade.logged_query(
env.cr, "UPDATE delivery_carrier SET invoice_policy = 'real'"
)


def fill_sale_order_recompute_delivery_price(env):
openupgrade.logged_query(
env.cr, """
UPDATE sale_order
SET recompute_delivery_price = TRUE
WHERE carrier_id IS NOT NULL
AND state IN ('draft', 'sent')"""
)


@openupgrade.migrate()
def migrate(env, version):
fill_delivery_carrier_invoice_policy(env)
fill_sale_order_recompute_delivery_price(env)
openupgrade.load_data(
env.cr, "delivery", "migrations/13.0.1.0/noupdate_changes.xml")
15 changes: 15 additions & 0 deletions addons/delivery/migrations/13.0.1.0/pre-migration.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright 2020 ForgeFlow <http://www.forgeflow.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from openupgradelib import openupgrade


_column_renames = {
'sale_order': [
('delivery_price', None), # save value just in case
],
}


@openupgrade.migrate()
def migrate(env, version):
openupgrade.rename_columns(env.cr, _column_renames)
2 changes: 1 addition & 1 deletion odoo/openupgrade/doc/source/modules120-130.rst
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ missing in the new release are marked with |del|.
+----------------------------------------------+-------------------------------------------------+
| |del| decimal_precision | |
+----------------------------------------------+-------------------------------------------------+
|delivery | |
|delivery | Done |
+----------------------------------------------+-------------------------------------------------+
| |del| delivery_hs_code | |
+----------------------------------------------+-------------------------------------------------+
Expand Down