diff --git a/event_catering/__manifest__.py b/event_catering/__manifest__.py
index 4ce714140..c38386349 100644
--- a/event_catering/__manifest__.py
+++ b/event_catering/__manifest__.py
@@ -20,7 +20,7 @@
###################################################################################
{
'name': 'Event Catering Service',
- 'version': '16.0.1.0.0',
+ 'version': '16.0.2.0.0',
'summary': """Catering Service for Event Management Module.""",
'description': """Catering Service for Event Management Module.""",
"category": "Industry",
@@ -33,6 +33,7 @@
'security/ir.model.access.csv',
'views/catering_service.xml',
'views/event_form.xml',
+ 'views/product_product_views.xml',
'data/catering_service.xml',
],
'demo': [
diff --git a/event_catering/data/catering_service.xml b/event_catering/data/catering_service.xml
index de5a38712..648b9ab29 100644
--- a/event_catering/data/catering_service.xml
+++ b/event_catering/data/catering_service.xml
@@ -1,22 +1,17 @@
-
Catering Service
catering.order.sequence
- %(day)s/%(month)s/%(year)s
+ %(day)s/%(month)s/%(year)s
CAT-
1
2
-
- Catering Service
- service
-
+
+ Catering
-
-
diff --git a/event_catering/models/catering_service.py b/event_catering/models/catering_service.py
index 3087fd24c..4a0ef08d7 100644
--- a/event_catering/models/catering_service.py
+++ b/event_catering/models/catering_service.py
@@ -60,7 +60,7 @@ class EventManagementInherit(models.Model):
"""Confirm the Event"""
catering_service = self.env['event.management.catering']
catering_line = self.service_line_ids.search([
- ('service', '=', 'catering'), ('event_id', '=', self.id)])
+ ('service_id', '=', 'Catering'), ('event_id', '=', self.id)])
if len(catering_line) > 0:
self.catering_on = True
sequence_code = 'catering.order.sequence'
@@ -86,7 +86,8 @@ class EventManagementInherit(models.Model):
"""This function returns an action that display existing catering
service of the event."""
action = self.env.ref(
- 'event_catering.event_management_catering_action_view_kanban').sudo().read()[0]
+ 'event_catering.event_management_catering_action_view_kanban').sudo().read()[
+ 0]
action['views'] = [(self.env.ref(
'event_catering.event_management_catering_view_form').id, 'form')]
action['res_id'] = self.catering_id.id
@@ -94,14 +95,6 @@ class EventManagementInherit(models.Model):
return action
-class EventService(models.Model):
- """Adding options to service line of event management model"""
- _inherit = 'event.service.line'
-
- service = fields.Selection(selection_add=[('catering', 'Catering')],
- ondelete={'catering': 'cascade'})
-
-
class EventManagementCatering(models.Model):
"""Model for creating catering services"""
_name = 'event.management.catering'
@@ -140,7 +133,7 @@ class EventManagementCatering(models.Model):
if items.work_status == 'open':
raise UserError(_("Catering works are pending"))
related_product = self.env.ref(
- 'event_catering.catering_service_product').id
+ 'event_management.catering_service_product').id
for items in self.sudo().parent_event_id.service_line_ids:
if items.id == self.sudo().catering_id:
items.sudo().write({'amount': self.price_subtotal,
@@ -165,7 +158,7 @@ class EventCateringWorks(models.Model):
catering_id = fields.Many2one('event.management.catering',
string="Catering Id")
work_status = fields.Selection([('open', 'Open'), ('done', 'Done')],
- string="Work Status", default='open')
+ string="Work Status", default='open')
@api.onchange('service_id')
def _onchange_service_id(self):
@@ -185,3 +178,11 @@ class EventCateringWorks(models.Model):
"""Button action for non completed works"""
if self.catering_id.state == "open":
self.work_status = 'done'
+
+
+class ProductProduct(models.Model):
+ """Inherited the model for adding a field"""
+ _inherit = 'product.product'
+
+ is_catering = fields.Boolean(string="Catering Product",
+ help='For specifying the catering product')
diff --git a/event_catering/views/catering_service.xml b/event_catering/views/catering_service.xml
index a23229c64..b0529331a 100644
--- a/event_catering/views/catering_service.xml
+++ b/event_catering/views/catering_service.xml
@@ -97,7 +97,7 @@
-
+
diff --git a/event_catering/views/product_product_views.xml b/event_catering/views/product_product_views.xml
new file mode 100644
index 000000000..e109378fd
--- /dev/null
+++ b/event_catering/views/product_product_views.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ product.product.view.form.inherit.event.catering
+
+
+ product.product
+
+
+
+
+
+
+
\ No newline at end of file