Skip to content

Commit

Permalink
Merge pull request #3460 from ForgeFlow/15.0-imp-analysis
Browse files Browse the repository at this point in the history
[15.0][UPD] apriori + analysis + coverage
  • Loading branch information
pedrobaeza authored Jul 21, 2022
2 parents 10b4162 + 5d65bf2 commit d1a40ce
Show file tree
Hide file tree
Showing 132 changed files with 4,922 additions and 105 deletions.
80 changes: 62 additions & 18 deletions docsource/modules140-150.rst

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion openupgrade_scripts/apriori.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"l10n_eu_service": "l10n_eu_oss",
"mail_client_extension": "mail_plugin",
"payment_ingenico": "payment_ogone",
"website_mail_channel": "website_mail_group",
# OCA/project
"project_stage_state": "project_task_stage_state",
# OCA/...
Expand Down Expand Up @@ -40,8 +41,13 @@
# only used here for upgrade_analysis
renamed_models = {
# odoo
"calendar.contacts": "calendar.filters",
"mail.moderation": "mail.group.moderation",
# OCA/...
}

# only used here for upgrade_analysis
merged_models = {}
merged_models = {
"stock.inventory": "stock.quant",
"stock.inventory.line": "stock.quant",
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ account / account.move / always_tax_exigible (boolean) : NEW is
account / account.move / amount_total_in_currency_signed (float): NEW isfunction: function, stored
account / account.move / narration (text) : now a function
account / account.move / narration (text) : type is now 'html' ('text')
account / account.move / partner_bank_id (many2one) : not a function anymore
account / account.move / tax_cash_basis_created_move_ids (one2many): NEW relation: account.move
account / account.move / tax_cash_basis_move_id (many2one): DEL relation: account.move
account / account.move / tax_cash_basis_origin_move_id (many2one): NEW relation: account.move
Expand Down Expand Up @@ -103,6 +104,8 @@ NEW ir.model.access: account.access_account_payment_method_line
NEW ir.model.access: account.access_account_payment_method_line_readonly
NEW ir.model.access: account.access_account_tax_carryover_line_ac_user
NEW ir.model.access: account.access_account_tax_carryover_line_readonly
ir.model.constraint: account.constraint_account_journal_code_company_uniq (changed definition: is now 'unique(code,company_id)' ('unique(code,name,company_id)'))
NEW ir.model.constraint: account.constraint_account_payment_method_name_code_unique
NEW ir.rule: account.account_tax_carryover_line_comp_rule (noupdate)
NEW ir.ui.menu: account.menu_action_tax_group
NEW ir.ui.view: account.account_analytic_account_view_form_inherit
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<odoo>
<record id="ir_cron_edi_network" model="ir.cron">
<field name="code">model._cron_process_documents_web_services(job_count=20)</field>
<field name="interval_type">days</field>
</record>
</odoo>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---Models in module 'account_edi_ubl_cii'---
new model account.edi.xml.ubl_nl [abstract]
---Fields in module 'account_edi_ubl_cii'---
---XML records in module 'account_edi_ubl_cii'---
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
---Fields in module 'account_fleet'---
---XML records in module 'account_fleet'---
NEW ir.ui.view: account_fleet.account_move_view_tree
NEW ir.ui.view: account_fleet.view_move_line_tree_fleet
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---Models in module 'account_test'---
---Fields in module 'account_test'---
---XML records in module 'account_test'---
---nothing has changed in this module--
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---Models in module 'auth_totp_mail_enforce'---
new model auth.totp.rate.limit.log [transient]
---Fields in module 'auth_totp_mail_enforce'---
---XML records in module 'auth_totp_mail_enforce'---
NEW ir.model.access: auth_totp_mail_enforce.access_auth_totp_rate_limit_log
NEW ir.ui.view: auth_totp_mail_enforce.auth_totp_mail_form
NEW ir.ui.view: auth_totp_mail_enforce.res_config_settings_view_form
NEW mail.template: auth_totp_mail_enforce.mail_template_totp_mail_code (noupdate)
10 changes: 8 additions & 2 deletions openupgrade_scripts/scripts/base/15.0.1.3/noupdate_changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -499,8 +499,6 @@
<record id="ZWL" model="res.currency">
<field name="full_name">Zimbabwean dollar</field>
</record>


<!--
<record id="api_key_admin" model="ir.rule">
<field name="groups" eval="[Command.link(ref('base.group_system'))]"/>
Expand All @@ -511,15 +509,19 @@
<record id="api_key_user" model="ir.rule">
<field name="groups" eval="[ Command.link(ref('base.group_portal')), Command.link(ref('base.group_user')), ]"/>
</record>
-->
<record id="cy" model="res.country">
<field name="currency_id" ref="EUR"/>
</record>
<!--
<record id="default_user" model="res.users">
<field name="groups_id" eval="[Command.link(ref('base.group_partner_manager')), Command.link(ref('base.group_allow_export'))]"/>
</record>
-->
<record id="europe" model="res.country.group">
<field name="country_ids" eval="[Command.set([ ref('at'),ref('be'),ref('bg'),ref('hr'),ref('cy'), ref('cz'),ref('dk'),ref('ee'),ref('fi'),ref('fr'), ref('de'),ref('gr'),ref('hu'),ref('ie'),ref('it'), ref('lv'),ref('lt'),ref('lu'),ref('mt'),ref('nl'), ref('pl'),ref('pt'),ref('ro'),ref('sk'),ref('si'), ref('es'),ref('se')])]"/>
</record>
<!--
<record id="ir_default_system_rule" model="ir.rule">
<field name="groups" eval="[Command.link(ref('base.group_system'))]"/>
</record>
Expand All @@ -538,10 +540,12 @@
<record id="ir_filters_portal_public_rule" model="ir.rule">
<field name="groups" eval="[Command.link(ref('base.group_portal')), Command.link(ref('base.group_public'))]"/>
</record>
-->
<record id="paperformat_batch_deposit" model="report.paperformat">
<field name="header_spacing">15</field>
<field name="margin_bottom">30</field>
</record>
<!--
<record id="partner_admin" model="res.partner">
<field name="image_1920" type="base64" file="base/static/img/avatar_grey.png"/>
</record>
Expand Down Expand Up @@ -569,6 +573,7 @@
<record id="res_partner_rule_private_group" model="ir.rule">
<field name="groups" eval="[ Command.link(ref('base.group_private_addresses')) ]"/>
</record>
-->
<record id="sepa_zone" model="res.country.group">
<field name="country_ids" eval="[Command.set([ ref('ad'),ref('at'),ref('ax'),ref('be'),ref('bg'), ref('bl'),ref('ch'),ref('cy'),ref('cz'),ref('de'), ref('dk'),ref('ee'),ref('es'),ref('fi'),ref('fr'), ref('uk'),ref('gf'),ref('gg'),ref('gi'),ref('gp'), ref('gr'),ref('hr'),ref('hu'),ref('ie'),ref('im'), ref('is'),ref('it'),ref('je'),ref('li'),ref('lt'), ref('lu'),ref('lv'),ref('mc'),ref('mf'),ref('mq'), ref('mt'),ref('nl'),ref('no'),ref('pl'),ref('pm'), ref('pt'),ref('re'),ref('ro'),ref('se'),ref('si'), ref('sk'),ref('sm'),ref('va'),ref('yt')])]"/>
</record>
Expand All @@ -581,6 +586,7 @@
<record id="south_america" model="res.country.group">
<field name="country_ids" eval="[Command.set([ ref('ar'),ref('bo'),ref('br'),ref('cl'),ref('co'), ref('ec'),ref('fk'),ref('gs'),ref('gf'),ref('gy'), ref('py'),ref('pe'),ref('sr'),ref('uy'),ref('ve')])]"/>
</record>
<!--
<record id="user_admin" model="res.users">
<field name="company_ids" eval="[Command.link(ref('main_company'))]"/>
<field name="groups_id" eval="[Command.set([])]"/>
Expand Down
70 changes: 38 additions & 32 deletions openupgrade_scripts/scripts/base/15.0.1.3/upgrade_general_log.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,27 @@ obsolete model adyen.shareholder [module adyen_platforms]
obsolete model adyen.store [module pos_adyen]
obsolete model adyen.terminal [module pos_adyen]
obsolete model adyen.transaction [module adyen_platforms]
obsolete model calendar.contacts [module calendar]
obsolete model calendar.contacts (renamed to calendar.filters) [module calendar]
obsolete model closing.balance.confirm.wizard [module point_of_sale]
obsolete model export.computed.binary [module test_xlsx_export]
obsolete model l10n_eu_service.service_tax_rate [module l10n_eu_oss]
obsolete model l10n_eu_service.wizard [module l10n_eu_oss]
obsolete model lunch.product.report [module lunch]
obsolete model mail.moderation [module mail]
obsolete model mail.moderation (renamed to mail.group.moderation) [module mail]
obsolete model phone.validation.mixin [module phone_validation]
obsolete model project.task.create.sale.order [module sale_timesheet]
obsolete model stock.inventory [module stock]
obsolete model stock.inventory.line [module stock]
obsolete model stock.inventory (renamed to stock.quant) [module stock]
obsolete model stock.inventory.line (renamed to stock.quant) [module stock]
obsolete model website.mass_mailing.popup [module website_mass_mailing]
new model account.accrued.orders.wizard [module account]
new model account.edi.xml.ubl_nl [module account_edi_ubl_cii]
new model account.payment.method.line [module account]
new model account.tax.carryover.line [module account]
new model auth_totp.device [module auth_totp]
new model auth.totp.rate.limit.log [module auth_totp_mail_enforce]
new model avatar.mixin [module base]
new model base.enable.profiling.wizard [module base]
new model calendar.filters [module calendar]
new model calendar.filters (renamed from calendar.contacts) [module calendar]
new model coupon.share [module website_sale_coupon]
new model crm.lead.pls.update [module crm]
new model crm.team.member [module sales_team]
Expand Down Expand Up @@ -53,16 +56,23 @@ new model ir.asset [module base]
new model ir.cron.trigger [module base]
new model ir.profile [module base]
new model l10n_ec.sri.payment [module l10n_ec]
new model l10n_eg_edi.activity.type [module l10n_eg_edi_eta]
new model l10n_eg_edi.thumb.drive [module l10n_eg_edi_eta]
new model l10n_eg_edi.uom.code [module l10n_eg_edi_eta]
new model l10n_eg.eta.account.tax.mixin [module l10n_eg]
new model mail.channel.rtc.session [module mail]
new model mail.composer.mixin [module mail]
new model mail.group [module mail_group]
new model mail.group.member [module mail_group]
new model mail.group.message [module mail_group]
new model mail.group.message.reject [module mail_group]
new model mail.group.moderation [module mail_group]
new model mail.group.moderation (renamed from mail.moderation) [module mail_group]
new model mail.guest [module mail]
new model mail.ice.server [module mail]
new model mail.message.reaction [module mail]
new model mail.test.composer.mixin [module test_mail]
new model mail.test.lang [module test_mail]
new model mail.test.track.monetary [module test_mail]
new model mailing.contact.to.list [module mass_mailing]
new model mrp.workcenter.tag [module mrp]
new model payment.refund.wizard [module payment]
Expand Down Expand Up @@ -93,18 +103,22 @@ new model stock.replenishment.info [module stock]
new model stock.request.count [module stock]
new model stock.storage.category [module stock]
new model stock.storage.category.capacity [module stock]
new model test_inherit.mixin [module test_inherit]
new model test_new_api.model_constrained_unlinks [module test_new_api]
new model test_read_group.task [module test_read_group]
new model test_read_group.user [module test_read_group]
new model theme.ir.asset [module website]
new model website.base.unit [module website_sale]
new model website.configurator.feature [module website]
new model website.searchable.mixin [module website]
---Fields in module 'general'---
# 10818 fields matched,
# Direct match: 10712
# Found in other module: 106
# 12743 fields matched,
# Direct match: 12629
# Found in other module: 114
# Found with different type: 0
# In obsolete models: 236
# New columns: 1698
# Not matched: 596
# In obsolete models: 166
# New columns: 1871
# Not matched: 618
---XML records in module 'general'---
ERROR: module not in list of installed modules:
---Models in module 'adyen_platforms'---
Expand Down Expand Up @@ -218,6 +232,7 @@ DEL ir.model.access: adyen_platforms.access_adyen_bank_account_group_erp_manager
DEL ir.model.access: adyen_platforms.access_adyen_payout_group_erp_manager
DEL ir.model.access: adyen_platforms.access_adyen_shareholder_group_erp_manager
DEL ir.model.access: adyen_platforms.access_adyen_transaction_group_erp_manager
DEL ir.model.constraint: adyen_platforms.constraint_adyen_account_adyen_uuid_uniq
DEL ir.ui.view: adyen_platforms.adyen_account_view_form
DEL ir.ui.view: adyen_platforms.adyen_bank_account_view_form
DEL ir.ui.view: adyen_platforms.adyen_payout_view_form
Expand Down Expand Up @@ -275,6 +290,7 @@ DEL ir.actions.act_window: crm_iap_lead_website.crm_reveal_view_action [renamed
DEL ir.cron: crm_iap_lead_website.ir_cron_crm_reveal_lead [renamed to website_crm_iap_reveal module] (noupdate)
DEL ir.model.access: crm_iap_lead_website.access_crm_reveal_rule
DEL ir.model.access: crm_iap_lead_website.access_crm_reveal_view
DEL ir.model.constraint: crm_iap_lead_website.constraint_crm_reveal_rule_limit_extra_contacts [renamed to website_crm_iap_reveal module]
DEL ir.ui.menu: crm_iap_lead_website.crm_reveal_rule_menu_action [renamed to website_crm_iap_reveal module]
DEL ir.ui.menu: crm_iap_lead_website.crm_reveal_view_menu_action [renamed to website_crm_iap_reveal module]
DEL ir.ui.view: crm_iap_lead_website.crm_lead_view_graph
Expand Down Expand Up @@ -303,6 +319,16 @@ ERROR: module not in list of installed modules:
---XML records in module 'odoo_referral'---
DEL ir.ui.view: odoo_referral.assets_backend
ERROR: module not in list of installed modules:
---Models in module 'payment_adyen_paybylink'---
---Fields in module 'payment_adyen_paybylink'---
payment_adyen_paybylink / payment.acquirer / adyen_api_key (char) : module is now 'payment_adyen' ('payment_adyen_paybylink')
payment_adyen_paybylink / payment.acquirer / adyen_checkout_api_url (char) : module is now 'payment_adyen' ('payment_adyen_paybylink')
payment_adyen_paybylink / payment.acquirer / adyen_hmac_key (char) : module is now 'payment_adyen' ('payment_adyen_paybylink')
payment_adyen_paybylink / payment.acquirer / adyen_skin_code (False) : DEL mode: modify
payment_adyen_paybylink / payment.acquirer / adyen_skin_hmac_key (False) : DEL mode: modify
---XML records in module 'payment_adyen_paybylink'---
DEL ir.ui.view: payment_adyen_paybylink.acquirer_form_adyen
ERROR: module not in list of installed modules:
---Models in module 'payment_odoo_by_adyen'---
---Fields in module 'payment_odoo_by_adyen'---
payment_odoo_by_adyen / payment.acquirer / odoo_adyen_payout_id (many2one): DEL relation: adyen.payout
Expand All @@ -312,23 +338,3 @@ payment_odoo_by_adyen / payment.token / odoo_adyen_payment_method_typ
---XML records in module 'payment_odoo_by_adyen'---
DEL ir.ui.view: payment_odoo_by_adyen.acquirer_form_odoo_by_adyen
DEL ir.ui.view: payment_odoo_by_adyen.odoo_by_adyen_form (noupdate)
ERROR: module not in list of installed modules:
---Models in module 'website_mail_channel'---
---Fields in module 'website_mail_channel'---
---XML records in module 'website_mail_channel'---
DEL ir.ui.view: website_mail_channel.assets_frontend
DEL ir.ui.view: website_mail_channel.assets_snippet_s_channel_js_000
DEL ir.ui.view: website_mail_channel.assets_wysiwyg
DEL ir.ui.view: website_mail_channel.confirmation_subscription
DEL ir.ui.view: website_mail_channel.group_message
DEL ir.ui.view: website_mail_channel.group_messages
DEL ir.ui.view: website_mail_channel.invalid_token_subscription
DEL ir.ui.view: website_mail_channel.mail_channels
DEL ir.ui.view: website_mail_channel.messages_short
DEL ir.ui.view: website_mail_channel.not_subscribed
DEL ir.ui.view: website_mail_channel.remove_external_snippets
DEL ir.ui.view: website_mail_channel.s_channel
DEL ir.ui.view: website_mail_channel.s_channel_options
DEL ir.ui.view: website_mail_channel.snippets
DEL mail.template: website_mail_channel.mail_template_list_subscribe [renamed to mail_group module]
DEL mail.template: website_mail_channel.mail_template_list_unsubscribe [renamed to mail_group module]
11 changes: 11 additions & 0 deletions openupgrade_scripts/scripts/bus/15.0.1.0/pre-migration.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Copyright 2022 ForgeFlow S.L. <https://www.forgeflow.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from openupgradelib import openupgrade


@openupgrade.migrate()
def migrate(env, version):
# Disappeared constraint
openupgrade.delete_sql_constraint_safely(
env, "bus", "bus_presence", "bus_user_presence_unique"
)
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---Models in module 'bus'---
---Fields in module 'bus'---
---XML records in module 'bus'---
DEL ir.model.constraint: bus.constraint_bus_presence_bus_user_presence_unique
DEL ir.ui.view: bus.assets_backend
DEL ir.ui.view: bus.assets_frontend
DEL ir.ui.view: bus.assets_tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
---Fields in module 'bus'---
---XML records in module 'bus'---
DEL ir.model.constraint: bus.constraint_bus_presence_bus_user_presence_unique
# DONE: pre-migration: deleted safely

DEL ir.ui.view: bus.assets_backend
DEL ir.ui.view: bus.assets_frontend
DEL ir.ui.view: bus.assets_tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
Hello <t t-out="object.common_name or ''">Wood Corner</t>,<br/><br/>

<t t-if="is_online and target_customer">
Your appointment <strong t-out="object.event_id.appointment_type_id.name or ''">Schedule a Demo</strong> with <t t-out="object.event_id.user_id.name or ''">Ready Mat</t> has been booked.
Your appointment <strong t-out="object.event_id.appointment_type_id.name or ''">Schedule a Demo</strong> <t t-if="object.event_id.appointment_type_id.category != 'custom'"> with <t t-out="object.event_id.user_id.name or ''">Ready Mat</t></t> has been booked.
</t>
<t t-elif="is_online and target_responsible"><t t-if="customer"><t t-out="customer.name or ''"/> scheduled the following appointment <strong t-out="object.event_id.appointment_type_id.name or ''">Schedule a Demo</strong> with you.
</t><t t-else="">
Expand Down
Loading

0 comments on commit d1a40ce

Please sign in to comment.