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
1 change: 1 addition & 0 deletions spp_area/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"g2p_registry_individual",
"g2p_registry_group",
"queue_job",
"spp_registry_base",
],
"external_dependencies": {},
"data": [
Expand Down
15 changes: 15 additions & 0 deletions spp_area/security/ir.model.access.csv
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,18 @@ spp_area_import_raw_admin,Area Import Raw Admin Access,spp_area_base.model_spp_a
spp_area_kind_admin,Area Kind Admin Access,spp_area_base.model_spp_area_kind,g2p_registry_base.group_g2p_admin,1,1,1,1

spp_area_registrar,Area Registrar Access,spp_area_base.model_spp_area,g2p_registry_base.group_g2p_registrar,1,1,1,0

spp_read_area,spp Area Read Access,spp_area_base.model_spp_area,spp_registry_base.read_registry,1,0,0,0
spp_read_area_import,spp Area Import Read Access,spp_area_base.model_spp_area_import,spp_registry_base.read_registry,1,0,0,0
spp_read_area_import_raw,spp Area Import Raw Read Access,spp_area_base.model_spp_area_import_raw,spp_registry_base.read_registry,1,0,0,0
spp_read_area_kind,spp Area Kind Read Access,spp_area_base.model_spp_area_kind,spp_registry_base.read_registry,1,0,0,0

spp_write_area,spp Area Write Access,spp_area_base.model_spp_area,spp_registry_base.write_registry,1,1,0,0
spp_write_area_import,spp Area Import Write Access,spp_area_base.model_spp_area_import,spp_registry_base.write_registry,1,1,0,0
spp_write_area_import_raw,spp Area Import Raw Write Access,spp_area_base.model_spp_area_import_raw,spp_registry_base.write_registry,1,1,0,0
spp_write_area_kind,spp Area Kind Write Access,spp_area_base.model_spp_area_kind,spp_registry_base.write_registry,1,1,0,0

spp_create_area,spp Area Create Access,spp_area_base.model_spp_area,spp_registry_base.create_registry,1,1,1,0
spp_create_area_import,spp Area Import Create Access,spp_area_base.model_spp_area_import,spp_registry_base.create_registry,1,1,1,0
spp_create_area_import_raw,spp Area Import Raw Create Access,spp_area_base.model_spp_area_import_raw,spp_registry_base.create_registry,1,1,1,0
spp_create_area_kind,spp Area Kind Create Access,spp_area_base.model_spp_area_kind,spp_registry_base.create_registry,1,1,1,0
2 changes: 1 addition & 1 deletion spp_base/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"spp_custom_fields_ui",
"spp_hide_menus",
"spp_programs",
"spp_user_roles",
"spp_custom_filter_ui",
"spp_registry_base",
],
"excludes": [
"spp_farmer_registry_base",
Expand Down
1 change: 1 addition & 0 deletions spp_change_request/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"spp_area",
"spp_scan_id_document",
"spp_dms",
"spp_registry_base",
],
"data": [
"security/change_request_security.xml",
Expand Down
30 changes: 30 additions & 0 deletions spp_change_request/security/ir.model.access.csv
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,36 @@ spp_change_request_reject_wizard_registrar,Change Request Reject Registrar Acces
spp_change_request_cancel_wizard_registrar,Change Request Cancel Registrar Access,spp_change_request_base.model_spp_change_request_cancel_wizard,g2p_registry_base.group_g2p_registrar,1,1,1,0
spp_change_request_targets_registrar,Change Request Targets Registrar Access,spp_change_request.model_spp_change_request_targets,g2p_registry_base.group_g2p_registrar,1,1,1,0

spp_read_change_request,Read Only Change Request Access,spp_change_request_base.model_spp_change_request,spp_registry_base.read_registry,1,0,0,0
spp_read_change_request_validators,Read Only Change Request Validators Access,spp_change_request_base.model_spp_change_request_validators,spp_registry_base.read_registry,1,0,0,0
spp_read_change_request_validation_sequence,Read Only Change Request Validation Sequence Access,spp_change_request_base.model_spp_change_request_validation_sequence,spp_registry_base.read_registry,1,0,0,0
spp_read_change_request_validation_stage,Read Only Change Request Validation Stage Access,spp_change_request_base.model_spp_change_request_validation_stage,spp_registry_base.read_registry,1,0,0,0
spp_read_change_request_group_members,Read Only Change Request Group Membership Access,spp_change_request.model_spp_change_request_group_members,spp_registry_base.read_registry,1,0,0,0
spp_read_change_request_user_assign_wizard,Read Only Change Request User Assignment Access,spp_change_request_base.model_spp_change_request_user_assign_wizard,spp_registry_base.read_registry,1,0,0,0
spp_read_change_request_reject_wizard,Read Only Change Request Reject Access,spp_change_request_base.model_spp_change_request_reject_wizard,spp_registry_base.read_registry,1,0,0,0
spp_read_change_request_cancel_wizard,Read Only Change Request Cancel Access,spp_change_request_base.model_spp_change_request_cancel_wizard,spp_registry_base.read_registry,1,0,0,0
spp_read_change_request_targets,Read Only Change Request Targets Access,spp_change_request.model_spp_change_request_targets,spp_registry_base.read_registry,1,0,0,0

spp_write_change_request,Write Only Change Request Access,spp_change_request_base.model_spp_change_request,spp_registry_base.write_registry,1,1,0,0
spp_write_change_request_validators,Write Only Change Request Validators Access,spp_change_request_base.model_spp_change_request_validators,spp_registry_base.write_registry,1,1,0,0
spp_write_change_request_validation_sequence,Write Only Change Request Validation Sequence Access,spp_change_request_base.model_spp_change_request_validation_sequence,spp_registry_base.write_registry,1,1,0,0
spp_write_change_request_validation_stage,Write Only Change Request Validation Stage Access,spp_change_request_base.model_spp_change_request_validation_stage,spp_registry_base.write_registry,1,1,0,0
spp_write_change_request_group_members,Write Only Change Request Group Membership Access,spp_change_request.model_spp_change_request_group_members,spp_registry_base.write_registry,1,1,0,0
spp_write_change_request_user_assign_wizard,Write Only Change Request User Assignment Access,spp_change_request_base.model_spp_change_request_user_assign_wizard,spp_registry_base.write_registry,1,1,0,0
spp_write_change_request_reject_wizard,Write Only Change Request Reject Access,spp_change_request_base.model_spp_change_request_reject_wizard,spp_registry_base.write_registry,1,1,0,0
spp_write_change_request_cancel_wizard,Write Only Change Request Cancel Access,spp_change_request_base.model_spp_change_request_cancel_wizard,spp_registry_base.write_registry,1,1,0,0
spp_write_change_request_targets,Write Only Change Request Targets Access,spp_change_request.model_spp_change_request_targets,spp_registry_base.write_registry,1,1,0,0

spp_create_change_request,Create Only Change Request Access,spp_change_request_base.model_spp_change_request,spp_registry_base.create_registry,1,1,1,0
spp_create_change_request_validators,Create Only Change Request Validators Access,spp_change_request_base.model_spp_change_request_validators,spp_registry_base.create_registry,1,1,1,0
spp_create_change_request_validation_sequence,Create Only Change Request Validation Sequence Access,spp_change_request_base.model_spp_change_request_validation_sequence,spp_registry_base.create_registry,1,1,1,0
spp_create_change_request_validation_stage,Create Only Change Request Validation Stage Access,spp_change_request_base.model_spp_change_request_validation_stage,spp_registry_base.create_registry,1,1,1,0
spp_create_change_request_group_members,Create Only Change Request Group Membership Access,spp_change_request.model_spp_change_request_group_members,spp_registry_base.create_registry,1,1,1,0
spp_create_change_request_user_assign_wizard,Create Only Change Request User Assignment Access,spp_change_request_base.model_spp_change_request_user_assign_wizard,spp_registry_base.create_registry,1,1,1,0
spp_create_change_request_reject_wizard,Create Only Change Request Reject Access,spp_change_request_base.model_spp_change_request_reject_wizard,spp_registry_base.create_registry,1,1,1,0
spp_create_change_request_cancel_wizard,Create Only Change Request Cancel Access,spp_change_request_base.model_spp_change_request_cancel_wizard,spp_registry_base.create_registry,1,1,1,0
spp_create_change_request_targets,Create Only Change Request Targets Access,spp_change_request.model_spp_change_request_targets,spp_registry_base.create_registry,1,1,1,0

spp_change_request_validator,Change Request Validator Access,spp_change_request_base.model_spp_change_request,spp_change_request.group_spp_change_request_validator,1,1,0,0
spp_change_request_validators_validator,Change Request Validators Validator Access,spp_change_request_base.model_spp_change_request_validators,spp_change_request.group_spp_change_request_validator,1,1,1,0
spp_change_request_validation_sequence_validator,Change Request Validation Sequence Validator Access,spp_change_request_base.model_spp_change_request_validation_sequence,spp_change_request.group_spp_change_request_validator,1,1,1,0
Expand Down
1 change: 1 addition & 0 deletions spp_event_data/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"g2p_registry_base",
"g2p_registry_group",
"g2p_registry_individual",
"spp_registry_base",
],
"data": [
"security/ir.model.access.csv",
Expand Down
9 changes: 9 additions & 0 deletions spp_event_data/security/ir.model.access.csv
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,12 @@ spp_event_data_admin,Event Data Admin Access,spp_event_data.model_spp_event_data
spp_create_event_wizard_admin,Create Event Wizard Admin Access,spp_event_data.model_spp_create_event_wizard,g2p_registry_base.group_g2p_admin,1,1,1,1

spp_event_data_registrar,Event Data Registrar Access,spp_event_data.model_spp_event_data,g2p_registry_base.group_g2p_registrar,1,1,1,0

spp_read_event_data,Event Data Read Access,spp_event_data.model_spp_event_data,spp_registry_base.read_registry,1,0,0,0
spp_read_create_event_wizard,Create Event Wizard Read Access,spp_event_data.model_spp_create_event_wizard,spp_registry_base.read_registry,1,0,0,0

spp_write_event_data,Event Data Write Access,spp_event_data.model_spp_event_data,spp_registry_base.write_registry,1,1,0,0
spp_write_create_event_wizard,Create Event Wizard Write Access,spp_event_data.model_spp_create_event_wizard,spp_registry_base.write_registry,1,1,0,0

spp_create_event_data,Event Data Create Access,spp_event_data.model_spp_event_data,spp_registry_base.create_registry,1,1,1,0
spp_create_create_event_wizard,Create Event Wizard Create Access,spp_event_data.model_spp_create_event_wizard,spp_registry_base.create_registry,1,1,1,0
2 changes: 1 addition & 1 deletion spp_idpass/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"license": "LGPL-3",
"development_status": "Production/Stable",
"maintainers": ["jeremi", "gonzalesedwin1123"],
"depends": ["base", "g2p_registry_base", "g2p_registry_membership"],
"depends": ["base", "g2p_registry_base", "g2p_registry_membership", "spp_registry_base"],
"data": [
"data/id_pass.xml",
"views/main_view.xml",
Expand Down
9 changes: 9 additions & 0 deletions spp_idpass/security/ir.model.access.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
spp_idpass_admin,ID Pass Admin Access,spp_idpass.model_spp_id_pass,g2p_registry_base.group_g2p_admin,1,1,1,1
spp_issue_idpass_wizard_admin,Issue ID Pass Wizard Admin Access,spp_idpass.model_spp_issue_idpass_wizard,g2p_registry_base.group_g2p_admin,1,1,1,1

spp_read_idpass,ID Pass Read Access,spp_idpass.model_spp_id_pass,spp_registry_base.read_registry,1,0,0,0
spp_read_idpass_wizard,Issue ID Pass Wizard Read Access,spp_idpass.model_spp_issue_idpass_wizard,spp_registry_base.read_registry,1,0,0,0

spp_write_idpass,ID Pass Write Access,spp_idpass.model_spp_id_pass,spp_registry_base.write_registry,1,1,0,0
spp_write_idpass_wizard,Issue ID Pass Wizard Write Access,spp_idpass.model_spp_issue_idpass_wizard,spp_registry_base.write_registry,1,1,0,0

spp_create_idpass,ID Pass Create Access,spp_idpass.model_spp_id_pass,spp_registry_base.create_registry,1,1,1,0
spp_create_idpass_wizard,Issue ID Pass Wizard Create Access,spp_idpass.model_spp_issue_idpass_wizard,spp_registry_base.create_registry,1,1,1,0
13 changes: 12 additions & 1 deletion spp_idqueue/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,17 @@
"license": "LGPL-3",
"development_status": "Production/Stable",
"maintainers": ["jeremi", "gonzalesedwin1123"],
"depends": ["base", "g2p_registry_base", "spp_idpass", "queue_job", "spp_area"],
"depends": [
"base",
"g2p_registry_base",
"g2p_registry_individual",
"g2p_registry_group",
"g2p_registry_membership",
"spp_registry_base",
"spp_idpass",
"queue_job",
"spp_area",
],
"data": [
"data/id_pass.xml",
"data/queue_data.xml",
Expand All @@ -22,6 +32,7 @@
"views/registrant.xml",
"views/id_pass_view.xml",
"views/res_config_settings.xml",
"views/menu_actions.xml",
],
"assets": {"web.assets_backend": ["spp_idqueue/static/src/js/form_controller.js"]},
"demo": [],
Expand Down
7 changes: 6 additions & 1 deletion spp_idqueue/models/id_batch.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ class OpenSPPPrintBatch(models.Model):
],
default="draft",
)
id_type = fields.Many2one("g2p.id.type")
idpass_id = fields.Many2one("spp.id.pass", string="ID Pass Template")
approved_by = fields.Many2one("res.users")
printed_by = fields.Many2one("res.users")
distributed_by = fields.Many2one("res.users")
Expand Down Expand Up @@ -157,7 +159,10 @@ def mark_as_done(self, rec):
"date": datetime.now().strftime("%B %d, %Y at %H:%M"),
}
rec.save_to_mail_thread(message)
rec.pass_api_param()
if rec.idpass_id:
rec.pass_api_param()
else:
rec.merge_status = "merged"
else:
raise ValidationError(_("Some IDs are not generated"))

Expand Down
4 changes: 3 additions & 1 deletion spp_idqueue/security/g2p_security.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,19 @@
<record id="group_g2p_id_requestor" model="res.groups">
<field name="name">ID Requestor</field>
<field name="category_id" ref="g2p_registry_base.openg2p_module" />
<field name="implied_ids" eval="[(4, ref('g2p_registry_base.group_g2p_registrar'))]" />
<field name="implied_ids" eval="[Command.link(ref('spp_registry_base.read_registry'))]" />
</record>

<record id="group_g2p_id_validator" model="res.groups">
<field name="name">ID Validator</field>
<field name="category_id" ref="g2p_registry_base.openg2p_module" />
<field name="implied_ids" eval="[Command.link(ref('spp_registry_base.read_registry'))]" />
</record>

<record id="group_g2p_id_distributor" model="res.groups">
<field name="name">ID Distributor</field>
<field name="category_id" ref="g2p_registry_base.openg2p_module" />
<field name="implied_ids" eval="[Command.link(ref('spp_registry_base.read_registry'))]" />
</record>

</odoo>
27 changes: 20 additions & 7 deletions spp_idqueue/security/ir.model.access.csv
Original file line number Diff line number Diff line change
@@ -1,27 +1,40 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
spp_read_idqueue,ID Queue Read Access,spp_idqueue.model_spp_print_queue_id,spp_registry_base.read_registry,1,0,0,0
spp_read_idbatch,ID Batch Read Access,spp_idqueue.model_spp_print_queue_batch,spp_registry_base.read_registry,1,0,0,0
spp_read_request_id_wizard,Request ID Wizard Read Access,spp_idqueue.model_spp_print_queue_wizard,spp_registry_base.read_registry,1,0,0,0
spp_read_batch_create_wizard,Batch Create Wizard Read Access,spp_idqueue.model_spp_batch_create_wizard,spp_registry_base.read_registry,1,0,0,0
spp_read_multi_id_request_wizard,Multiple ID Request Wizard Read Access,spp_idqueue.model_spp_multi_id_request_wizard,spp_registry_base.read_registry,1,0,0,0

spp_write_idqueue,ID Queue Write Access,spp_idqueue.model_spp_print_queue_id,spp_registry_base.write_registry,1,1,0,0
spp_write_idbatch,ID Batch Write Access,spp_idqueue.model_spp_print_queue_batch,spp_registry_base.write_registry,1,1,0,0
spp_write_request_id_wizard,Request ID Wizard Write Access,spp_idqueue.model_spp_print_queue_wizard,spp_registry_base.write_registry,1,1,0,0
spp_write_batch_create_wizard,Batch Create Wizard Write Access,spp_idqueue.model_spp_batch_create_wizard,spp_registry_base.write_registry,1,1,0,0
spp_write_multi_id_request_wizard,Multiple ID Request Wizard Write Access,spp_idqueue.model_spp_multi_id_request_wizard,spp_registry_base.write_registry,1,1,0,0

spp_create_idqueue,ID Queue Create Access,spp_idqueue.model_spp_print_queue_id,spp_registry_base.create_registry,1,1,1,0
spp_create_idbatch,ID Batch Create Access,spp_idqueue.model_spp_print_queue_batch,spp_registry_base.create_registry,1,1,1,0
spp_create_request_id_wizard,Request ID Wizard Create Access,spp_idqueue.model_spp_print_queue_wizard,spp_registry_base.create_registry,1,1,1,0
spp_create_batch_create_wizard,Batch Create Wizard Create Access,spp_idqueue.model_spp_batch_create_wizard,spp_registry_base.create_registry,1,1,1,0
spp_create_multi_id_request_wizard,Multiple ID Request Wizard Create Access,spp_idqueue.model_spp_multi_id_request_wizard,spp_registry_base.create_registry,1,1,1,0

spp_request_id_wizard_admin,Request ID Wizard Admin Access,spp_idqueue.model_spp_print_queue_wizard,g2p_registry_base.group_g2p_admin,1,1,1,1
spp_idqueue_admin,ID Queue Admin Access,spp_idqueue.model_spp_print_queue_id,g2p_registry_base.group_g2p_admin,1,1,1,1
spp_idbatch_admin,ID Batch Admin Access,spp_idqueue.model_spp_print_queue_batch,g2p_registry_base.group_g2p_admin,1,1,1,1
spp_request_id_wizard_admin,Request ID Wizard Admin Access,spp_idqueue.model_spp_print_queue_wizard,g2p_registry_base.group_g2p_admin,1,1,1,1
spp_batch_create_wizard_admin,Batch Create Wizard Admin Access,spp_idqueue.model_spp_batch_create_wizard,g2p_registry_base.group_g2p_admin,1,1,1,1
spp_multi_id_request_wizard_admin,Multiple ID Request Wizard Admin Access,spp_idqueue.model_spp_multi_id_request_wizard,g2p_registry_base.group_g2p_admin,1,1,1,1

spp_idqueue_requestor,ID Queue Requestor Access,spp_idqueue.model_spp_print_queue_id,spp_idqueue.group_g2p_id_requestor,1,1,1,0
spp_request_id_wizard_requestor,Request ID Wizard Requestor Access,spp_idqueue.model_spp_print_queue_wizard,spp_idqueue.group_g2p_id_requestor,1,1,1,0
spp_idqueue_request_requestor,Request ID Wizard Requestor Access,spp_idqueue.model_spp_print_queue_wizard,spp_idqueue.group_g2p_id_requestor,1,1,1,0
spp_idpass_requestor,ID Pass Requestor Access,spp_idpass.model_spp_id_pass,spp_idqueue.group_g2p_id_requestor,1,1,1,0
spp_idqueue_requestor,ID Queue Requestor Access,spp_idqueue.model_spp_print_queue_id,spp_idqueue.group_g2p_id_requestor,1,1,1,0
spp_idbatch_requestor,ID Batch Requestor Access,spp_idqueue.model_spp_print_queue_batch,spp_idqueue.group_g2p_id_requestor,1,1,1,0
spp_batch_create_wizard_requestor,Batch Create Wizard Requestor Access,spp_idqueue.model_spp_batch_create_wizard,spp_idqueue.group_g2p_id_requestor,1,1,1,0
spp_multi_id_request_wizard_requestor,Multiple ID Request Wizard Requestor Access,spp_idqueue.model_spp_multi_id_request_wizard,spp_idqueue.group_g2p_id_requestor,1,1,1,0

spp_idpass_valdiator,ID Pass Validator Access,spp_idpass.model_spp_id_pass,spp_idqueue.group_g2p_id_validator,1,1,1,0
spp_idqueue_validator,ID Queue Validator Access,spp_idqueue.model_spp_print_queue_id,spp_idqueue.group_g2p_id_validator,1,1,1,0
spp_idbatch_validator,ID Batch Validator Access,spp_idqueue.model_spp_print_queue_batch,spp_idqueue.group_g2p_id_validator,1,1,1,0
spp_batch_create_wizard_validator,Batch Create Wizard Validator Access,spp_idqueue.model_spp_batch_create_wizard,spp_idqueue.group_g2p_id_validator,1,1,1,0
spp_multi_id_request_wizard_validator,Multiple ID Request Wizard Validator Access,spp_idqueue.model_spp_multi_id_request_wizard,spp_idqueue.group_g2p_id_validator,1,1,1,0

spp_idpass_distributor,ID Pass Distributor Access,spp_idpass.model_spp_id_pass,spp_idqueue.group_g2p_id_distributor,1,1,1,0
spp_idqueue_distributor,ID Queue Distributor Access,spp_idqueue.model_spp_print_queue_id,spp_idqueue.group_g2p_id_distributor,1,1,1,0
ir_model_distributor_access,IR Model Data Distributor Access,base.model_ir_model_data,spp_idqueue.group_g2p_id_distributor,1,1,1,0
spp_idbatch_distributor,ID Batch Distributor Access,spp_idqueue.model_spp_print_queue_batch,spp_idqueue.group_g2p_id_distributor,1,1,1,0
spp_batch_create_wizard_distributor,Batch Create Wizard Distributor Access,spp_idqueue.model_spp_batch_create_wizard,spp_idqueue.group_g2p_id_distributor,1,1,1,0
spp_multi_id_request_wizard_distributor,Multiple ID Request Wizard Distributor Access,spp_idqueue.model_spp_multi_id_request_wizard,spp_idqueue.group_g2p_id_distributor,1,1,1,0
Loading
Loading