Oct 7 : [FIX] Bug Fixed 'event_catering'

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': [

event_catering/data/catering_service.xml

@@ -1,22 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
-
         <record id="sequence_catering_order" model="ir.sequence">
             <field name="name">Catering Service</field>
             <field name="code">catering.order.sequence</field>
-            <field name="suffix"> %(day)s/%(month)s/%(year)s</field>
+            <field name="suffix">%(day)s/%(month)s/%(year)s</field>
             <field name="prefix">CAT-</field>
             <field name="number_increment">1</field>
             <field name="padding">2</field>
         </record>
 
-        <record model="product.product" id="catering_service_product">
+        <record model="event.services" id="event_services">
-          <field name="name">Catering Service</field>
+            <field name="name">Catering</field>
-          <field name="type">service</field>
-            <field name="image_1920" type="base64" file="event_catering/static/img/catering_product-image.jpeg"/>
         </record>
-
     </data>
-
 </odoo>

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')

event_catering/views/catering_service.xml

@@ -97,7 +97,7 @@
                                     </form>
                                     <tree string="Catering Lines Tree"
                                           editable="bottom">
-                                        <field name="service_id"/>
+                                        <field name="service_id" domain="[('is_catering', '=', True)]"/>
                                         <field name="work_status" string="Status"/>
                                         <field name="quantity"/>
                                         <field name="amount"/>

event_catering/views/product_product_views.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+<!--    Field for specifying the catering products-->
+    <record id="product_normal_form_view" model="ir.ui.view">
+        <field name="name">product.product.view.form.inherit.event.catering
+        </field>
+        <field name="inherit_id" ref="product.product_normal_form_view"/>
+        <field name="model">product.product</field>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='detailed_type']" position="after">
+                <field name="is_catering"
+                       attrs="{'invisible': [('detailed_type', '!=', 'service')]}"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>