Skip to content

Commit baf27dd

Browse files
hhgabelgaardhhgabelgaard
authored
Merge branch 'OCA:18.0' into 18.0
2 parents 2627c93 + e2d6a60 commit baf27dd

File tree

32 files changed

+3982
-38
lines changed

32 files changed

+3982
-38
lines changed

‎.github/workflows/generate-testdb-cron.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Generate test databases - cron and manually
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
version:
7+
description: 'Version'
8+
required: true
9+
type: choice
10+
options:
11+
- all
12+
- 16.0
13+
- 17.0
14+
- 18.0
15+
schedule:
16+
# every first of month
17+
- cron: "0 4 1 * *"
18+
19+
jobs:
20+
generate-testdb18:
21+
name: Generate test database 18.0
22+
if: (github.repository == 'OCA/OpenUpgrade' && github.event_name == 'schedule') || inputs.version == '18.0' || inputs.version == 'all'
23+
uses: ./.github/workflows/generate-testdb.yml
24+
with:
25+
version: "18.0"
26+
exclude_modules: "['payment_alipay', 'payment_ogone', 'payment_payulatam', 'payment_payumoney']"
27+
generate-testdb17:
28+
name: Generate test database 17.0
29+
if: (github.repository == 'OCA/OpenUpgrade' && github.event_name == 'schedule') || inputs.version == '17.0' || inputs.version == 'all'
30+
uses: ./.github/workflows/generate-testdb.yml
31+
with:
32+
version: "17.0"
33+
exclude_modules: "['payment_alipay', 'payment_ogone', 'payment_payulatam', 'payment_payumoney']"
34+
generate-testdb16:
35+
name: Generate test database 16.0
36+
if: (github.repository == 'OCA/OpenUpgrade' && github.event_name == 'schedule') || inputs.version == '16.0' || inputs.version == 'all'
37+
uses: ./.github/workflows/generate-testdb.yml
38+
with:
39+
version: "16.0"
40+
exclude_modules: "['payment_alipay', 'payment_ogone', 'payment_payulatam', 'payment_payumoney']"

‎.github/workflows/generate-testdb.yml‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
name: Generate test database
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
version:
7+
required: true
8+
type: string
9+
python_version:
10+
default: "3.10"
11+
type: string
12+
postgres_version:
13+
default: "14"
14+
type: string
15+
exclude_modules:
16+
default: "[]"
17+
type: string
18+
release_tag:
19+
default: "databases"
20+
type: string
21+
jobs:
22+
generate-testdb:
23+
name: Generate test database ${{ inputs.version }}
24+
runs-on: ubuntu-22.04
25+
container: ghcr.io/oca/oca-ci/py${{ inputs.python_version }}-ocb${{ inputs.version }}:latest
26+
env:
27+
PGHOST: "postgres"
28+
PGPASSWORD: "odoo"
29+
PGUSER: "odoo"
30+
VERSION: "${{ inputs.version }}"
31+
DBNAME: "openupgrade"
32+
services:
33+
postgres:
34+
image: postgres:${{ inputs.postgres_version }}
35+
env:
36+
POSTGRES_USER: odoo
37+
POSTGRES_PASSWORD: odoo
38+
ports:
39+
- 5432:5432
40+
steps:
41+
- name: Checkout
42+
uses: actions/checkout@v4
43+
- name: Install extra dependencies
44+
run: |
45+
# this is for l10n_eg_edi_eta which crashes without it
46+
pip install asn1crypto
47+
# this is for cloud_storage_google
48+
pip install google-auth
49+
# this is for account_peppol
50+
pip install phonenumbers
51+
# for pushing release
52+
apt install gh -y
53+
- name: Install all modules and an extra language
54+
run: |
55+
odoo -d $DBNAME -i base --stop-after-init
56+
odoo shell -d $DBNAME <<EOF
57+
# be sure attachments go into the database
58+
env['ir.config_parameter'].set_param('ir_attachment.location', 'db')
59+
env['ir.attachment'].force_storage()
60+
env['ir.module.module'].search([
61+
('name', 'not in', ${{ inputs.exclude_modules }}),
62+
('name', 'not ilike', 'test_%'),
63+
('name', 'not ilike', 'hw_%'),
64+
]).button_immediate_install()
65+
env.cr.commit()
66+
EOF
67+
odoo -d $DBNAME --load-language=fr_FR --stop-after-init
68+
- name: Dump database
69+
run: |
70+
pg_dump $DBNAME -Fc -f $VERSION.psql
71+
- name: Upload database dump to release
72+
env:
73+
GH_TOKEN: ${{ github.token }}
74+
run: |
75+
git config --global --add safe.directory $(pwd)
76+
gh release upload ${{ inputs.release_tag }} $VERSION.psql --clobber

‎docsource/modules170-180.rst‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ Module coverage 17.0 -> 18.0
254254
+---------------------------------------------------+----------------------+-------------------------------------------------+
255255
| l10n_bd | | |
256256
+---------------------------------------------------+----------------------+-------------------------------------------------+
257-
| l10n_be | | |
257+
| l10n_be | Nothing to do | |
258258
+---------------------------------------------------+----------------------+-------------------------------------------------+
259259
| |new| l10n_be_pos_restaurant | | |
260260
+---------------------------------------------------+----------------------+-------------------------------------------------+
@@ -318,6 +318,8 @@ Module coverage 17.0 -> 18.0
318318
+---------------------------------------------------+----------------------+-------------------------------------------------+
319319
| l10n_din5008 | | |
320320
+---------------------------------------------------+----------------------+-------------------------------------------------+
321+
| l10n_din5008_expense | | |
322+
+---------------------------------------------------+----------------------+-------------------------------------------------+
321323
| l10n_din5008_purchase | | |
322324
+---------------------------------------------------+----------------------+-------------------------------------------------+
323325
| l10n_din5008_repair | | |
@@ -584,7 +586,7 @@ Module coverage 17.0 -> 18.0
584586
+---------------------------------------------------+----------------------+-------------------------------------------------+
585587
| l10n_pl_taxable_supply_date | | |
586588
+---------------------------------------------------+----------------------+-------------------------------------------------+
587-
| l10n_pt | |No DB layout changes. |
589+
| l10n_pt | Nothing to do |No DB layout changes. |
588590
+---------------------------------------------------+----------------------+-------------------------------------------------+
589591
| l10n_qa | | |
590592
+---------------------------------------------------+----------------------+-------------------------------------------------+
@@ -1030,7 +1032,7 @@ Module coverage 17.0 -> 18.0
10301032
+---------------------------------------------------+----------------------+-------------------------------------------------+
10311033
| spreadsheet_dashboard_im_livechat | Nothing to do | |
10321034
+---------------------------------------------------+----------------------+-------------------------------------------------+
1033-
| spreadsheet_dashboard_pos_hr | | |
1035+
| spreadsheet_dashboard_pos_hr | Nothing to do | |
10341036
+---------------------------------------------------+----------------------+-------------------------------------------------+
10351037
| |new| spreadsheet_dashboard_pos_restaurant | | |
10361038
+---------------------------------------------------+----------------------+-------------------------------------------------+

‎openupgrade_scripts/apriori.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"pdf_helper": "pdf_xml_attachment",
2222
# OCA/l10n-italy
2323
"account_vat_period_end_statement": "l10n_it_account_vat_period_end_settlement",
24+
"l10n_it_riba": "l10n_it_riba_oca",
2425
"l10n_it_vat_statement_communication": "l10n_it_vat_settlement_communication",
2526
# OCA/product-attribute
2627
"product_packaging_type_vendor": "product_packaging_level_vendor",

‎openupgrade_scripts/scripts/account_add_gln/18.0.1.0/upgrade_analysis.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---Models in module 'account_add_gln'---
2+
---Fields in module 'account_add_gln'---
3+
---XML records in module 'account_add_gln'---
4+
---nothing has changed in this module--

‎openupgrade_scripts/scripts/account_edi_ubl_cii/18.0.1.0/upgrade_analysis.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---Models in module 'account_edi_ubl_cii'---
2+
new model account.edi.ubl [abstract]
23
---Fields in module 'account_edi_ubl_cii'---
34
account_edi_ubl_cii / res.company / invoice_is_ubl_cii (boolean) : DEL
45
account_edi_ubl_cii / res.partner / invoice_edi_format (False) : NEW selection_keys: ['facturx', 'nlcius', 'ubl_a_nz', 'ubl_bis3', 'ubl_sg', 'xrechnung'], mode: modify

‎openupgrade_scripts/scripts/base/18.0.1.3/upgrade_general_log.txt‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ obsolete model stock.scheduler.compute [module stock]
3030
obsolete model website.twitter.tweet [module website_twitter]
3131
new model account.autopost.bills.wizard [module account]
3232
new model account.code.mapping [module account]
33+
new model account.edi.ubl [module account_edi_ubl_cii]
3334
new model account.edi.xml.oioubl_21 [module l10n_dk_nemhandel]
35+
new model account.edi.xml.ubl_hr [module l10n_hr_edi]
3436
new model account.lock_exception [module account]
3537
new model account.merge.wizard [module account]
3638
new model account.merge.wizard.line [module account]
@@ -54,6 +56,7 @@ new model card.card [module marketing_card]
5456
new model card.template [module marketing_card]
5557
new model certificate.certificate [module certificate]
5658
new model certificate.key [module certificate]
59+
new model cloud.storage.migration.report [module cloud_storage_migration]
5760
new model event.lead.request [module event_crm]
5861
new model fleet.vehicle.send.mail [module fleet]
5962
new model format.vat.label.mixin [module base]
@@ -75,6 +78,10 @@ new model l10n_es_edi_tbai.document [module l10n_es_edi_tbai]
7578
new model l10n_fr.fec.export.wizard [module l10n_fr_account]
7679
new model l10n_gr_edi.document [module l10n_gr_edi]
7780
new model l10n_gr_edi.preferred_classification [module l10n_gr_edi]
81+
new model l10n_hr_edi.addendum [module l10n_hr_edi]
82+
new model l10n_hr_edi.mojeracun_reject_wizard [module l10n_hr_edi]
83+
new model l10n_hr.kpd.category [module l10n_hr_edi]
84+
new model l10n.hr.tax.category [module l10n_hr_edi]
7885
new model l10n_id_efaktur.document [module l10n_id_efaktur]
7986
new model l10n_id.qris.transaction [module l10n_id]
8087
new model l10n_in.section.alert [module l10n_in_withholding]
@@ -126,13 +133,13 @@ new model website.custom_blocked_third_party_domains [module website]
126133
new model website.page.properties [module website]
127134
new model website.page.properties.base [module website]
128135
---Fields in module 'general'---
129-
# 13472 fields matched,
130-
# Direct match: 13370
136+
# 13480 fields matched,
137+
# Direct match: 13377
131138
# Found in other module with different type: 0
132-
# Found in other module: 94
139+
# Found in other module: 95
133140
# Found with different type: 8
134141
# In obsolete models: 34
135-
# New columns: 1761
142+
# New columns: 1853
136143
# Not matched: 846
137144
---XML records in module 'general'---
138145
ERROR: module not in list of installed modules:

‎openupgrade_scripts/scripts/cloud_storage_migration/18.0.1.0/upgrade_analysis.txt‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---Models in module 'cloud_storage_migration'---
2+
new model cloud.storage.migration.report [sql_view]
3+
---Fields in module 'cloud_storage_migration'---
4+
---XML records in module 'cloud_storage_migration'---
5+
NEW ir.actions.act_window: cloud_storage_migration.action_cloud_storage_migration_cron
6+
NEW ir.actions.act_window: cloud_storage_migration.action_cloud_storage_migration_report
7+
NEW ir.config_parameter: cloud_storage_migration.cloud_storage_migration_all_models (noupdate)
8+
NEW ir.config_parameter: cloud_storage_migration.cloud_storage_migration_max_batch_file_size (noupdate)
9+
NEW ir.config_parameter: cloud_storage_migration.cloud_storage_migration_max_file_size (noupdate)
10+
NEW ir.config_parameter: cloud_storage_migration.cloud_storage_migration_message_models (noupdate)
11+
NEW ir.config_parameter: cloud_storage_migration.cloud_storage_migration_min_attachment_id (noupdate)
12+
NEW ir.cron: cloud_storage_migration.ir_cron_manual_migrate_local_to_cloud_storage
13+
NEW ir.model.access: cloud_storage_migration.access_cloud_storage_migration_report
14+
NEW ir.ui.view: cloud_storage_migration.cloud_storage_migration_config_settings_view_form
15+
NEW ir.ui.view: cloud_storage_migration.view_cloud_storage_migration_report_list

‎openupgrade_scripts/scripts/event/18.0.1.9/noupdate_changes.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -571,8 +571,8 @@
571571
<div t-if="is_sale"><br/>
572572
The order for this ticket has reference <t t-out="object.sale_order_id.name"/>
573573
and was placed on <t t-out="object.sale_order_id.date_order.date()"/>
574-
<t t-if="object.sale_order_line_id.price_unit"> for an amount of
575-
<t t-out="object.sale_order_line_id.price_unit" t-options="{'widget': 'monetary', 'display_currency': object.sale_order_line_id.currency_id}"/>
574+
<t t-if="object.sale_order_line_id.price_total"> for an amount of
575+
<t t-out="object.sale_order_line_id.price_total" t-options="{'widget': 'monetary', 'display_currency': object.sale_order_line_id.currency_id}"/>
576576
</t>.
577577
</div>
578578
<div>

‎openupgrade_scripts/scripts/hr_holidays/18.0.1.6/pre-migration.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ def split_employee_leaves(env):
154154
leave_employees.extend(env.cr.fetchall())
155155
for table_id, holiday_type, employee_ids in leave_employees:
156156
employees = env["hr.employee"].browse(employee_ids).filtered("active")
157-
if employee_ids:
157+
if employees:
158158
openupgrade.logged_query(
159159
env.cr,
160160
f"""
@@ -194,7 +194,7 @@ def split_employee_leaves(env):
194194
@openupgrade.migrate()
195195
def migrate(env, version):
196196
if openupgrade.column_exists(env.cr, "hr_leave_allocation", "name"): # from 13.0
197-
openupgrade.rename_columns(env.cr, {"hr_leave_allocation": [("name", False)]})
197+
openupgrade.rename_columns(env.cr, {"hr_leave_allocation": [("name", None)]})
198198
openupgrade.rename_columns(env.cr, _column_renames)
199199
openupgrade.add_columns(env, _column_adds)
200200
refill_hr_leave_request_hours(env)

0 commit comments

Comments
 (0)