Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix test errors #718

Open
wants to merge 13 commits into
base: 17.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ jobs:
rm -rf /opt/odoo-venv/lib/python3.10/site-packages/odoo/addons/g2p_registry_individual/tests
- name: Run SP-MIS tests
env:
EXCLUDE: "fastapi,g2p_auth_id_oidc,g2p_auth_oidc,g2p_bank,g2p_bank_rest_api,g2p_change_log,g2p_disable_password_login,g2p_encryption,g2p_encryption_keymanager,g2p_encryption_rest_api,g2p_entitlement_differential,g2p_entitlement_in_kind,g2p_entitlement_voucher,g2p_enumerator,g2p_formio,g2p_mis_importer,g2p_mts,g2p_notifications_base,g2p_notifications_fast2sms,g2p_notifications_voucher,g2p_notifications_wiserv,g2p_odk_importer,g2p_odk_importer_program,g2p_odk_user_mapping,g2p_openid_vci,g2p_openid_vci_programs,g2p_openid_vci_rest_api,g2p_payment_cash,g2p_payment_files,g2p_payment_g2p_connect,g2p_payment_interop_layer,g2p_payment_phee,g2p_payment_simple_mpesa,g2p_portal_auth,g2p_profile_image,g2p_program_approval,g2p_program_assessment,g2p_program_autoenrol,g2p_program_cycleless,g2p_program_documents,g2p_program_registrant_info,g2p_program_reimbursement,g2p_programs,g2p_proxy_means_test,g2p_registry_addl_info,g2p_registry_base,g2p_registry_encryption,g2p_registry_group,g2p_registry_individual,g2p_registry_membership,g2p_registry_rest_api,g2p_service_provider_beneficiary_management,g2p_service_provider_portal_base,g2p_social_registry_importer,g2p_superset_dashboard,g2p_theme,mts_connector,muk_product,muk_web_appsbar,muk_web_chatter,muk_web_colors,muk_web_dialog,muk_web_theme,spp_user_roles,spp_change_request_add_farmer,spp_farmer_registry_base,spp_farmer_registry_dashboard,spp_farmer_registry_default_ui,spp_farmer_registry_demo,spp_custom_filter_farmer_registry"
EXCLUDE: "fastapi,g2p_auth_id_oidc,g2p_auth_oidc,g2p_bank,g2p_bank_rest_api,g2p_change_log,g2p_disable_password_login,g2p_encryption,g2p_encryption_keymanager,g2p_encryption_rest_api,g2p_entitlement_differential,g2p_entitlement_in_kind,g2p_entitlement_voucher,g2p_enumerator,g2p_formio,g2p_mis_importer,g2p_mts,g2p_notifications_base,g2p_notifications_fast2sms,g2p_notifications_voucher,g2p_notifications_wiserv,g2p_odk_importer,g2p_odk_importer_program,g2p_odk_user_mapping,g2p_openid_vci,g2p_openid_vci_programs,g2p_openid_vci_rest_api,g2p_payment_cash,g2p_payment_files,g2p_payment_g2p_connect,g2p_payment_interop_layer,g2p_payment_phee,g2p_payment_simple_mpesa,g2p_portal_auth,g2p_profile_image,g2p_program_approval,g2p_program_assessment,g2p_program_autoenrol,g2p_program_cycleless,g2p_program_documents,g2p_program_registrant_info,g2p_program_reimbursement,g2p_programs,g2p_proxy_means_test,g2p_registry_addl_info,g2p_registry_base,g2p_registry_encryption,g2p_registry_group,g2p_registry_individual,g2p_registry_membership,g2p_registry_rest_api,g2p_service_provider_beneficiary_management,g2p_service_provider_portal_base,g2p_social_registry_importer,g2p_superset_dashboard,g2p_theme,mts_connector,muk_product,muk_web_appsbar,muk_web_chatter,muk_web_colors,muk_web_dialog,muk_web_theme,spp_user_roles,spp_change_request_add_farmer,spp_farmer_registry_base,spp_farmer_registry_dashboard,spp_farmer_registry_default_ui,spp_farmer_registry_demo,spp_custom_filter_farmer_registry,spp_registrant_import,spp_manual_entitlement"
run: oca_run_tests
- name: Initialize farmer_registry db
env:
Expand Down
2 changes: 1 addition & 1 deletion spp_area/models/area.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class OpenSPPArea(models.Model):
complete_name = fields.Char(compute="_compute_complete_name", recursive=True, translate=True)
name = fields.Char(translate=True, compute="_compute_name", store=True)
draft_name = fields.Char(required=True, translate=True)
parent_path = fields.Char(index=True)
parent_path = fields.Char(index=True, unaccent=False)
code = fields.Char()
altnames = fields.Char("Alternate Name")
level = fields.Integer(help="This is the area level for importing")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@ class ChangeRequestAddChildren(models.Model):
SRC_AREA_FLD = ["registrant_id", "area_center_id"]
DST_AREA_FLD = SRC_AREA_FLD

def _get_dynamic_selection(self):
options = self.env["gender.type"].search([])
return [(option.value, option.code) for option in options]

# Redefine registrant_id to set specific domain and label
registrant_id = fields.Many2one(
"res.partner",
Expand All @@ -76,7 +72,7 @@ def _get_dynamic_selection(self):
birth_place = fields.Char()
birthdate_not_exact = fields.Boolean()
birthdate = fields.Date("Date of Birth")
gender = fields.Selection(selection=_get_dynamic_selection)
gender = fields.Many2one("gender.type")
phone = fields.Char("Phone Number")
uid_number = fields.Char("UID Number")

Expand Down Expand Up @@ -186,7 +182,6 @@ def _onchange_scan_id_document_details(self):
"family_name": details["family_name"],
"given_name": details["given_name"],
"birthdate": details["birth_date"],
"gender": details["gender"],
"id_document_details": "",
"birth_place": details["birth_place_city"],
# TODO: Fix not writing to one2many field: dms_file_ids
Expand Down Expand Up @@ -259,7 +254,7 @@ def update_live_data(self):
"birth_place": self.birth_place,
"birthdate_not_exact": self.birthdate_not_exact,
"birthdate": self.birthdate,
"gender": self.gender,
"gender": self.gender.id,
"phone_number_ids": phone_rec,
"reg_ids": uid_rec,
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def get_vals(self):
"birth_place": "Hometown",
"birthdate_not_exact": True,
"birthdate": "1990-01-01",
"gender": gender.value,
"gender": gender.id,
"phone": "09123456789",
"uid_number": "123456789125",
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,11 @@
</group>
<group colspan="6" col="6">
<group colspan="2">
<field name="gender" readonly="state != 'draft'" />
<field
name="gender"
readonly="state != 'draft'"
options="{'no_open':true,'no_edit':true,'no_create':true}"
/>
</group>
<group colspan="2">
<field
Expand Down Expand Up @@ -557,7 +561,7 @@
<field name="family_name" readonly="1" class="oe_edit_only" />
<field name="given_name" readonly="1" class="oe_edit_only" />
<field name="addl_name" readonly="1" class="oe_edit_only" />
<field name="gender" readonly="1" />
<field name="gender" readonly="1" options="{'no_open':true}" />
<field
name="phone"
readonly="1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@ class ChangeRequestAddChildren(models.Model):
SRC_AREA_FLD = ["registrant_id", "area_center_id"]
DST_AREA_FLD = SRC_AREA_FLD

def _get_dynamic_selection(self):
options = self.env["gender.type"].search([])
return [(option.value, option.code) for option in options]

# Redefine registrant_id to set specific domain and label
registrant_id = fields.Many2one(
"res.partner",
Expand All @@ -76,7 +72,7 @@ def _get_dynamic_selection(self):
birth_place = fields.Char()
birthdate_not_exact = fields.Boolean()
birthdate = fields.Date("Date of Birth")
gender = fields.Selection(selection=_get_dynamic_selection)
gender = fields.Many2one("gender.type")
phone = fields.Char("Phone Number")
uid_number = fields.Char("UID Number")

Expand Down Expand Up @@ -282,7 +278,7 @@ def update_live_data(self):
"birth_place": self.birth_place,
"birthdate_not_exact": self.birthdate_not_exact,
"birthdate": self.birthdate,
"gender": self.gender,
"gender": self.gender.id,
"image_1920": self.image_1920,
"experience_years": self.experience_years,
"formal_agricultural_training": self.formal_agricultural_training,
Expand Down
2 changes: 1 addition & 1 deletion spp_change_request_add_farmer/tests/test_create_cr.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def get_vals(self):
"birth_place": "Hometown",
"birthdate_not_exact": True,
"birthdate": "1990-01-01",
"gender": gender.value,
"gender": gender.id,
"image_1920": None,
"experience_years": 2,
"formal_agricultural_training": True,
Expand Down
2 changes: 1 addition & 1 deletion spp_idpass/views/id_pass_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
title="Generate Auth Token"
icon="fa-key"
class="btn-success"
groups="g2p_registry_base.group_g2p_admin,spp_idqueue.group_g2p_id_validator"
groups="g2p_registry_base.group_g2p_admin"
/>
</tree>
</field>
Expand Down
1 change: 1 addition & 0 deletions spp_idqueue/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"wizard/batch_create_wizard.xml",
"wizard/multi_id_request_wizard.xml",
"views/registrant.xml",
"views/id_pass_view.xml",
"views/res_config_settings.xml",
],
"assets": {"web.assets_backend": ["spp_idqueue/static/src/js/form_controller.js"]},
Expand Down
14 changes: 14 additions & 0 deletions spp_idqueue/views/id_pass_view.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<odoo>
<record id="view_spp_idpass_tree_extend" model="ir.ui.view">
<field name="name">view_spp_idpass_tree_extend</field>
<field name="model">spp.id.pass</field>
<field name="inherit_id" ref="spp_idpass.view_spp_idpass_tree" />
<field name="arch" type="xml">
<xpath expr="//button[@name='generate_auth_token']" position="attributes">
<attribute
name="groups"
>g2p_registry_base.group_g2p_admin,spp_idqueue.group_g2p_id_validator</attribute>
</xpath>
</field>
</record>
</odoo>
4 changes: 2 additions & 2 deletions spp_registrant_import/models/res_partner.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ def _compute_name(self):
if rec.given_name:
name.append(rec.given_name)
if rec.addl_name:
name.append(self.addl_name)
name.append(rec.addl_name)
rec.name = ", ".join(name).upper()

def _inverse_name(self):
for rec in self:
if not rec.is_registrant or rec.is_group:
continue
name = list(map(lambda i: i, self.name.split(", ")))
name = list(map(lambda i: i, rec.name.split(", ")))
if len(name) == 1:
rec.given_name = name[0]
elif len(name) == 2:
Expand Down
Loading