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 docsource/modules170-180.rst
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ Module coverage 17.0 -> 18.0
+---------------------------------------------------+----------------------+-------------------------------------------------+
| payment_stripe | Nothing to do | |
+---------------------------------------------------+----------------------+-------------------------------------------------+
| |new| payment_worldline | | |
| payment_worldline | Nothing to do | |
+---------------------------------------------------+----------------------+-------------------------------------------------+
| payment_xendit | | |
+---------------------------------------------------+----------------------+-------------------------------------------------+
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version='1.0' encoding='utf-8' ?>
<odoo>
<record id="payment_method_alipay_plus" model="payment.method">
<field name="supported_country_ids" eval="[Command.set([ ref('base.at'), ref('base.au'), ref('base.be'), ref('base.bg'), ref('base.ch'), ref('base.cr'), ref('base.cy'), ref('base.de'), ref('base.dk'), ref('base.ee'), ref('base.es'), ref('base.fi'), ref('base.fr'), ref('base.gr'), ref('base.hk'), ref('base.hr'), ref('base.hu'), ref('base.ie'), ref('base.is'), ref('base.it'), ref('base.kr'), ref('base.li'), ref('base.lt'), ref('base.lu'), ref('base.lv'), ref('base.mt'), ref('base.my'), ref('base.nl'), ref('base.no'), ref('base.ph'), ref('base.pl'), ref('base.pt'), ref('base.ro'), ref('base.se'), ref('base.si'), ref('base.sk'), ref('base.th'), ref('base.uk'), ])]"/>
<field name="supported_currency_ids" eval="[Command.set([ ref('base.AUD'), ref('base.CHF'), ref('base.DKK'), ref('base.EUR'), ref('base.GBP'), ref('base.HKD'), ref('base.KRW'), ref('base.MYR'), ref('base.NOK'), ref('base.PHP'), ref('base.SEK'), ref('base.THB'), ])]"/>
</record>
<record id="payment_method_post_finance" model="payment.method">
<field name="supported_country_ids" eval="[Command.set([ ref('base.at'), ref('base.be'), ref('base.bg'), ref('base.ch'), ref('base.cy'), ref('base.cz'), ref('base.de'), ref('base.dk'), ref('base.ee'), ref('base.es'), ref('base.fi'), ref('base.fr'), ref('base.gr'), ref('base.hr'), ref('base.hu'), ref('base.ie'), ref('base.it'), ref('base.lt'), ref('base.lu'), ref('base.lv'), ref('base.mt'), ref('base.nl'), ref('base.pl'), ref('base.pt'), ref('base.ro'), ref('base.se'), ref('base.si'), ref('base.sk'), ref('base.uk'), ])]"/>
<field name="supported_currency_ids" eval="[Command.set([ ref('base.CHF'), ref('base.EUR'), ])]"/>
</record>
<record id="payment_provider_worldline" model="payment.provider">
<!-- <field name="allow_tokenization"/>-->
<!-- <field name="code"/>-->
<field name="payment_method_ids" eval="[Command.set([ ref('payment.payment_method_alipay_plus'), ref('payment.payment_method_bancontact'), ref('payment.payment_method_bizum'), ref('payment.payment_method_card'), ref('payment.payment_method_cofidis'), ref('payment.payment_method_eps'), ref('payment.payment_method_floa_bank'), ref('payment.payment_method_ideal'), ref('payment.payment_method_klarna'), ref('payment.payment_method_mbway'), ref('payment.payment_method_multibanco'), ref('payment.payment_method_p24'), ref('payment.payment_method_paypal'), ref('payment.payment_method_post_finance'), ref('payment.payment_method_twint'), ref('payment.payment_method_wechat_pay'), ])]"/>
<!-- <field name="redirect_form_view_id"/>-->
</record>
</odoo>
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ def merge_ogone_sips_into_worldline(env):
{"openupgrade_other_fields": "preserve"},
delete=False,
)
if worldline.code == "worldline": # payment_worldline was installed in v17
openupgrade.load_data(env, "payment", "18.0.2.0/noupdate_changes_worldline.xml")


@openupgrade.migrate()
Expand All @@ -45,7 +47,7 @@ def migrate(env, version):
openupgrade.load_data(env, "payment", "18.0.2.0/noupdate_changes_manual.xml")
openupgrade.load_data(env, "payment", "18.0.2.0/noupdate_changes.xml")
imd = env["ir.model.data"].search(
[("module", "=", "payment_ogone"), ("name", "=", "payment_provider_ogone")]
[("module", "=", "payment_worldline"), ("name", "=", "payment_provider_ogone")]
)
if imd:
imd.unlink()
Expand Down
12 changes: 12 additions & 0 deletions openupgrade_scripts/scripts/payment/18.0.2.0/pre-migration.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@
_xmlid_renames = [
("website_payment.action_activate_stripe", "payment.action_activate_stripe"),
("payment.payment_method_emi", "payment.payment_method_emi_india"),
(
"payment_worldline.payment_method_alipay_plus",
"payment.payment_method_alipay_plus",
),
(
"payment_worldline.payment_method_post_finance",
"payment.payment_method_post_finance",
),
(
"payment_worldline.payment_provider_worldline",
"payment.payment_provider_worldline",
),
]


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,33 @@ NEW ir.ui.view: payment.state_header
DEL ir.ui.view: payment.pay_meth_link
DEL ir.ui.view: payment.transaction_status
NEW payment.method: payment.payment_method_abitab (noupdate)
NEW payment.method: payment.payment_method_alipay_plus (noupdate)
NEW payment.method: payment.payment_method_appota (noupdate)
NEW payment.method: payment.payment_method_astropay (noupdate)
NEW payment.method: payment.payment_method_banco_guayaquil (noupdate)
NEW payment.method: payment.payment_method_banco_pichincha (noupdate)
NEW payment.method: payment.payment_method_facilito (noupdate)
NEW payment.method: payment.payment_method_kfh (noupdate)
NEW payment.method: payment.payment_method_nuvei_local (noupdate)
NEW payment.method: payment.payment_method_oxxopay (noupdate)
NEW payment.method: payment.payment_method_paylater_india (noupdate)
NEW payment.method: payment.payment_method_post_finance (noupdate)
NEW payment.method: payment.payment_method_redpagos (noupdate)
NEW payment.method: payment.payment_method_spei (noupdate)
NEW payment.method: payment.payment_method_vietcapital (noupdate)
NEW payment.method: payment.payment_method_viettelpay (noupdate)
NEW payment.method: payment.payment_method_vnptwallet (noupdate)
NEW payment.method: payment.payment_method_vpbank (noupdate)
NEW payment.method: payment.payment_method_webpay (noupdate)
NEW payment.method: payment.payment_method_woori (noupdate)
NEW payment.provider: payment.payment_provider_nuvei (noupdate)
# NOTHING TO DO

NEW payment.method: payment.payment_method_emi_india (noupdate)
DEL payment.method: payment.payment_method_emi (noupdate)
# DONE: pre-migration: rename xmlids

NEW payment.provider: payment.payment_provider_worldline (noupdate)
NEW payment.method: payment.payment_method_alipay_plus [renamed from payment_worldline module] (noupdate)
NEW payment.method: payment.payment_method_post_finance [renamed from payment_worldline module] (noupdate)
NEW payment.provider: payment.payment_provider_worldline (noupdate) [renamed from payment_worldline module] (noupdate)
DEL payment.provider: payment.payment_provider_sips (noupdate)
# DONE: pre-migration: rename xmlids
# DONE: post-migration: Let's merge the Ogone & SIPS into Worldline. More info in https://github.com/odoo/odoo/pull/175194
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---Models in module 'payment_worldline'---
---Fields in module 'payment_worldline'---
payment_sips / payment.provider / code (False) : selection_keys added: [nuvei, stripe, worldline], removed: [sips]
payment_worldline / payment.provider / code (False) : module is now 'payment_nuvei' ('payment_worldline')
# NOTHING TO DO

payment_sips / payment.provider / sips_key_version (integer) : DEL
payment_sips / payment.provider / sips_merchant_id (char) : DEL
payment_sips / payment.provider / sips_prod_url (char) : DEL
payment_sips / payment.provider / sips_secret (char) : DEL
payment_sips / payment.provider / sips_test_url (char) : DEL
payment_sips / payment.provider / sips_version (char) : DEL
# NOTHING TO DO: wordline has other fields than need new data

---XML records in module 'payment_worldline'---
DEL ir.ui.view: payment_sips.payment_provider_form
DEL ir.ui.view: payment_sips.redirect_form
# NOTHING TO DO

DEL payment.method: payment_worldline.payment_method_alipay_plus [renamed to payment module] (noupdate)
DEL payment.method: payment_worldline.payment_method_post_finance [renamed to payment module] (noupdate)
DEL payment.provider: payment_worldline.payment_provider_worldline [renamed to payment module] (noupdate)
# NOTHING TO DO: handled in payment