diff --git a/docsource/modules170-180.rst b/docsource/modules170-180.rst
index 8bff4cab846..cc11d8a55f7 100644
--- a/docsource/modules170-180.rst
+++ b/docsource/modules170-180.rst
@@ -32,6 +32,8 @@ Module coverage 17.0 -> 18.0
 +---------------------------------------------------+----------------------+-------------------------------------------------+
 | account_peppol                                    |                      |                                                 |
 +---------------------------------------------------+----------------------+-------------------------------------------------+
+| account_peppol_selfbilling                        |                      |                                                 |
++---------------------------------------------------+----------------------+-------------------------------------------------+
 | account_qr_code_emv                               |                      |                                                 |
 +---------------------------------------------------+----------------------+-------------------------------------------------+
 | account_qr_code_sepa                              |                      |                                                 |
diff --git a/openupgrade_scripts/scripts/account/18.0.1.3/upgrade_analysis.txt b/openupgrade_scripts/scripts/account/18.0.1.3/upgrade_analysis.txt
index 3296a2323f9..b0f48097fda 100644
--- a/openupgrade_scripts/scripts/account/18.0.1.3/upgrade_analysis.txt
+++ b/openupgrade_scripts/scripts/account/18.0.1.3/upgrade_analysis.txt
@@ -49,6 +49,7 @@ account      / account.lock_exception   / user_id (many2one)            : NEW re
 account      / account.move             / amount_untaxed_in_currency_signed (float): NEW isfunction: function, stored
 account      / account.move             / audit_trail_message_ids (one2many): NEW relation: mail.message
 account      / account.move             / checked (boolean)             : NEW
+account      / account.move             / delivery_date (date)          : now a function
 account      / account.move             / invoice_currency_rate (float) : NEW hasdefault: compute
 account      / account.move             / is_manually_modified (boolean): NEW
 account      / account.move             / journal_group_id (many2one)   : NEW relation: account.journal.group, stored: False
diff --git a/openupgrade_scripts/scripts/account_peppol_selfbilling/18.0.1.0/upgrade_analysis.txt b/openupgrade_scripts/scripts/account_peppol_selfbilling/18.0.1.0/upgrade_analysis.txt
new file mode 100644
index 00000000000..31d764cbeae
--- /dev/null
+++ b/openupgrade_scripts/scripts/account_peppol_selfbilling/18.0.1.0/upgrade_analysis.txt
@@ -0,0 +1,9 @@
+---Models in module 'account_peppol_selfbilling'---
+---Fields in module 'account_peppol_selfbilling'---
+account_peppol_selfbilling / account.journal          / is_self_billing (boolean)     : NEW
+---XML records in module 'account_peppol_selfbilling'---
+NEW ir.ui.view: account_peppol_selfbilling.account_move_form_inherit_self_billing
+NEW ir.ui.view: account_peppol_selfbilling.report_invoice_document
+NEW ir.ui.view: account_peppol_selfbilling.view_account_journal_form_inherited
+NEW mail.template: account_peppol_selfbilling.email_template_edi_self_billing_credit_note (noupdate)
+NEW mail.template: account_peppol_selfbilling.email_template_edi_self_billing_invoice (noupdate)
diff --git a/openupgrade_scripts/scripts/base/18.0.1.3/upgrade_general_log.txt b/openupgrade_scripts/scripts/base/18.0.1.3/upgrade_general_log.txt
index c4724807f65..7324904c087 100644
--- a/openupgrade_scripts/scripts/base/18.0.1.3/upgrade_general_log.txt
+++ b/openupgrade_scripts/scripts/base/18.0.1.3/upgrade_general_log.txt
@@ -139,7 +139,7 @@ new model website.page.properties.base [module website]
 # Found in other module: 95
 # Found with different type: 8
 # In obsolete models: 34
-# New columns: 1853
+# New columns: 1859
 # Not matched: 846
 ---XML records in module 'general'---
 ERROR: module not in list of installed modules:
diff --git a/openupgrade_scripts/scripts/payment/18.0.2.0/noupdate_changes.xml b/openupgrade_scripts/scripts/payment/18.0.2.0/noupdate_changes.xml
index 437c390d37d..cf8e40d0c55 100644
--- a/openupgrade_scripts/scripts/payment/18.0.2.0/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/payment/18.0.2.0/noupdate_changes.xml
@@ -212,6 +212,10 @@
   <record id="payment_method_shopback" model="payment.method">
     <field name="support_refund">none</field>
   </record>
+  <record id="payment_method_shopeepay" model="payment.method">
+    <field name="supported_country_ids" eval="[Command.set([                          ref('base.id'),                          ref('base.ph'),                          ref('base.th'),                          ref('base.my'),                          ref('base.vn'),                      ])]"/>
+    <field name="supported_currency_ids" eval="[Command.set([                          ref('base.IDR'),                          ref('base.THB'),                          ref('base.MYR'),                          ref('base.VND'),                      ])]"/>
+  </record>
   <record id="payment_method_techcom" model="payment.method">
     <field name="support_refund">none</field>
   </record>
@@ -254,6 +258,9 @@
   <record id="payment_method_vpay" model="payment.method">
     <field name="support_refund">none</field>
   </record>
+  <record id="payment_method_wechat_pay" model="payment.method">
+    <field name="supported_currency_ids" eval="[Command.set([                          ref('base.AUD'),                          ref('base.EUR'),                          ref('base.CAD'),                          ref('base.CNY'),                          ref('base.HKD'),                          ref('base.JPY'),                          ref('base.MYR'),                          ref('base.NZD'),                          ref('base.GBP'),                          ref('base.USD'),                          ref('base.SGD'),                          ref('base.THB'),                      ])]"/>
+  </record>
   <record id="payment_method_welend" model="payment.method">
     <field name="support_refund">none</field>
   </record>
@@ -263,4 +270,7 @@
   <record id="payment_provider_razorpay" model="payment.provider">
     <field name="payment_method_ids" eval="[Command.set([                          ref('payment.payment_method_card'),                          ref('payment.payment_method_netbanking'),                          ref('payment.payment_method_upi'),                          ref('payment.payment_method_wallets_india'),                          ref('payment.payment_method_paylater_india'),                          ref('payment.payment_method_emi_india'),                      ])]"/>
   </record>
+  <record id="payment_provider_xendit" model="payment.provider">
+    <field name="payment_method_ids" eval="[(6, 0, [                    ref('payment.payment_method_7eleven'),                    ref('payment.payment_method_akulaku'),                    ref('payment.payment_method_appota'),                    ref('payment.payment_method_bangkok_bank'),                    ref('payment.payment_method_bank_bca'),                    ref('payment.payment_method_bank_permata'),                    ref('payment.payment_method_billease'),                    ref('payment.payment_method_bni'),                    ref('payment.payment_method_bri'),                    ref('payment.payment_method_bsi'),                    ref('payment.payment_method_card'),                    ref('payment.payment_method_cashalo'),                    ref('payment.payment_method_cebuana'),                    ref('payment.payment_method_cimb_niaga'),                    ref('payment.payment_method_dana'),                    ref('payment.payment_method_fpx'),                    ref('payment.payment_method_gcash'),                    ref('payment.payment_method_grabpay'),                    ref('payment.payment_method_jeniuspay'),                    ref('payment.payment_method_kfh'),                    ref('payment.payment_method_kredivo'),                    ref('payment.payment_method_krungthai_bank'),                    ref('payment.payment_method_linepay'),                    ref('payment.payment_method_linkaja'),                    ref('payment.payment_method_mandiri'),                    ref('payment.payment_method_maya'),                    ref('payment.payment_method_ovo'),                    ref('payment.payment_method_promptpay'),                    ref('payment.payment_method_qris'),                    ref('payment.payment_method_scb'),                    ref('payment.payment_method_shopeepay'),                    ref('payment.payment_method_truemoney'),                    ref('payment.payment_method_uob'),                    ref('payment.payment_method_wechat_pay'),                    ref('payment.payment_method_touch_n_go'),                    ref('payment.payment_method_viettelpay'),                    ref('payment.payment_method_vietcapital'),                    ref('payment.payment_method_vnptwallet'),                    ref('payment.payment_method_vpbank'),                    ref('payment.payment_method_woori'),                    ref('payment.payment_method_zalopay'),                ])]"/>
+  </record>
 </odoo>
diff --git a/openupgrade_scripts/scripts/payment/18.0.2.0/upgrade_analysis.txt b/openupgrade_scripts/scripts/payment/18.0.2.0/upgrade_analysis.txt
index 03b822a9e4b..4c61e9b88f8 100644
--- a/openupgrade_scripts/scripts/payment/18.0.2.0/upgrade_analysis.txt
+++ b/openupgrade_scripts/scripts/payment/18.0.2.0/upgrade_analysis.txt
@@ -21,18 +21,25 @@ 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 [renamed from payment_worldline module] (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_emi_india (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 [renamed from payment_worldline module] (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)
 DEL payment.method: payment.payment_method_emi (noupdate)
 NEW payment.provider: payment.payment_provider_nuvei (noupdate)
 NEW payment.provider: payment.payment_provider_worldline [renamed from payment_worldline module] (noupdate)