Skip to content

Commit 7ff3cb6

Browse files
committed
remove changes in spp_event_data
1 parent e2b40d1 commit 7ff3cb6

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

spp_event_data/models/event_data.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import logging
44

55
from odoo import api, fields, models
6+
from datetime import date
67

78
_logger = logging.getLogger(__name__)
89

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

spp_event_data/wizard/create_event_wizard.py

Lines changed: 4 additions & 3 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", "None")],
13+
[("default", "")],
1414
"Event Type",
1515
default="default",
1616
)
@@ -32,9 +32,10 @@ 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 = self.env["ir.model"].search([("model", "=", model_name)]).name
35+
view_name = ""
3636
for split_wizard in wizard_list:
3737
wizard_model += "%s." % split_wizard
38+
view_name += "%s " % split_wizard.capitalize()
3839
wizard_model += "wizard"
3940
view_id = rec.get_view_id(wizard_model)
4041
# create the event data and pass it to event_data_model wizard
@@ -50,7 +51,7 @@ def next_page(self):
5051
wiz = self.env[wizard_model].create({"event_id": event_id.id})
5152

5253
return {
53-
"name": _("Create %s", view_name),
54+
"name": _("Create %s Wizard", view_name),
5455
"view_mode": "form",
5556
"res_model": wizard_model,
5657
"res_id": wiz.id,

spp_event_data/wizard/create_event_wizard.xml

Lines changed: 3 additions & 5 deletions
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>
10+
<form edit="0">
1111
<sheet>
1212
<group>
1313
<field name="partner_id" readonly="1" />
@@ -17,10 +17,8 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details.
1717
<field name="expiry_date" />
1818
</group>
1919
</sheet>
20-
<footer>
21-
<button name="next_page" string="Next" type="object" class="oe_highlight" />
22-
<button string="Cancel" class="btn-secondary" special="cancel" />
23-
</footer>
20+
<button name="next_page" string="Next" type="object" class="oe_highlight" />
21+
<button string="Cancel" class="btn-secondary" special="cancel" />
2422
</form>
2523
</field>
2624
</record>

0 commit comments

Comments
 (0)