Skip to content
Snippets Groups Projects

14.0 fix migration error and nice to have

Merged Daniil Digtyar Vasilieva requested to merge 14.0-FIX-migration into 14_energy_communities

Change list

  • Fixed errors with creation of subscription request in website
  • Moved (again) the provider function of energy_communities_keycloak inside energy_communities. This is to solve dependency crossing.
  • Removed energy_communities_keycloak
  • Fixed creation of subscription.request with values assigned as strings (TODO why this happens)
  • Cooperator now creates the res.partner and res.user of the company_id that received the subscription.request
  • Removed old methods of user creation in res.partner
  • Added context action to res.user to push it to Keycloak
  • Added validation of correct configuration to the admin provider

Merge request reports

Pipeline #21764 passed

Pipeline passed for ab0c9bbd on 14.0-FIX-migration

Merged by Daniil Digtyar VasilievaDaniil Digtyar Vasilieva 2 years ago (Feb 15, 2023 10:44am UTC)

Loading

Pipeline #21765 passed

Pipeline passed for acb621fe on 14_energy_communities

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • 10 11 superuser_pwd = fields.Char(string='Superuser password', help='"Superuser" user password',
    11 12 placeholder='I hope is not "admin"', required=False)
    12 13 admin_user_endpoint = fields.Char(string='User admin URL', required=True,
    13 default='http://10.0.3.1:8080/admin/realms/REALM/users')
    14 default='http://10.0.3.1:8080/admin/realms/0/users')
  • 64 59 # already sync'ed somewhere else
    65 60 continue
    66 61 keycloak_user = self._get_or_create_user(token, provider_id, user)
    62 keycloak_login_provider = self.env.ref('energy_communities.keycloak_login_provider')
    67 63 user.update({
    68 'oauth_uid': keycloak_user['id'],
    69 'oauth_provider_id': provider_id.id,
    64 'oauth_uid': user.login.lower(),
    65 'oauth_provider_id': keycloak_login_provider.id,
    70 66 })
    71 67 # action = self.env.ref('base.action_res_users').read()[0]
    72 68 # action['domain'] = [('id', 'in', self.user_ids.ids)]
  • 19 20 <field name="global" eval="True"/>
    20 21 <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
    21 22 </record>
    23 -->
  • added 4 commits

    • 52c9a7cf - Updated roles default groups
    • 0d13ddc2 - Assign role ce member on create user
    • ee6f3e8f - Assign create user true in create easy company
    • ea375201 - Add lang attribute to keycloak

    Compare with previous version

  • added 8 commits

    • 3886d8e3 - Set cooperative account to new company id
    • 97ea37bc - Assign create_user in wizard
    • 622b8d5d - Set active to falte to use as template
    • 0d214674 - FIX name of model
    • cb4f8ee3 - Updated account expense
    • 117f7171 - Removed if
    • ed1d70a5 - Add domain to chart_template_id to show only actives
    • 05da2f76 - Remove common chart template map option

    Compare with previous version

  • 5 <field name="name">Contribution to Share Capital</field>
    6 <field name="short_name">Share Capital</field>
    7 <field name="sale_ok">False</field>
    8 <field name="purchase_ok">False</field>
    9 <field name="is_share">True</field>
    10 <field name="display_on_website">True</field>
    11 <field name="categ_id" ref="cooperator.product_category_company_share"></field>
    12 <field name="type">service</field>
    13 <field name="default_share_product">True</field>
    14 <field name="list_price">0</field>
    15 <field name="by_company">True</field>
    16 <field name="by_individual">True</field>
    17 <field name="active">False</field>
    18 </record>
    19 </data>
    20 </odoo>
  • added 2 commits

    • a6cb4f62 - Add product relation to share template
    • 285fe246 - Fill values depends on target company

    Compare with previous version

  • added 1 commit

    Compare with previous version

  • added 1 commit

    • 0d29f282 - Assign username from keycloak instead of login from Odoo

    Compare with previous version

  • Daniil Digtyar Vasilieva approved this merge request

    approved this merge request

  • added 51 commits

    • 0d29f282...b0d4199d - 8 commits from branch 14_energy_communities
    • beef259e - Inherit easy_creation_company wizard
    • 1f353b18 - Added property_cooperator_account to wizzard
    • c3b65f66 - Update product category to account chart selected
    • caf1ed8b - Fixed assignation to values in product category
    • 8a1985ea - Write property_cooperator_account to new_company
    • 25105e32 - Merge conflict
    • 84913395 - Added subscription journal creation on account
    • 0803a5fc - Deleted post company task
    • 2468ac4d - Added get values from crm lead
    • 42750c5f - Fix redirect_url error
    • 8a3fe9df - Removed ir_rules_data.xml
    • 920826d9 - Merge conflict move keycloak
    • 58802e49 - Removed push to keycloak on create user
    • 26bd30e5 - Fix company_id as string in creation
    • ab1c3cdb - Fix country_id as string in creation
    • df3d0e9a - Create user on keycloak
    • 5597fac2 - Fix provider data bug
    • e9d431a8 - Updated values in admin provider
    • da94c6ee - Assigns login provider on new user
    • 7641c3ff - Uses user ID to assign user created by Odoo
    • fdd636b7 - Assign company_id on creation of partner and user
    • 059da38c - Removed unused methods in res.partner (now in res.users)
    • a2cfbd5c - Add company_id in subscription request form
    • a2cba578 - Add action to push users to keycloak
    • b05ed14b - Merge conflict validation provider
    • 979dbe5b - Updated roles default groups
    • 0f7c71d1 - Assign role ce member on create user
    • 85fc2764 - Assign create user true in create easy company
    • 8ad0ad79 - Add lang attribute to keycloak
    • 07347a9f - Set cooperative account to new company id
    • 4ec4e7bc - Assign create_user in wizard
    • 3c02513e - Set active to falte to use as template
    • 85c1d1d7 - FIX name of model
    • 7719f9f2 - Updated account expense
    • def4f514 - Removed if
    • bafb9356 - Add domain to chart_template_id to show only actives
    • aa11b3fd - Remove common chart template map option
    • 9dea32ea - Add product relation to share template
    • a124cd6f - Fill values depends on target company
    • c59fe0b3 - DEL ir_rules_data.xml
    • 5f040bd9 - Assign username from keycloak instead of login from Odoo
    • d68328ab - Default country to spain
    • ab0c9bbd - FIX default realm_name

    Compare with previous version

  • Daniil Digtyar Vasilieva enabled an automatic merge when the pipeline for ab0c9bbd succeeds

    enabled an automatic merge when the pipeline for ab0c9bbd succeeds

  • mentioned in commit acb621fe

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading