Skip to content

Commit 8cee7c4

Browse files
OCA-git-botOCA-git-bot
committed
Merge PR #5490 into 18.0
Signed-off-by MiquelRForgeFlow
2 parents 5810f9a + 4ff0efa commit 8cee7c4

6 files changed

Lines changed: 67 additions & 5 deletions

File tree

‎docsource/modules170-180.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ Module coverage 17.0 -> 18.0
790790
+---------------------------------------------------+----------------------+-------------------------------------------------+
791791
| payment_stripe | Nothing to do | |
792792
+---------------------------------------------------+----------------------+-------------------------------------------------+
793-
| |new| payment_worldline | | |
793+
| payment_worldline | Nothing to do | |
794794
+---------------------------------------------------+----------------------+-------------------------------------------------+
795795
| payment_xendit | | |
796796
+---------------------------------------------------+----------------------+-------------------------------------------------+

‎openupgrade_scripts/scripts/payment/18.0.2.0/noupdate_changes_worldline.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version='1.0' encoding='utf-8' ?>
2+
<odoo>
3+
<record id="payment_method_alipay_plus" model="payment.method">
4+
<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'), ])]"/>
5+
<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'), ])]"/>
6+
</record>
7+
<record id="payment_method_post_finance" model="payment.method">
8+
<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'), ])]"/>
9+
<field name="supported_currency_ids" eval="[Command.set([ ref('base.CHF'), ref('base.EUR'), ])]"/>
10+
</record>
11+
<record id="payment_provider_worldline" model="payment.provider">
12+
<!-- <field name="allow_tokenization"/>-->
13+
<!-- <field name="code"/>-->
14+
<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'), ])]"/>
15+
<!-- <field name="redirect_form_view_id"/>-->
16+
</record>
17+
</odoo>

‎openupgrade_scripts/scripts/payment/18.0.2.0/post-migration.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ def merge_ogone_sips_into_worldline(env):
3737
{"openupgrade_other_fields": "preserve"},
3838
delete=False,
3939
)
40+
if worldline.code == "worldline": # payment_worldline was installed in v17
41+
openupgrade.load_data(env, "payment", "18.0.2.0/noupdate_changes_worldline.xml")
4042

4143

4244
@openupgrade.migrate()
@@ -45,7 +47,7 @@ def migrate(env, version):
4547
openupgrade.load_data(env, "payment", "18.0.2.0/noupdate_changes_manual.xml")
4648
openupgrade.load_data(env, "payment", "18.0.2.0/noupdate_changes.xml")
4749
imd = env["ir.model.data"].search(
48-
[("module", "=", "payment_ogone"), ("name", "=", "payment_provider_ogone")]
50+
[("module", "=", "payment_worldline"), ("name", "=", "payment_provider_ogone")]
4951
)
5052
if imd:
5153
imd.unlink()

‎openupgrade_scripts/scripts/payment/18.0.2.0/pre-migration.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,18 @@
55
_xmlid_renames = [
66
("website_payment.action_activate_stripe", "payment.action_activate_stripe"),
77
("payment.payment_method_emi", "payment.payment_method_emi_india"),
8+
(
9+
"payment_worldline.payment_method_alipay_plus",
10+
"payment.payment_method_alipay_plus",
11+
),
12+
(
13+
"payment_worldline.payment_method_post_finance",
14+
"payment.payment_method_post_finance",
15+
),
16+
(
17+
"payment_worldline.payment_provider_worldline",
18+
"payment.payment_provider_worldline",
19+
),
820
]
921

1022

‎openupgrade_scripts/scripts/payment/18.0.2.0/upgrade_analysis_work.txt‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,33 @@ NEW ir.ui.view: payment.state_header
3232
DEL ir.ui.view: payment.pay_meth_link
3333
DEL ir.ui.view: payment.transaction_status
3434
NEW payment.method: payment.payment_method_abitab (noupdate)
35-
NEW payment.method: payment.payment_method_alipay_plus (noupdate)
35+
NEW payment.method: payment.payment_method_appota (noupdate)
3636
NEW payment.method: payment.payment_method_astropay (noupdate)
3737
NEW payment.method: payment.payment_method_banco_guayaquil (noupdate)
3838
NEW payment.method: payment.payment_method_banco_pichincha (noupdate)
3939
NEW payment.method: payment.payment_method_facilito (noupdate)
40+
NEW payment.method: payment.payment_method_kfh (noupdate)
4041
NEW payment.method: payment.payment_method_nuvei_local (noupdate)
4142
NEW payment.method: payment.payment_method_oxxopay (noupdate)
4243
NEW payment.method: payment.payment_method_paylater_india (noupdate)
43-
NEW payment.method: payment.payment_method_post_finance (noupdate)
4444
NEW payment.method: payment.payment_method_redpagos (noupdate)
4545
NEW payment.method: payment.payment_method_spei (noupdate)
46+
NEW payment.method: payment.payment_method_vietcapital (noupdate)
47+
NEW payment.method: payment.payment_method_viettelpay (noupdate)
48+
NEW payment.method: payment.payment_method_vnptwallet (noupdate)
49+
NEW payment.method: payment.payment_method_vpbank (noupdate)
4650
NEW payment.method: payment.payment_method_webpay (noupdate)
51+
NEW payment.method: payment.payment_method_woori (noupdate)
4752
NEW payment.provider: payment.payment_provider_nuvei (noupdate)
4853
# NOTHING TO DO
4954

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

54-
NEW payment.provider: payment.payment_provider_worldline (noupdate)
59+
NEW payment.method: payment.payment_method_alipay_plus [renamed from payment_worldline module] (noupdate)
60+
NEW payment.method: payment.payment_method_post_finance [renamed from payment_worldline module] (noupdate)
61+
NEW payment.provider: payment.payment_provider_worldline (noupdate) [renamed from payment_worldline module] (noupdate)
5562
DEL payment.provider: payment.payment_provider_sips (noupdate)
63+
# DONE: pre-migration: rename xmlids
5664
# DONE: post-migration: Let's merge the Ogone & SIPS into Worldline. More info in https://github.com/odoo/odoo/pull/175194

‎openupgrade_scripts/scripts/payment_worldline/18.0.1.0/upgrade_analysis_work.txt‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---Models in module 'payment_worldline'---
2+
---Fields in module 'payment_worldline'---
3+
payment_sips / payment.provider / code (False) : selection_keys added: [nuvei, stripe, worldline], removed: [sips]
4+
payment_worldline / payment.provider / code (False) : module is now 'payment_nuvei' ('payment_worldline')
5+
# NOTHING TO DO
6+
7+
payment_sips / payment.provider / sips_key_version (integer) : DEL
8+
payment_sips / payment.provider / sips_merchant_id (char) : DEL
9+
payment_sips / payment.provider / sips_prod_url (char) : DEL
10+
payment_sips / payment.provider / sips_secret (char) : DEL
11+
payment_sips / payment.provider / sips_test_url (char) : DEL
12+
payment_sips / payment.provider / sips_version (char) : DEL
13+
# NOTHING TO DO: wordline has other fields than need new data
14+
15+
---XML records in module 'payment_worldline'---
16+
DEL ir.ui.view: payment_sips.payment_provider_form
17+
DEL ir.ui.view: payment_sips.redirect_form
18+
# NOTHING TO DO
19+
20+
DEL payment.method: payment_worldline.payment_method_alipay_plus [renamed to payment module] (noupdate)
21+
DEL payment.method: payment_worldline.payment_method_post_finance [renamed to payment module] (noupdate)
22+
DEL payment.provider: payment_worldline.payment_provider_worldline [renamed to payment module] (noupdate)
23+
# NOTHING TO DO: handled in payment

0 commit comments

Comments
 (0)