Skip to content
Merged
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
7 changes: 7 additions & 0 deletions spp_change_request_v2/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
"views/dms_file_views.xml",
"views/change_request_type_views.xml",
"views/change_request_views.xml",
"views/stage_documents_form.xml",
"views/stage_review_form.xml",
"views/detail_add_member_views.xml",
"views/detail_edit_individual_views.xml",
"views/detail_edit_group_views.xml",
Expand Down Expand Up @@ -57,6 +59,9 @@
"data/event_types.xml",
"data/user_roles.xml",
],
"oca_data_manual": [
"data/default_types.xml",
],
"assets": {
"web.assets_backend": [
"spp_change_request_v2/static/src/components/**/*",
Expand All @@ -67,6 +72,8 @@
"spp_change_request_v2/static/src/xml/create_change_request_template.xml",
"spp_change_request_v2/static/src/xml/search_delay_field.xml",
"spp_change_request_v2/static/src/xml/cr_search_results_field.xml",
"spp_change_request_v2/static/src/js/cr_review_documents.js",
"spp_change_request_v2/static/src/xml/cr_review_documents.xml",
],
},
"installable": True,
Expand Down
337 changes: 337 additions & 0 deletions spp_change_request_v2/data/default_types.xml

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions spp_change_request_v2/details/add_member.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@ class SPPCRDetailAddMember(models.Model):
relationship_id = fields.Many2one(
"spp.vocabulary.code",
string="Relationship to Head",
domain=(
"[('vocabulary_id.namespace_uri', '=', 'urn:openspp:vocab:group-membership-type'), ('code', '!=', 'head')]"
),
domain="[('vocabulary_id.namespace_uri', '=', 'urn:openspp:vocab:group-membership-type'),"
" ('code', '!=', 'head')]",
tracking=True,
)
id_number = fields.Char(string="ID Number", tracking=True)
Expand Down
5 changes: 2 additions & 3 deletions spp_change_request_v2/details/change_hoh.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,8 @@ class SPPCRDetailChangeHOH(models.Model):
previous_head_new_role_id = fields.Many2one(
"spp.vocabulary.code",
string="Previous Head's New Role",
domain=(
"[('vocabulary_id.namespace_uri', '=', 'urn:openspp:vocab:group-membership-type'), ('code', '!=', 'head')]"
),
domain="[('vocabulary_id.namespace_uri', '=', 'urn:openspp:vocab:group-membership-type'),"
" ('code', '!=', 'head')]",
tracking=True,
help="The new role for the previous head (e.g., Spouse, Other Adult)",
)
Expand Down
18 changes: 13 additions & 5 deletions spp_change_request_v2/details/split_household.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class SPPCRDetailSplitHousehold(models.Model):
# New group address
copy_address = fields.Boolean(
string="Copy Address from Source",
default=True,
default=False,
tracking=True,
)
address_line1 = fields.Char(string="Address Line 1", tracking=True)
Expand Down Expand Up @@ -166,9 +166,8 @@ def _compute_available_member_ids(self):
)

# Filter out head member
non_head_memberships = memberships.filtered(
lambda m, _head_type=head_type: _head_type not in m.membership_type_ids
)
_head_type = head_type
non_head_memberships = memberships.filtered(lambda m, ht=_head_type: ht not in m.membership_type_ids)

rec.available_member_ids = non_head_memberships.mapped("individual")

Expand Down Expand Up @@ -249,7 +248,7 @@ def _check_minimum_remaining(self):

@api.onchange("copy_address")
def _onchange_copy_address(self):
"""Copy address from source group when toggled."""
"""Copy address from source group when toggled on, clear when toggled off."""
if self.copy_address and self.source_group_id:
self.address_line1 = self.source_group_id.street
self.address_line2 = self.source_group_id.street2
Expand All @@ -259,3 +258,12 @@ def _onchange_copy_address(self):
self.country_id = self.source_group_id.country_id
self.phone = self.source_group_id.phone
self.email = self.source_group_id.email
elif not self.copy_address:
self.address_line1 = False
self.address_line2 = False
self.city = False
self.state_id = False
self.postal_code = False
self.country_id = False
self.phone = False
self.email = False
5 changes: 2 additions & 3 deletions spp_change_request_v2/details/transfer_member.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,8 @@ class SPPCRDetailTransferMember(models.Model):
new_role_id = fields.Many2one(
"spp.vocabulary.code",
string="Role in New Group",
domain=(
"[('vocabulary_id.namespace_uri', '=', 'urn:openspp:vocab:group-membership-type'), ('code', '!=', 'head')]"
),
domain="[('vocabulary_id.namespace_uri', '=', 'urn:openspp:vocab:group-membership-type'),"
" ('code', '!=', 'head')]",
tracking=True,
help="The role/relationship in the new group",
)
Expand Down
1 change: 1 addition & 0 deletions spp_change_request_v2/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
from . import dms_directory
from . import dms_file
from . import res_partner
from . import change_request_log
Loading
Loading