Skip to content

Commit 7ae6299

Browse files
committed
fix event data
1 parent 873ac56 commit 7ae6299

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

spp_event_data/models/event_data.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Part of OpenSPP. See LICENSE file for full copyright and licensing details.
22

33
import logging
4-
from datetime import date
54

65
from odoo import api, fields, models
76

@@ -19,7 +18,7 @@ class OpenSPPEventData(models.Model):
1918
res_id = fields.Many2oneReference("Related data", index=True, model_field="model")
2019
registrar = fields.Char()
2120
partner_id = fields.Many2one("res.partner", domain=[("is_registrant", "=", True)])
22-
collection_date = fields.Date(default=date.today(), required=True)
21+
collection_date = fields.Date(default=fields.Date.today(), required=True)
2322
expiry_date = fields.Date()
2423
state = fields.Selection(
2524
[("active", "Active"), ("inactive", "Inactive")],

spp_event_data/wizard/create_event_wizard.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class SPPCreateEventWizard(models.TransientModel):
1010
_description = "Create Event Wizard"
1111

1212
event_data_model = fields.Selection(
13-
[("default", "")],
13+
[("default", "None")],
1414
"Event Type",
1515
default="default",
1616
)
@@ -32,10 +32,9 @@ def next_page(self):
3232
wizard_list = model_name.split(".")
3333
wizard_model = "%s.create." % wizard_list[0]
3434
wizard_list.pop(0)
35-
view_name = ""
35+
view_name = self.env["ir.model"].search([("model", "=", model_name)]).name
3636
for split_wizard in wizard_list:
3737
wizard_model += "%s." % split_wizard
38-
view_name += "%s " % split_wizard.capitalize()
3938
wizard_model += "wizard"
4039
view_id = rec.get_view_id(wizard_model)
4140
# create the event data and pass it to event_data_model wizard
@@ -51,7 +50,7 @@ def next_page(self):
5150
wiz = self.env[wizard_model].create({"event_id": event_id.id})
5251

5352
return {
54-
"name": _("Create %s Wizard", view_name),
53+
"name": _("Create %s", view_name),
5554
"view_mode": "form",
5655
"res_model": wizard_model,
5756
"res_id": wiz.id,

spp_event_data/wizard/create_event_wizard.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details.
77
<field name="name">create_event_data_form_view</field>
88
<field name="model">spp.create.event.wizard</field>
99
<field name="arch" type="xml">
10-
<form edit="0">
10+
<form>
1111
<sheet>
1212
<group>
1313
<field name="partner_id" readonly="1" />
@@ -17,8 +17,10 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details.
1717
<field name="expiry_date" />
1818
</group>
1919
</sheet>
20+
<footer>
2021
<button name="next_page" string="Next" type="object" class="oe_highlight" />
2122
<button string="Cancel" class="btn-secondary" special="cancel" />
23+
</footer>
2224
</form>
2325
</field>
2426
</record>

0 commit comments

Comments
 (0)