Skip to content

Commit cf853a7

Browse files
committed
[MERGE] Convert remaining yml files and remove yml import engine
2 parents 7bfb87b + 77eb1f8 commit cf853a7

File tree

97 files changed

+2851
-3919
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+2851
-3919
lines changed

addons/account/demo/account_bank_statement.yml

Lines changed: 0 additions & 70 deletions
This file was deleted.

addons/account/demo/account_invoice_demo.yml

Lines changed: 0 additions & 185 deletions
This file was deleted.

addons/account_asset/__manifest__.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
'website': 'https://www.odoo.com/page/accounting',
1515
'category': 'Accounting',
1616
'sequence': 32,
17-
'demo': [
18-
'data/account_asset_demo.yml',
19-
],
2017
'data': [
2118
'security/account_asset_security.xml',
2219
'security/ir.model.access.csv',

addons/account_asset/data/account_asset_demo.yml

Lines changed: 0 additions & 62 deletions
This file was deleted.

addons/auth_oauth/__manifest__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
'depends': ['base', 'web', 'base_setup', 'auth_signup'],
1313
'data': [
1414
'data/auth_oauth_data.xml',
15-
'data/auth_oauth_data.yml',
1615
'views/auth_oauth_views.xml',
1716
'views/res_users_views.xml',
1817
'views/res_config_settings_views.xml',

addons/auth_oauth/data/auth_oauth_data.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,13 @@
2929
<field name="css_class">fa fa-google-plus-square</field>
3030
<field name="body">Log in with Google</field>
3131
</record>
32+
33+
<!-- Use database uuid as client_id for OpenERP oauth provider -->
34+
<function model="auth.oauth.provider" name="write">
35+
<value eval="[ref('auth_oauth.provider_openerp')]"/>
36+
<value model="ir.config_parameter" eval="{
37+
'client_id': obj().env['ir.config_parameter'].get_param('database.uuid'),
38+
}"/>
39+
</function>
3240
</data>
3341
</odoo>

addons/auth_oauth/data/auth_oauth_data.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

addons/l10n_be/__manifest__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
'data/menuitem_data.xml',
5555
],
5656
'demo': [
57-
'demo/l10n_be_demo.yml',
57+
'demo/l10n_be_demo.xml',
5858
],
5959
'website': 'https://www.odoo.com/page/accounting',
6060
'post_init_hook': 'load_translations',

0 commit comments

Comments
 (0)