Skip to content

Commit e7390e7

Browse files
Merge pull request #476 from OpenSPP/spp-program-service-point-display
display programs in service point form and tree view
2 parents d226c29 + c7d2964 commit e7390e7

File tree

5 files changed

+57
-1
lines changed

5 files changed

+57
-1
lines changed

spp_programs_sp/__manifest__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"wizard/create_program_wizard.xml",
2222
"views/programs_view.xml",
2323
"views/entitlements_view.xml",
24+
"views/service_point_views.xml",
2425
],
2526
"assets": {},
2627
"demo": [],

spp_programs_sp/models/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
from . import entitlement_manager_default
77
from . import entitlement_manager_cash
88
from . import entitlement_manager_inkind
9+
from . import service_point

spp_programs_sp/models/entitlement_cash.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,11 @@ class CustomSPPProgramEntitlementCash(models.Model):
1414

1515
_inherit = "g2p.entitlement"
1616

17-
service_point_ids = fields.Many2many("spp.service.point", string="Service Points")
17+
service_point_ids = fields.Many2many(
18+
comodel_name="spp.service.point",
19+
relation="g2p_entitlement_spp_service_point_rel",
20+
column1="g2p_entitlement_id",
21+
column2="spp_service_point_id",
22+
string="Service Points",
23+
)
1824
service_point_id = fields.Many2one("spp.service.point", "Service Point")
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
from odoo import _, fields, models
2+
3+
4+
class CustomOpenSPPServicePoint(models.Model):
5+
_inherit = "spp.service.point"
6+
7+
g2p_entitlement_ids = fields.Many2many(
8+
comodel_name="g2p.entitlement",
9+
relation="g2p_entitlement_spp_service_point_rel",
10+
column1="spp_service_point_id",
11+
column2="g2p_entitlement_id",
12+
string=_("G2P Entitlements"),
13+
)
14+
15+
program_ids = fields.One2many(
16+
"g2p.program",
17+
compute="_compute_program_ids",
18+
)
19+
20+
def _compute_program_ids(self):
21+
for rec in self:
22+
rec.program_ids = rec.g2p_entitlement_ids.mapped("program_id")
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<odoo>
3+
4+
<record id="view_service_points_tree_inherit_spp_registrant_import" model="ir.ui.view">
5+
<field name="name">spp.service.point.view.list.inherit</field>
6+
<field name="model">spp.service.point</field>
7+
<field name="inherit_id" ref="spp_service_points.view_service_points_tree" />
8+
<field name="arch" type="xml">
9+
<xpath expr="//field[@name='is_disabled']" position="after">
10+
<field name="program_ids" widget="many2many_tags" />
11+
</xpath>
12+
</field>
13+
</record>
14+
15+
<record id="custom_service_points_form_inherit" model="ir.ui.view">
16+
<field name="name">custom_service_points_form_inherit</field>
17+
<field name="model">spp.service.point</field>
18+
<field name="inherit_id" ref="spp_service_points.view_service_points_form" />
19+
<field name="arch" type="xml">
20+
<xpath expr="//field[@name='service_type_ids']" position="before">
21+
<field name="program_ids" widget="many2many_tags" />
22+
</xpath>
23+
</field>
24+
</record>
25+
26+
</odoo>

0 commit comments

Comments
 (0)