Oct 7 : [FIX] Bug Fixed 'fleet_rental'

fleet_rental/README.rst

@@ -1,8 +1,11 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+   :target: https://www.gnu.org/licenses/agpl-3.0-standalone.html
+   :alt: License: AGPL-3
+
 Fleet Rental Management v15
 ===========================
 This module will helps you to give the vehicles for Rent.
 
-
 Configuration
 =============
 * No additional configurations needed

fleet_rental/__init__.py

@@ -3,7 +3,7 @@
 #
 #    Cybrosys Technologies Pvt. Ltd.
 #
-#    Copyright (C) 2021-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
+#    Copyright (C) 2023-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
 #    Author: Cybrosys Technogies @cybrosys(odoo@cybrosys.com)
 #
 #    You can modify it under the terms of the GNU AFFERO
@@ -19,6 +19,5 @@
 #    If not, see <http://www.gnu.org/licenses/>.
 #
 #############################################################################
-
 from . import models
 from . import reports

fleet_rental/__manifest__.py

@@ -3,7 +3,7 @@
 #
 #    Cybrosys Technologies Pvt. Ltd.
 #
-#    Copyright (C) 2021-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
+#    Copyright (C) 2023-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
 #    Author: Cybrosys Technogies @cybrosys(odoo@cybrosys.com)
 #
 #    You can modify it under the terms of the GNU AFFERO
@@ -22,28 +22,29 @@
 
 {
     'name': 'Fleet Rental Management',
-    'version': '15.0.1.0.0',
+    'version': '15.0.2.0.0',
+    'category': "Industries",
     'summary': """This module will helps you to give the vehicles for Rent.""",
     'description': "Module Helps You To Manage Rental Contracts, Odoo13, Odoo 13, Fleet, Rental, Rent, Vehicle management",
-    'category': "Industries",
     'live_test_url': 'https://youtu.be/chN-n7nB3Ac',
     'author': 'Cybrosys Techno Solutions',
     'company': 'Cybrosys Techno Solutions',
+    'maintainer': 'Cybrosys Techno Solutions',
     'website': "https://www.cybrosys.com",
     'depends': ['base', 'account', 'fleet', 'mail'],
     'data': [
         'data/fleet_rental_data.xml',
         'security/rental_security.xml',
         'security/ir.model.access.csv',
+        'views/res_config_settings_views.xml',
         'views/car_rental_view.xml',
         'views/checklist_view.xml',
         'views/car_tools_view.xml',
         'reports/rental_report.xml'
     ],
-    'demo': [
-    ],
     'images': ['static/description/banner.png'],
     'license': 'AGPL-3',
     'installable': True,
     'application': True,
+    'auto_install': False
 }

fleet_rental/data/fleet_rental_data.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-
     <data noupdate="0">
         <record model="product.template" id="fleet_service_product">
             <field name="name">Fleet Rental Service</field>
@@ -745,5 +744,4 @@
             </field>
         </record>
     </data>
-
 </odoo>

fleet_rental/doc/RELEASE_NOTES.md

@@ -3,8 +3,12 @@
 #### 03.12.2020
 #### Version 15.0.1.0.0
 #### ADD
-Initial Commit for Fleet Rental Management
+- Initial Commit for Fleet Rental Management
 
+#### 26.09.2023
+#### Version 15.0.2.0.0
+#### ADD
 
+- Rental fleet Invoice product selection from Configuration Settings.
 
 

fleet_rental/models/__init__.py

@@ -3,7 +3,7 @@
 #
 #    Cybrosys Technologies Pvt. Ltd.
 #
-#    Copyright (C) 2021-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
+#    Copyright (C) 2023-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
 #    Author: Cybrosys Technogies @cybrosys(odoo@cybrosys.com)
 #
 #    You can modify it under the terms of the GNU AFFERO
@@ -19,8 +19,6 @@
 #    If not, see <http://www.gnu.org/licenses/>.
 #
 #############################################################################
-
 from . import car_rental
 from . import fleet
-
-
+from . import res_config_settings

fleet_rental/models/car_rental.py

@@ -3,7 +3,7 @@
 #
 #    Cybrosys Technologies Pvt. Ltd.
 #
-#    Copyright (C) 2021-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
+#    Copyright (C) 2023-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
 #    Author: Cybrosys Technogies @cybrosys(odoo@cybrosys.com)
 #
 #    You can modify it under the terms of the GNU AFFERO
@@ -22,7 +22,7 @@
 
 from datetime import datetime, date, timedelta
 from odoo import models, fields, api, _
-from odoo.exceptions import UserError, Warning
+from odoo.exceptions import UserError
 
 
 class CarRentalContract(models.Model):
@@ -40,7 +40,8 @@ class CarRentalContract(models.Model):
                 if str(each.date_from) <= str(self.rent_start_date) <= str(each.date_to):
                     i.write({'rental_check_availability': False})
                 elif str(self.rent_start_date) < str(each.date_from):
-                    if str(each.date_from) <= str(self.rent_end_date) <= str(each.date_to):
+                    if str(each.date_from) <= str(self.rent_end_date) <= str(
+                            each.date_to):
                         i.write({'rental_check_availability': False})
                     elif str(self.rent_end_date) > str(each.date_to):
                         i.write({'rental_check_availability': False})
@@ -50,37 +51,54 @@ class CarRentalContract(models.Model):
                     i.write({'rental_check_availability': True})
 
     image = fields.Binary(related='vehicle_id.image_128', string="Image of Vehicle")
-    reserved_fleet_id = fields.Many2one('rental.fleet.reserved', invisible=True, copy=False)
+    reserved_fleet_id = fields.Many2one('rental.fleet.reserved', invisible=True,
+                                        copy=False)
     name = fields.Char(string="Name", default="Draft Contract", readonly=True, copy=False)
-    customer_id = fields.Many2one('res.partner', required=True, string='Customer', help="Customer")
-    vehicle_id = fields.Many2one('fleet.vehicle', string="Vehicle", required=True, help="Vehicle",
+    customer_id = fields.Many2one('res.partner', required=True, string='Customer',
+                                  help="Customer")
+    vehicle_id = fields.Many2one('fleet.vehicle', string="Vehicle", required=True,
+                                 help="Vehicle",
                                  readonly=True,
                                  states={'draft': [('readonly', False)]}
                                  )
-    car_brand = fields.Many2one('fleet.vehicle.model.brand', string="Fleet Brand", size=50,
-                                related='vehicle_id.model_id.brand_id', store=True, readonly=True)
-    car_color = fields.Char(string="Fleet Color", size=50, related='vehicle_id.color', store=True, copy=False,
+    car_brand = fields.Many2one('fleet.vehicle.model.brand', string="Fleet Brand",
+                                size=50,
+                                related='vehicle_id.model_id.brand_id', store=True,
+                                readonly=True)
+    car_color = fields.Char(string="Fleet Color", size=50, related='vehicle_id.color',
+                            store=True, copy=False,
                             default='#FFFFFF', readonly=True)
-    cost = fields.Float(string="Rent Cost", help="This fields is to determine the cost of rent", required=True)
-    rent_start_date = fields.Date(string="Rent Start Date", required=True, default=str(date.today()),
-                                  help="Start date of contract", track_visibility='onchange')
-    rent_end_date = fields.Date(string="Rent End Date", required=True, help="End date of contract",
+    cost = fields.Float(string="Rent Cost",
+                        help="This fields is to determine the cost of rent",
+                        required=True)
+    rent_start_date = fields.Date(string="Rent Start Date", required=True,
+                                  default=str(date.today()),
+                                  help="Start date of contract",
+                                  track_visibility='onchange')
+    rent_end_date = fields.Date(string="Rent End Date", required=True,
+                                help="End date of contract",
                                 track_visibility='onchange')
     state = fields.Selection(
-        [('draft', 'Draft'), ('reserved', 'Reserved'), ('running', 'Running'), ('cancel', 'Cancel'),
-         ('checking', 'Checking'), ('invoice', 'Invoice'), ('done', 'Done')], string="State",
+        [('draft', 'Draft'), ('reserved', 'Reserved'), ('running', 'Running'),
+         ('cancel', 'Cancel'),
+         ('checking', 'Checking'), ('invoice', 'Invoice'), ('done', 'Done')],
+        string="State",
         default="draft", copy=False, track_visibility='onchange')
     notes = fields.Text(string="Details & Notes")
     cost_generated = fields.Float(string='Recurring Cost',
                                   help="Costs paid at regular intervals, depending on the cost frequency")
-    cost_frequency = fields.Selection([('no', 'No'), ('daily', 'Daily'), ('weekly', 'Weekly'), ('monthly', 'Monthly'),
+    cost_frequency = fields.Selection(
+        [('no', 'No'), ('daily', 'Daily'), ('weekly', 'Weekly'), ('monthly', 'Monthly'),
          ('yearly', 'Yearly')], string="Recurring Cost Frequency",
-                                      help='Frequency of the recurring cost', required=True)
+        help='Frequency of the recurring cost', required=True, default='no')
     journal_type = fields.Many2one('account.journal', 'Journal',
-                                   default=lambda self: self.env['account.journal'].search([('id', '=', 1)]))
+                                   default=lambda self: self.env[
+                                       'account.journal'].search([('id', '=', 1)]))
     account_type = fields.Many2one('account.account', 'Account',
-                                   default=lambda self: self.env['account.account'].search([('id', '=', 17)]))
-    recurring_line = fields.One2many('fleet.rental.line', 'rental_number', readonly=True, help="Recurring Invoices",
+                                   default=lambda self: self.env[
+                                       'account.account'].search([('id', '=', 17)]))
+    recurring_line = fields.One2many('fleet.rental.line', 'rental_number', readonly=True,
+                                     help="Recurring Invoices",
                                      copy=False)
     first_payment = fields.Float(string='First Payment',
                                  help="Transaction/Office/Contract charge amount, must paid by customer side other "
@@ -88,11 +106,14 @@ class CarRentalContract(models.Model):
                                  track_visibility='onchange',
                                  required=True)
     first_payment_inv = fields.Many2one('account.move', copy=False)
-    first_invoice_created = fields.Boolean(string="First Invoice Created", invisible=True, copy=False)
-    attachment_ids = fields.Many2many('ir.attachment', 'car_rent_checklist_ir_attachments_rel',
+    first_invoice_created = fields.Boolean(string="First Invoice Created", invisible=True,
+                                           copy=False)
+    attachment_ids = fields.Many2many('ir.attachment',
+                                      'car_rent_checklist_ir_attachments_rel',
                                       'rental_id', 'attachment_id', string="Attachments",
                                       help="Images of the vehicle before contract/any attachments")
-    checklist_line = fields.One2many('car.rental.checklist', 'checklist_number', string="Checklist",
+    checklist_line = fields.One2many('car.rental.checklist', 'checklist_number',
+                                     string="Checklist",
                                      help="Facilities/Accessories, That should verify when closing the contract.",
                                      states={'invoice': [('readonly', True)],
                                              'done': [('readonly', True)],
@@ -103,9 +124,11 @@ class CarRentalContract(models.Model):
     damage_cost = fields.Float(string="Damage Cost", copy=False)
     damage_cost_sub = fields.Float(string="Damage Cost", readonly=True, copy=False)
     total_cost = fields.Float(string="Total", readonly=True, copy=False)
-    invoice_count = fields.Integer(compute='_invoice_count', string='# Invoice', copy=False)
+    invoice_count = fields.Integer(compute='_invoice_count', string='# Invoice',
+                                   copy=False)
     check_verify = fields.Boolean(compute='check_action_verify', copy=False)
-    sales_person = fields.Many2one('res.users', string='Sales Person', default=lambda self: self.env.uid,
+    sales_person = fields.Many2one('res.users', string='Sales Person',
+                                   default=lambda self: self.env.uid,
                                    track_visibility='always')
 
     def action_run(self):
@@ -128,10 +151,11 @@ class CarRentalContract(models.Model):
     @api.constrains('rent_start_date', 'rent_end_date')
     def validate_dates(self):
         if self.rent_end_date < self.rent_start_date:
-            raise Warning("Please select the valid end date.")
+            raise UserError("Please select the valid end date.")
 
     def set_to_done(self):
-        invoice_ids = self.env['account.move'].search([('invoice_origin', '=', self.name)])
+        invoice_ids = self.env['account.move'].search(
+            [('invoice_origin', '=', self.name)])
         f = 0
         for each in invoice_ids:
             if each.payment_state != 'paid':
@@ -143,7 +167,8 @@ class CarRentalContract(models.Model):
             raise UserError("Some Invoices are pending")
 
     def _invoice_count(self):
-        invoice_ids = self.env['account.move'].search([('invoice_origin', '=', self.name)])
+        invoice_ids = self.env['account.move'].search(
+            [('invoice_origin', '=', self.name)])
         self.invoice_count = len(invoice_ids)
 
     @api.constrains('state')
@@ -181,23 +206,21 @@ class CarRentalContract(models.Model):
         supplier = self.customer_id
         inv_data = {
             'ref': supplier.name,
-            # 'account_id': supplier.property_account_payable_id.id,
             'partner_id': supplier.id,
-            # 'currency_id': self.account_type.company_id.currency_id.id,
-            # 'journal_id': self.journal_type.id,
             'invoice_origin': self.name,
-            # 'company_id': self.account_type.company_id.id,
             'invoice_date_due': self.rent_end_date,
         }
         inv_id = inv_obj.create(inv_data)
-        product_id = self.env['product.product'].search([("name", "=", "Fleet Rental Service")])
+        product_id = self.env['product.product'].search(
+            [("name", "=", "Fleet Rental Service")])
         if product_id.property_account_income_id.id:
             income_account = product_id.property_account_income_id
         elif product_id.categ_id.property_account_income_categ_id.id:
             income_account = product_id.categ_id.property_account_income_categ_id
         else:
             raise UserError(
-                _('Please define income account for this product: "%s" (id:%d).') % (product_id.name,
+                _('Please define income account for this product: "%s" (id:%d).') % (
+                    product_id.name,
                     product_id.id))
         recurring_data = {
             'name': self.vehicle_id.name,
@@ -229,7 +252,8 @@ class CarRentalContract(models.Model):
             '<tr/><tr><td>Amount <td/><td> %s<td/><tr/>'
             '<tr/><tr><td>Due Date <td/><td> %s<td/><tr/>'
             '<tr/><tr><td>Responsible Person <td/><td> %s, %s<td/><tr/><table/>') % \
-                       (self.customer_id.name, self.name, inv_id.amount_total, inv_id.invoice_date_due,
+                       (self.customer_id.name, self.name, inv_id.amount_total,
+                        inv_id.invoice_date_due,
                         inv_id.user_id.name,
                         inv_id.user_id.mobile)
         main_content = {
@@ -247,7 +271,8 @@ class CarRentalContract(models.Model):
         recurring_obj = self.env['fleet.rental.line']
         today = date.today()
         for records in self.search([]):
-            start_date = datetime.strptime(str(records.rent_start_date), '%Y-%m-%d').date()
+            start_date = datetime.strptime(str(records.rent_start_date),
+                                           '%Y-%m-%d').date()
             end_date = datetime.strptime(str(records.rent_end_date), '%Y-%m-%d').date()
             if end_date >= date.today():
                 temp = 0
@@ -278,14 +303,16 @@ class CarRentalContract(models.Model):
                         'invoice_date_due': self.rent_end_date,
                     }
                     inv_id = inv_obj.create(inv_data)
-                    product_id = self.env['product.product'].search([("name", "=", "Fleet Rental Service")])
+                    product_id = self.env['product.product'].search(
+                        [("name", "=", "Fleet Rental Service")])
                     if product_id.property_account_income_id.id:
                         income_account = product_id.property_account_income_id
                     elif product_id.categ_id.property_account_income_categ_id.id:
                         income_account = product_id.categ_id.property_account_income_categ_id
                     else:
                         raise UserError(
-                            _('Please define income account for this product: "%s" (id:%d).') % (product_id.name,
+                            _('Please define income account for this product: "%s" (id:%d).') % (
+                                product_id.name,
                                 product_id.id))
                     recurring_data = {
                         'name': records.vehicle_id.name,
@@ -318,7 +345,8 @@ class CarRentalContract(models.Model):
                         '<tr/><tr><td>Amount <td/><td> %s<td/><tr/>'
                         '<tr/><tr><td>Due Date <td/><td> %s<td/><tr/>'
                         '<tr/><tr><td>Responsible Person <td/><td> %s, %s<td/><tr/><table/>') % \
-                                   (self.customer_id.name, self.name, inv_id.amount_total, inv_id.invoice_date_due,
+                                   (self.customer_id.name, self.name, inv_id.amount_total,
+                                    inv_id.invoice_date_due,
                                     inv_id.user_id.name,
                                     inv_id.user_id.mobile)
                     main_content = {
@@ -341,9 +369,7 @@ class CarRentalContract(models.Model):
             inv_line_obj = self.env['account.move.line']
             supplier = self.customer_id
             inv_data = {
-                # 'name': supplier.name,
                 'ref': supplier.name,
-                # 'account_id': supplier.property_account_payable_id.id,
                 'partner_id': supplier.id,
                 'currency_id': self.account_type.company_id.currency_id.id,
                 'journal_id': self.journal_type.id,
@@ -352,14 +378,16 @@ class CarRentalContract(models.Model):
                 'invoice_date_due': self.rent_end_date,
             }
             inv_id = inv_obj.create(inv_data)
-            product_id = self.env['product.product'].search([("name", "=", "Fleet Rental Service")])
+            product_id = self.env['product.product'].search(
+                [("name", "=", "Fleet Rental Service")])
             if product_id.property_account_income_id.id:
                 income_account = product_id.property_account_income_id
             elif product_id.categ_id.property_account_income_categ_id.id:
                 income_account = product_id.categ_id.property_account_income_categ_id
             else:
                 raise UserError(
-                    _('Please define income account for this product: "%s" (id:%d).') % (product_id.name,
+                    _('Please define income account for this product: "%s" (id:%d).') % (
+                        product_id.name,
                         product_id.id))
             inv_line_data = {
                 'name': "Damage/Tools missing cost",
@@ -376,28 +404,14 @@ class CarRentalContract(models.Model):
             list_view_id = self.env.ref('account.view_move_form', False)
             form_view_id = self.env.ref('account.view_move_tree', False)
             result = {
-                # 'domain': "[('id', '=', " + str(inv_id) + ")]",
                 'name': 'Fleet Rental Invoices',
                 'view_mode': 'form',
                 'res_model': 'account.move',
                 'type': 'ir.actions.act_window',
                 'views': [(list_view_id.id, 'tree'), (form_view_id.id, 'form')],
             }
-            # result = {
-            #     # 'name': action.name,
-            #     'help': action.help,
-            #     'type': 'ir.actions.act_window',
-            #     'views': [[list_view_id, 'tree'], [form_view_id, 'form'], [False, 'graph'], [False, 'kanban'],
-            #               [False, 'calendar'], [False, 'pivot']],
-            #     'target': action.target,
-            #     'context': action.context,
-            #     'res_model': 'account.move',
-            # }
             if len(inv_id) > 1:
                 result['domain'] = "[('id','in',%s)]" % inv_id.ids
-            # elif len(inv_id) == 1:
-                # result['views'] = [(form_view_id.id, 'form')]
-                # result['res_id'] = inv_id.ids[0]
             else:
                 result = {'type': 'ir.actions.act_window_close'}
             return result
@@ -417,28 +431,32 @@ class CarRentalContract(models.Model):
             else:
                 check_availability = 0
         if check_availability == 0:
-            reserved_id = self.vehicle_id.rental_reserved_time.create({'customer_id': self.customer_id.id,
+            reserved_id = self.vehicle_id.rental_reserved_time.create(
+                {'customer_id': self.customer_id.id,
                  'date_from': self.rent_start_date,
                  'date_to': self.rent_end_date,
                  'reserved_obj': self.vehicle_id.id
                  })
             self.write({'reserved_fleet_id': reserved_id.id})
         else:
-            raise Warning('Sorry This vehicle is already booked by another customer')
+            raise UserError('Sorry This vehicle is already booked by another customer')
         self.state = "reserved"
         sequence_code = 'car.rental.sequence'
         order_date = self.create_date
         order_date = str(order_date)[0:10]
         self.name = self.env['ir.sequence'] \
             .with_context(ir_sequence_date=order_date).next_by_code(sequence_code)
-        mail_content = _('<h3>Order Confirmed!</h3><br/>Hi %s, <br/> This is to notify that your rental contract has '
+        mail_content = _(
+            '<h3>Order Confirmed!</h3><br/>Hi %s, <br/> This is to notify that your rental contract has '
             'been confirmed. <br/><br/>'
             'Please find the details below:<br/><br/>'
             '<table><tr><td>Reference Number<td/><td> %s<td/><tr/>'
             '<tr><td>Time Range <td/><td> %s to %s <td/><tr/><tr><td>Vehicle <td/><td> %s<td/><tr/>'
             '<tr><td>Point Of Contact<td/><td> %s , %s<td/><tr/><table/>') % \
-                       (self.customer_id.name, self.name, self.rent_start_date, self.rent_end_date,
-                        self.vehicle_id.name, self.sales_person.name, self.sales_person.mobile)
+                       (self.customer_id.name, self.name, self.rent_start_date,
+                        self.rent_end_date,
+                        self.vehicle_id.name, self.sales_person.name,
+                        self.sales_person.mobile)
         main_content = {
             'subject': _('Confirmed: %s - %s') %
                        (self.name, self.vehicle_id.name),
@@ -482,7 +500,6 @@ class CarRentalContract(models.Model):
                     'view_id': False,
                     'type': 'ir.actions.act_window',
                     'name': _('Invoice'),
-                    # 'res_id': inv_ids
                 }
 
             return value
@@ -497,7 +514,8 @@ class CarRentalContract(models.Model):
                 if each.cost_frequency == 'monthly':
                     rental_days = int(rental_days / 30)
                 for each1 in range(0, rental_days + 1):
-                    if rent_date > datetime.strptime(str(each.rent_end_date), "%Y-%m-%d").date():
+                    if rent_date > datetime.strptime(str(each.rent_end_date),
+                                                     "%Y-%m-%d").date():
                         break
                     each.fleet_scheduler1(rent_date)
                     if each.cost_frequency == 'daily':
@@ -507,16 +525,13 @@ class CarRentalContract(models.Model):
                     if each.cost_frequency == 'monthly':
                         rent_date = rent_date + timedelta(days=30)
 
-        if self.first_payment != 0:
         self.first_invoice_created = True
         inv_obj = self.env['account.move']
         inv_line_obj = self.env['account.move.line']
         supplier = self.customer_id
         inv_data = {
-                # 'name': supplier.name,
             'ref': supplier.name,
             'move_type': 'out_invoice',
-                # 'account_id': supplier.property_account_payable_id.id,
             'partner_id': supplier.id,
             'currency_id': self.account_type.company_id.currency_id.id,
             'journal_id': self.journal_type.id,
@@ -526,14 +541,19 @@ class CarRentalContract(models.Model):
         }
         inv_id = inv_obj.create(inv_data)
         self.first_payment_inv = inv_id.id
-            product_id = self.env['product.product'].search([("name", "=", "Fleet Rental Service")])
+        fleet_rental_product_id = int(
+            self.env['ir.config_parameter'].sudo().get_param(
+                'fleet_service_product_id'))
+        product_id = self.env['product.template'].sudo().browse(
+            fleet_rental_product_id).product_variant_id
         if product_id.property_account_income_id.id:
             income_account = product_id.property_account_income_id.id
         elif product_id.categ_id.property_account_income_categ_id.id:
             income_account = product_id.categ_id.property_account_income_categ_id.id
         else:
             raise UserError(
-                    _('Please define income account for this product: "%s" (id:%d).') % (product_id.name,
+                _('Please define income account for this product: "%s" (id:%d).') % (
+                    product_id.name,
                     product_id.id))
 
         if inv_id:
@@ -552,7 +572,8 @@ class CarRentalContract(models.Model):
             'Please find the details below:<br/><br/>'
             '<table><tr><td>Invoice Number<td/><td> %s<td/><tr/>'
             '<tr><td>Date<td/><td> %s <td/><tr/><tr><td>Amount <td/><td> %s<td/><tr/><table/>') % (
-                           self.customer_id.name, inv_id.payment_reference, inv_id.invoice_date, inv_id.amount_total)
+                           self.customer_id.name, inv_id.payment_reference,
+                           inv_id.invoice_date, inv_id.amount_total)
         main_content = {
             'subject': _('Payment Received: %s') % inv_id.payment_reference,
             'author_id': self.env.user.partner_id.id,
@@ -563,8 +584,6 @@ class CarRentalContract(models.Model):
         imd = self.env['ir.model.data']
         action = self.env.ref('account.action_move_out_invoice_type')
 
-            # action = imd._xmlid_lookup('account.action_move_out_invoice_type')
-            # action = imd._xmlid_to_res_id('account.action_move_out_invoice_type')
         result = {
             'name': action.name,
             'type': 'ir.actions.act_window',
@@ -575,9 +594,6 @@ class CarRentalContract(models.Model):
         }
         return result
 
-        else:
-            raise Warning("Please enter advance amount to make first payment")
-
 
 class FleetRentalLine(models.Model):
     _name = 'fleet.rental.line'
@@ -587,7 +603,8 @@ class FleetRentalLine(models.Model):
     account_info = fields.Char('Account')
     recurring_amount = fields.Float('Amount')
     rental_number = fields.Many2one('car.rental.contract', string='Rental Number')
-    payment_info = fields.Char(compute='paid_info', string='Payment Stage', default='draft')
+    payment_info = fields.Char(compute='paid_info', string='Payment Stage',
+                               default='draft')
     invoice_number = fields.Integer(string='Invoice ID')
     invoice_ref = fields.Many2one('account.move', string='Invoice Ref')
     date_due = fields.Date(string='Due Date', related='invoice_ref.invoice_date_due')
@@ -595,7 +612,8 @@ class FleetRentalLine(models.Model):
     def paid_info(self):
         for each in self:
             if self.env['account.move'].browse(each.invoice_number):
-                each.payment_info = self.env['account.move'].browse(each.invoice_number).state
+                each.payment_info = self.env['account.move'].browse(
+                    each.invoice_number).state
             else:
                 each.payment_info = 'Record Deleted'
 

fleet_rental/models/fleet.py

@@ -3,7 +3,7 @@
 #
 #    Cybrosys Technologies Pvt. Ltd.
 #
-#    Copyright (C) 2021-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
+#    Copyright (C) 2023-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
 #    Author: Cybrosys Technogies @cybrosys(odoo@cybrosys.com)
 #
 #    You can modify it under the terms of the GNU AFFERO
@@ -38,7 +38,8 @@ class EmployeeFleet(models.Model):
 
     rental_check_availability = fields.Boolean(default=True, copy=False)
     color = fields.Char(string='Color', default='#FFFFFF')
-    rental_reserved_time = fields.One2many('rental.fleet.reserved', 'reserved_obj', string='Reserved Time', readonly=1,
+    rental_reserved_time = fields.One2many('rental.fleet.reserved', 'reserved_obj',
+                                           string='Reserved Time', readonly=1,
                                            ondelete='cascade')
     fuel_type = fields.Selection([('gasoline', 'Gasoline'),
                                   ('diesel', 'Diesel'),
@@ -47,5 +48,7 @@ class EmployeeFleet(models.Model):
                                   ('petrol', 'Petrol')],
                                  'Fuel Type', help='Fuel Used by the vehicle')
 
-    _sql_constraints = [('vin_sn_unique', 'unique (vin_sn)', "Chassis Number already exists !"),
-                        ('license_plate_unique', 'unique (license_plate)', "License plate already exists !")]
+    _sql_constraints = [
+        ('vin_sn_unique', 'unique (vin_sn)', "Chassis Number already exists !"),
+        ('license_plate_unique', 'unique (license_plate)',
+         "License plate already exists !")]

fleet_rental/models/res_config_settings.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+#############################################################################
+#
+#    Cybrosys Technologies Pvt. Ltd.
+#
+#    Copyright (C) 2023-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
+#    Author: Cybrosys Technogies @cybrosys(odoo@cybrosys.com)
+#
+#    You can modify it under the terms of the GNU AFFERO
+#    GENERAL PUBLIC LICENSE (AGPL v3), Version 3.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details.
+#
+#    You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+#    (AGPL v3) along with this program.
+#    If not, see <http://www.gnu.org/licenses/>.
+#
+#############################################################################
+from odoo import api, fields, models
+
+
+class ResConfigSettings(models.TransientModel):
+    """Inherit configuration settings"""
+    _inherit = 'res.config.settings'
+
+    def _get_default_product(self):
+        return self.env.ref('fleet_rental.fleet_service_product').id
+
+    fleet_service_product_id = fields.Many2one('product.template',
+                                               string="Product",
+                                               config_parameter='fleet_service_product_id',
+                                               default=_get_default_product)

fleet_rental/reports/__init__.py

@@ -3,7 +3,7 @@
 #
 #    Cybrosys Technologies Pvt. Ltd.
 #
-#    Copyright (C) 2021-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
+#    Copyright (C) 2023-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
 #    Author: Cybrosys Technogies @cybrosys(odoo@cybrosys.com)
 #
 #    You can modify it under the terms of the GNU AFFERO

fleet_rental/reports/rental_report.py

@@ -3,7 +3,7 @@
 #
 #    Cybrosys Technologies Pvt. Ltd.
 #
-#    Copyright (C) 2021-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
+#    Copyright (C) 2023-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
 #    Author: Cybrosys Technogies @cybrosys(odoo@cybrosys.com)
 #
 #    You can modify it under the terms of the GNU AFFERO

fleet_rental/reports/rental_report.xml

@@ -6,7 +6,8 @@
             <field name="name">report.fleet.rental.pivot</field>
             <field name="model">report.fleet.rental</field>
             <field name="arch" type="xml">
-                <pivot string="Fleet Rental Analysis" display_quantity="true" disable_linking="True">
+                <pivot string="Fleet Rental Analysis" display_quantity="true"
+                       disable_linking="True">
                     <field name="name" type="row"/>
                 </pivot>
             </field>
@@ -17,10 +18,14 @@
             <field name="res_model">report.fleet.rental</field>
             <field name="view_mode">pivot</field>
             <field name="context">{'group_by_no_leaf':1,'group_by':[]}</field>
-            <field name="help">This report allows you to analyse the performance of your Fleet Rental. </field>
+            <field name="help">This report allows you to analyse the performance of your
+                Fleet Rental.
+            </field>
         </record>
 
-        <menuitem name="Fleet Rental Analysis" action="action_fleet_rental_analysis" id="menu_fleet_rental_analysis" parent="fleet.menu_fleet_reporting" sequence="1"/>
+        <menuitem name="Fleet Rental Analysis" action="action_fleet_rental_analysis"
+                  id="menu_fleet_rental_analysis" parent="fleet.menu_fleet_reporting"
+                  sequence="1"/>
     </data>
 
 </odoo>

fleet_rental/static/description/index.html

@@ -1,9 +1,11 @@
-<div class="container" style="padding: 1rem !important; margin-bottom: 1.5rem !important;">
+<div class="container"
+     style="padding: 1rem !important; margin-bottom: 1.5rem !important;">
     <div class="row">
         <div class="col-sm-12 col-md-12 col-lg-12 d-flex justify-content-between"
              style="border-bottom: 1px solid #d5d5d5;">
             <div class="my-3">
-                <img src="./images/logo.png" style="width: auto !important; height: 40px !important;">
+                <img src="./images/logo.png"
+                     style="width: auto !important; height: 40px !important;">
             </div>
             <div class="my-3 d-flex align-items-center">
                 <div
@@ -26,11 +28,14 @@
         <div class="row">
             <div class="col-lg-12 d-flex flex-column justify-content-center"
                  style="text-align: center; padding: 1rem !important;">
-                <h1 class="text-center" style="color: #212121 !important; font-size: 3.5rem !important;"><span
-                        style="font-weight: 700 !important;">Fleet Rental Management</span></h1>
+                <h1 class="text-center"
+                    style="color: #212121 !important; font-size: 3.5rem !important;"><span
+                        style="font-weight: 700 !important;">Fleet Rental Management</span>
+                </h1>
                 <p class="text-center"
                    style="color: #212529 !important; font-size: 1.5rem !important; letter-spacing: 1px !important;">
-                    With this module you can give vehicles like car, van, bike, jeep etc. for rent.
+                    With this module you can give vehicles like car, van, bike, jeep etc.
+                    for rent.
                 </p>
                 <img src="./images/hero.png" class="img-responsive">
             </div>
@@ -44,11 +49,16 @@
                 <h2 style="color: #212529 !important;">Overview</h2>
                 <hr
                         style="border: 3px solid #AC1015 !important; background-color: #AC1015 !important; width: 80px !important; margin-bottom: 2rem !important;"/>
-                <p class="text-center" style="color: #212529 !important; font-size: 1.5rem !important;">
-                    This module is an application for Vehicle Rental System which helps in managing the rental of
-                    vehicles like car,van,bike, jeep etc. It manages fleet/vehicle property by extending the basic
-                    fleet module of Odoo. Currently fleet module does not have any connection with accounting
-                    module. But in this module, we integrate the module with accounting also.
+                <p class="text-center"
+                   style="color: #212529 !important; font-size: 1.5rem !important;">
+                    This module is an application for Vehicle Rental System which helps in
+                    managing the rental of
+                    vehicles like car,van,bike, jeep etc. It manages fleet/vehicle
+                    property by extending the basic
+                    fleet module of Odoo. Currently fleet module does not have any
+                    connection with accounting
+                    module. But in this module, we integrate the module with accounting
+                    also.
             </div>
         </div>
         <!-- END OF OVERVIEW -->
@@ -56,8 +66,10 @@
 
         <!-- KEY FEATURES -->
         <div class="row">
-            <div class="col-lg-12 d-flex flex-column justify-content-center" style="padding: 2.5rem 1rem !important;">
-                <h2 class="text-center" style="color: #212529 !important;">Key Features</h2>
+            <div class="col-lg-12 d-flex flex-column justify-content-center"
+                 style="padding: 2.5rem 1rem !important;">
+                <h2 class="text-center" style="color: #212529 !important;">Key
+                    Features</h2>
                 <hr
                         style="border: 3px solid #AC1015 !important; background-color: #AC1015 !important; width: 80px !important; margin-bottom: 2rem !important;"/>
                 <div class="row">
@@ -67,16 +79,19 @@
 
                         <div class="d-flex deep-2"
                              style="height: 60px !important; padding: 1rem 1.5rem !important; border-radius: 0 !important; margin: 1.5rem 0">
-                            <img src="./images/checked.png" style="height: 24px !important; width: 24px !important;"
+                            <img src="./images/checked.png"
+                                 style="height: 24px !important; width: 24px !important;"
                                  class="mt-1 mr-2" height="24px" width="24px">
                             <p style="color: #212529 !important; font-size: 1.3rem !important;">
-                                Multiple Plans for Rental Contract(Days/Weeks/Months/Years).
+                                Multiple Plans for Rental
+                                Contract(Days/Weeks/Months/Years).
                             </p>
                         </div>
 
                         <div class="d-flex deep-2"
                              style="height: 60px !important; padding: 1rem 1.5rem !important; border-radius: 0 !important; margin: 1.5rem 0">
-                            <img src="./images/checked.png" style="height: 24px !important; width: 24px !important;"
+                            <img src="./images/checked.png"
+                                 style="height: 24px !important; width: 24px !important;"
                                  class="mt-1 mr-2" height="24px" width="24px">
                             <p style="color: #212529 !important; font-size: 1.3rem !important;">
                                 Integrated with Accounting Module.
@@ -85,7 +100,8 @@
 
                         <div class="d-flex deep-2"
                              style="height: 60px !important; padding: 1rem 1.5rem !important; border-radius: 0 !important; margin: 1.5rem 0">
-                            <img src="./images/checked.png" style="height: 24px !important; width: 24px !important;"
+                            <img src="./images/checked.png"
+                                 style="height: 24px !important; width: 24px !important;"
                                  class="mt-1 mr-2" height="24px" width="24px">
                             <p style="color: #212529 !important; font-size: 1.3rem !important;">
                                 Automatically Create Recurring Invoices.
@@ -94,16 +110,19 @@
 
                         <div class="d-flex deep-2"
                              style="height: 60px !important; padding: 1rem 1.5rem !important; border-radius: 0 !important; margin: 1.5rem 0">
-                            <img src="./images/checked.png" style="height: 24px !important; width: 24px !important;"
+                            <img src="./images/checked.png"
+                                 style="height: 24px !important; width: 24px !important;"
                                  class="mt-1 mr-2" height="24px" width="24px">
                             <p style="color: #212529 !important; font-size: 1.3rem !important;">
-                                Sending email for confirmation, first payment and recurrent invoices.
+                                Sending email for confirmation, first payment and
+                                recurrent invoices.
                             </p>
                         </div>
 
                         <div class="d-flex deep-2"
                              style="height: 60px !important; padding: 1rem 1.5rem !important; border-radius: 0 !important; margin: 1.5rem 0">
-                            <img src="./images/checked.png" style="height: 24px !important; width: 24px !important;"
+                            <img src="./images/checked.png"
+                                 style="height: 24px !important; width: 24px !important;"
                                  class="mt-1 mr-2" height="24px" width="24px">
                             <p style="color: #212529 !important; font-size: 1.3rem !important;">
                                 Check List Facility.
@@ -112,7 +131,8 @@
 
                         <div class="d-flex deep-2"
                              style="height: 60px !important; padding: 1rem 1.5rem !important; border-radius: 0 !important; margin: 1.5rem 0">
-                            <img src="./images/checked.png" style="height: 24px !important; width: 24px !important;"
+                            <img src="./images/checked.png"
+                                 style="height: 24px !important; width: 24px !important;"
                                  class="mt-1 mr-2" height="24px" width="24px">
                             <p style="color: #212529 !important; font-size: 1.3rem !important;">
                                 Separate Tree view for Checklist.
@@ -121,7 +141,8 @@
 
                         <div class="d-flex deep-2"
                              style="height: 60px !important; padding: 1rem 1.5rem !important; border-radius: 0 !important; margin: 1.5rem 0">
-                            <img src="./images/checked.png" style="height: 24px !important; width: 24px !important;"
+                            <img src="./images/checked.png"
+                                 style="height: 24px !important; width: 24px !important;"
                                  class="mt-1 mr-2" height="24px" width="24px">
                             <p style="color: #212529 !important; font-size: 1.3rem !important;">
                                 Damage Checking Facility.
@@ -130,7 +151,8 @@
 
                         <div class="d-flex deep-2"
                              style="height: 60px !important; padding: 1rem 1.5rem !important; border-radius: 0 !important; margin: 1.5rem 0">
-                            <img src="./images/checked.png" style="height: 24px !important; width: 24px !important;"
+                            <img src="./images/checked.png"
+                                 style="height: 24px !important; width: 24px !important;"
                                  class="mt-1 mr-2" height="24px" width="24px">
                             <p style="color: #212529 !important; font-size: 1.3rem !important;">
                                 Billing Facility for Damages/Check Lists.
@@ -139,7 +161,8 @@
 
                         <div class="d-flex deep-2"
                              style="height: 60px !important; padding: 1rem 1.5rem !important; border-radius: 0 !important; margin: 1.5rem 0">
-                            <img src="./images/checked.png" style="height: 24px !important; width: 24px !important;"
+                            <img src="./images/checked.png"
+                                 style="height: 24px !important; width: 24px !important;"
                                  class="mt-1 mr-2" height="24px" width="24px">
                             <p style="color: #212529 !important; font-size: 1.3rem !important;">
                                 Contract Payment Validations.
@@ -148,7 +171,8 @@
 
                         <div class="d-flex deep-2"
                              style="height: 60px !important; padding: 1rem 1.5rem !important; border-radius: 0 !important; margin: 1.5rem 0">
-                            <img src="./images/checked.png" style="height: 24px !important; width: 24px !important;"
+                            <img src="./images/checked.png"
+                                 style="height: 24px !important; width: 24px !important;"
                                  class="mt-1 mr-2" height="24px" width="24px">
                             <p style="color: #212529 !important; font-size: 1.3rem !important;">
                                 Detailed Fleet Rental Analysis Report.
@@ -157,7 +181,8 @@
 
                         <div class="d-flex deep-2"
                              style="height: 60px !important; padding: 1rem 1.5rem !important; border-radius: 0 !important; margin: 1.5rem 0">
-                            <img src="./images/checked.png" style="height: 24px !important; width: 24px !important;"
+                            <img src="./images/checked.png"
+                                 style="height: 24px !important; width: 24px !important;"
                                  class="mt-1 mr-2" height="24px" width="24px">
                             <p style="color: #212529 !important; font-size: 1.3rem !important;">
                                 Access Rights From Multiple Level.
@@ -166,7 +191,8 @@
 
                         <div class="d-flex deep-2"
                              style="height: 60px !important; padding: 1rem 1.5rem !important; border-radius: 0 !important; margin: 1.5rem 0">
-                            <img src="./images/checked.png" style="height: 24px !important; width: 24px !important;"
+                            <img src="./images/checked.png"
+                                 style="height: 24px !important; width: 24px !important;"
                                  class="mt-1 mr-2" height="24px" width="24px">
                             <p style="color: #212529 !important; font-size: 1.3rem !important;">
                                 Flexible for further customization.
@@ -183,13 +209,16 @@
 
         <!-- SCREENSHOTS -->
         <div class="row">
-            <div class="col-lg-12 d-flex flex-column justify-content-center" style="padding: 2.5rem 1rem !important;">
-                <h2 style="text-align: center;  color: #212529 !important;">Screenshots</h2>
+            <div class="col-lg-12 d-flex flex-column justify-content-center"
+                 style="padding: 2.5rem 1rem !important;">
+                <h2 style="text-align: center;  color: #212529 !important;">
+                    Screenshots</h2>
                 <hr
                         style="border: 3px solid #AC1015 !important; background-color: #AC1015 !important; width: 80px !important; margin-bottom: 2rem !important;"/>
 
                 <!-- img -->
-                <div class="d-flex m-0" style="border-bottom: 1px solid #e5e5e5 !important;">
+                <div class="d-flex m-0"
+                     style="border-bottom: 1px solid #e5e5e5 !important;">
                     <div class="mr-3">
                         <h3
                                 style="font-size: 2rem !important; font-weight: 800 !important; color: #ffffff !important; background-color: #AC1015 !important; padding: 1rem !important; width: 70px !important;    height: 75px !important;">
@@ -201,19 +230,23 @@
                         </h3>
                         <p
                                 style="color: #212529 !important; font-size: 1.3rem !important; font-weight: 300 !important;">
-                            When you install the module, an extra menu named Rental Management is created under the
-                            Fleet Menu. Also "Fleet" menu is replaced as "Fleet Rental". Here you can see different
-                            color codes according to each state. This helps you in finding out contracts easily.
+                            When you install the module, an extra menu named Rental
+                            Management is created under the
+                            Fleet Menu. Also "Fleet" menu is replaced as "Fleet Rental".
+                            Here you can see different
+                            color codes according to each state. This helps you in finding
+                            out contracts easily.
                         </p>
 
                     </div>
                 </div>
                 <img src="./images/screenshot-1.png" class="img-responsive border"
                      style="margin-top: -15px !important; margin-top: 1rem !important;  margin-bottom: 4rem !important;">
-                <!-- endo of img -->
+                <!-- end of img -->
 
                 <!-- img -->
-                <div class="d-flex m-0" style="border-bottom: 1px solid #e5e5e5 !important;">
+                <div class="d-flex m-0"
+                     style="border-bottom: 1px solid #e5e5e5 !important;">
                     <div class="mr-3">
                         <h3
                                 style="font-size: 2rem !important; font-weight: 800 !important; color: #ffffff !important; background-color: #AC1015 !important; padding: 1rem !important; width: 70px !important;    height: 75px !important;">
@@ -225,9 +258,11 @@
                         </h3>
                         <p
                                 style="color: #212529 !important; font-size: 1.3rem !important; font-weight: 300 !important;">
-                            This is the Rental Contract form. You can see the Recurring lines created according to
+                            This is the Rental Contract form. You can see the Recurring
+                            lines created according to
                             the
-                            Recurring cost.<br />And also you can see all the invoices related to this contract from
+                            Recurring cost.<br/>And also you can see all the invoices
+                            related to this contract from
                             the smart
                             button "Invoices".
                         </p>
@@ -235,11 +270,12 @@
                 </div>
                 <img src="./images/screenshot-2.png" class="img-responsive border"
                      style="margin-top: -15px !important; margin-top: 1rem !important;  margin-bottom: 4rem !important;">
-                <!-- endo of img -->
+                <!-- end of img -->
 
 
                 <!-- img -->
-                <div class="d-flex m-0" style="border-bottom: 1px solid #e5e5e5 !important;">
+                <div class="d-flex m-0"
+                     style="border-bottom: 1px solid #e5e5e5 !important;">
                     <div class="mr-3">
                         <h3
                                 style="font-size: 2rem !important; font-weight: 800 !important; color: #ffffff !important; background-color: #AC1015 !important; padding: 1rem !important; width: 70px !important;    height: 75px !important;">
@@ -251,20 +287,26 @@
                         </h3>
                         <p
                                 style="color: #212529 !important; font-size: 1.3rem !important; font-weight: 300 !important;">
-                            Here you can add the list of tools given with the vehicle. When the vehicle is returned
-                            back, the checklist can be validated and helps you to identify the tools that are not
-                            returned. The price of unreturned tools will be added to the missing tool cost. The
-                            renter have to pay that amount and you can also add damage cost if any. Check the
-                            damages by using the images of vehicle uploaded before the contract.
+                            Here you can add the list of tools given with the vehicle.
+                            When the vehicle is returned
+                            back, the checklist can be validated and helps you to identify
+                            the tools that are not
+                            returned. The price of unreturned tools will be added to the
+                            missing tool cost. The
+                            renter have to pay that amount and you can also add damage
+                            cost if any. Check the
+                            damages by using the images of vehicle uploaded before the
+                            contract.
                         </p>
                     </div>
                 </div>
                 <img src="./images/screenshot-3.png" class="img-responsive border"
                      style="margin-top: -15px !important; margin-top: 1rem !important;  margin-bottom: 4rem !important;">
-                <!-- endo of img -->
+                <!-- end of img -->
 
                 <!-- img -->
-                <div class="d-flex m-0" style="border-bottom: 1px solid #e5e5e5 !important;">
+                <div class="d-flex m-0"
+                     style="border-bottom: 1px solid #e5e5e5 !important;">
                     <div class="mr-3">
                         <h3
                                 style="font-size: 2rem !important; font-weight: 800 !important; color: #ffffff !important; background-color: #AC1015 !important; padding: 1rem !important; width: 70px !important;    height: 75px !important;">
@@ -277,9 +319,12 @@
                         <p
                                 style="color: #212529 !important; font-size: 1.3rem !important; font-weight: 300 !important;">
 
-                            You can also create invoice against the checklist from here. The checklists are those
-                            which are in the checking state, that means the ones ready for checking the operation.
-                            If there is any damage or any missing tool, then you can charge all that from customer.
+                            You can also create invoice against the checklist from here.
+                            The checklists are those
+                            which are in the checking state, that means the ones ready for
+                            checking the operation.
+                            If there is any damage or any missing tool, then you can
+                            charge all that from customer.
                         </p>
                     </div>
                 </div>
@@ -287,24 +332,50 @@
                      style="margin-top: -15px !important; margin-top: 1rem !important;  margin-bottom: 4rem !important;">
                 <img src="./images/screenshot-5.png" class="img-responsive border"
                      style="margin-top: -15px !important; margin-top: 1rem !important;  margin-bottom: 4rem !important;">
-                <!-- endo of img -->
+                <!-- end of img -->
 
                 <!-- img -->
-                <div class="d-flex m-0" style="border-bottom: 1px solid #e5e5e5 !important;">
+                <div class="d-flex m-0"
+                     style="border-bottom: 1px solid #e5e5e5 !important;">
                     <div class="mr-3">
                         <h3
                                 style="font-size: 2rem !important; font-weight: 800 !important; color: #ffffff !important; background-color: #AC1015 !important; padding: 1rem !important; width: 70px !important;    height: 75px !important;">
                             05</h3>
                     </div>
+                    <div>
+                        <h3 style="font-size: 1.7rem !important; font-weight: 600 !important;">
+                            Fleet Rental Service Product
+                        </h3>
+                        <p
+                                style="color: #212529 !important; font-size: 1.3rem !important; font-weight: 300 !important;">
+
+                            You can also select the Service product in Configuration Settings.
+                        </p>
+                    </div>
+                </div>
+                <img src="./images/screenshot-12.png" class="img-responsive border"
+                     style="margin-top: -15px !important; margin-top: 1rem !important;  margin-bottom: 4rem !important;">
+                <!-- end of img -->
+
+                <!-- img -->
+                <div class="d-flex m-0"
+                     style="border-bottom: 1px solid #e5e5e5 !important;">
+                    <div class="mr-3">
+                        <h3
+                                style="font-size: 2rem !important; font-weight: 800 !important; color: #ffffff !important; background-color: #AC1015 !important; padding: 1rem !important; width: 70px !important;    height: 75px !important;">
+                            06</h3>
+                    </div>
                     <div>
                         <h3 style="font-size: 1.7rem !important; font-weight: 600 !important;">
                             Email Notifications
                         </h3>
                         <p
                                 style="color: #212529 !important; font-size: 1.3rem !important; font-weight: 300 !important;">
-                            The system will send email notification to notify the confirmation of contract.
+                            The system will send email notification to notify the
+                            confirmation of contract.
                             <br/>
-                            <strong>Note: </strong>You should configure outgoing and incoming e-mail settings from
+                            <strong>Note: </strong>You should configure outgoing and
+                            incoming e-mail settings from
                             your odoo for email service.
                         </p>
                     </div>
@@ -322,15 +393,16 @@
 
                 <img src="./images/screenshot-8.png" class="img-responsive border"
                      style="margin-top: -15px !important; margin-top: 1rem !important;  margin-bottom: 4rem !important;">
-                <!-- endo of img -->
+                <!-- end of img -->
 
 
                 <!-- img -->
-                <div class="d-flex m-0" style="border-bottom: 1px solid #e5e5e5 !important;">
+                <div class="d-flex m-0"
+                     style="border-bottom: 1px solid #e5e5e5 !important;">
                     <div class="mr-3">
                         <h3
                                 style="font-size: 2rem !important; font-weight: 800 !important; color: #ffffff !important; background-color: #AC1015 !important; padding: 1rem !important; width: 70px !important;    height: 75px !important;">
-                            06</h3>
+                            07</h3>
                     </div>
                     <div>
                         <h3 style="font-size: 1.7rem !important; font-weight: 600 !important;">
@@ -338,8 +410,10 @@
                         </h3>
                         <p
                                 style="color: #212529 !important; font-size: 1.3rem !important; font-weight: 300 !important;">
-                            Here you can see you have 1 invoice and this contract is in 'Invoice' state. So you can
-                            set this contract to done only if all the invoices are in 'paid' state. Otherwise it
+                            Here you can see you have 1 invoice and this contract is in
+                            'Invoice' state. So you can
+                            set this contract to done only if all the invoices are in
+                            'paid' state. Otherwise it
                             will raise a warning as follow.
 
                         </p>
@@ -349,14 +423,15 @@
                      style="margin-top: -15px !important; margin-top: 1rem !important;  margin-bottom: 4rem !important;">
                 <img src="./images/screenshot-10.png" class="img-responsive border"
                      style="margin-top: -15px !important; margin-top: 1rem !important;  margin-bottom: 4rem !important;">
-                <!-- endo of img -->
+                <!-- end of img -->
 
                 <!-- img -->
-                <div class="d-flex m-0" style="border-bottom: 1px solid #e5e5e5 !important;">
+                <div class="d-flex m-0"
+                     style="border-bottom: 1px solid #e5e5e5 !important;">
                     <div class="mr-3">
                         <h3
                                 style="font-size: 2rem !important; font-weight: 800 !important; color: #ffffff !important; background-color: #AC1015 !important; padding: 1rem !important; width: 70px !important;    height: 75px !important;">
-                            07</h3>
+                            08</h3>
                     </div>
                     <div>
                         <h3 style="font-size: 1.7rem !important; font-weight: 600 !important;">
@@ -364,7 +439,8 @@
                         </h3>
                         <p
                                 style="color: #212529 !important; font-size: 1.3rem !important; font-weight: 300 !important;">
-                            You can also analyse all your fleet rentals from Fleet Rental -> Reports -> Fleet Rental
+                            You can also analyse all your fleet rentals from Fleet Rental
+                            -> Reports -> Fleet Rental
                             Analysis.
 
                         </p>
@@ -372,7 +448,7 @@
                 </div>
                 <img src="./images/screenshot-11.png" class="img-responsive border"
                      style="margin-top: -15px !important; margin-top: 1rem !important;  margin-bottom: 4rem !important;">
-                <!-- endo of img -->
+                <!-- end of img -->
 
             </div>
         </div>
@@ -391,7 +467,8 @@
                     <!-- The slideshow -->
                     <div class="carousel-inner">
                         <div class="carousel-item active" style="min-height:0px">
-                            <div class="col-xs-12 col-sm-4 col-md-4 mb16 mt16" style="float:left">
+                            <div class="col-xs-12 col-sm-4 col-md-4 mb16 mt16"
+                                 style="float:left">
                                 <a href="https://apps.odoo.com/apps/modules/14.0/customer_followup_community/"
                                    target="_blank">
                                     <div style="border-radius:10px">
@@ -401,8 +478,10 @@
                                     </div>
                                 </a>
                             </div>
-                            <div class="col-xs-12 col-sm-4 col-md-4 mb16 mt16" style="float:left">
-                                <a href="https://apps.odoo.com/apps/modules/14.0/dashboard_pos/" target="_blank">
+                            <div class="col-xs-12 col-sm-4 col-md-4 mb16 mt16"
+                                 style="float:left">
+                                <a href="https://apps.odoo.com/apps/modules/14.0/dashboard_pos/"
+                                   target="_blank">
                                     <div style="border-radius:10px">
                                         <img class="img img-responsive center-block"
                                              style="border-top-left-radius:10px; border-top-right-radius:10px"
@@ -410,7 +489,8 @@
                                     </div>
                                 </a>
                             </div>
-                            <div class="col-xs-12 col-sm-4 col-md-4 mb16 mt16" style="float:left">
+                            <div class="col-xs-12 col-sm-4 col-md-4 mb16 mt16"
+                                 style="float:left">
                                 <a href="https://apps.odoo.com/apps/modules/14.0/product_approval_management/"
                                    target="_blank">
                                     <div style="border-radius:10px">
@@ -422,7 +502,8 @@
                             </div>
                         </div>
                         <div class="carousel-item" style="min-height:0px">
-                            <div class="col-xs-12 col-sm-4 col-md-4 mb16 mt16" style="float:left">
+                            <div class="col-xs-12 col-sm-4 col-md-4 mb16 mt16"
+                                 style="float:left">
                                 <a href="https://apps.odoo.com/apps/modules/14.0/multiple_reference_per_product/"
                                    target="_blank">
                                     <div style="border-radius:10px">
@@ -432,7 +513,8 @@
                                     </div>
                                 </a>
                             </div>
-                            <div class="col-xs-12 col-sm-4 col-md-4 mb16 mt16" style="float:left">
+                            <div class="col-xs-12 col-sm-4 col-md-4 mb16 mt16"
+                                 style="float:left">
                                 <a href="https://apps.odoo.com/apps/modules/14.0/shopify_odoo_connector/"
                                    target="_blank">
                                     <div style="border-radius:10px">
@@ -442,8 +524,10 @@
                                     </div>
                                 </a>
                             </div>
-                            <div class="col-xs-12 col-sm-4 col-md-4 mb16 mt16" style="float:left">
-                                <a href="https://apps.odoo.com/apps/modules/14.0/pos_order_types/" target="_blank">
+                            <div class="col-xs-12 col-sm-4 col-md-4 mb16 mt16"
+                                 style="float:left">
+                                <a href="https://apps.odoo.com/apps/modules/14.0/pos_order_types/"
+                                   target="_blank">
                                     <div style="border-radius:10px">
                                         <img class="img img-responsive center-block"
                                              style="border-top-left-radius:10px; border-top-right-radius:10px"
@@ -455,11 +539,14 @@
                     </div>
                     <!-- Left and right controls -->
                     <a class="carousel-control-prev" href="#demo1" data-slide="prev"
-                        style="left:-25px;width: 35px;color: #000;"> <span class="carousel-control-prev-icon"><i
-                                class="fa fa-chevron-left" style="font-size:24px"></i></span> </a> <a
+                       style="left:-25px;width: 35px;color: #000;"> <span
+                            class="carousel-control-prev-icon"><i
+                            class="fa fa-chevron-left" style="font-size:24px"></i></span>
+                    </a> <a
                         class="carousel-control-next" href="#demo1" data-slide="next"
                         style="right:-25px;width: 35px;color: #000;">
-                        <span class="carousel-control-next-icon"><i class="fa fa-chevron-right"
+                        <span class="carousel-control-next-icon"><i
+                                class="fa fa-chevron-right"
                                 style="font-size:24px"></i></span>
                 </a>
                 </div>
@@ -479,30 +566,36 @@
                 <div class="col-lg-4 d-flex flex-column justify-content-center align-items-center my-4">
                     <div class="d-flex justify-content-center align-items-center mx-3 my-3"
                          style="background-color: #1dd1a1 !important; border-radius: 15px !important; height: 80px; width: 80px;">
-                        <img src="assets/icons/cogs.png" class="img-responsive" height="48px" width="48px">
+                        <img src="assets/icons/cogs.png" class="img-responsive"
+                             height="48px" width="48px">
                     </div>
                     <h6 class="text-center"
-                        style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">Odoo
+                        style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">
+                        Odoo
                         Customization</h6>
                 </div>
 
                 <div class="col-lg-4 d-flex flex-column justify-content-center align-items-center my-4">
                     <div class="d-flex justify-content-center align-items-center mx-3 my-3"
                          style="background-color: #ff6b6b !important; border-radius: 15px !important; height: 80px; width: 80px;">
-                        <img src="assets/icons/wrench.png" class="img-responsive" height="48px" width="48px">
+                        <img src="assets/icons/wrench.png" class="img-responsive"
+                             height="48px" width="48px">
                     </div>
                     <h6 class="text-center"
-                        style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">Odoo
+                        style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">
+                        Odoo
                         Implementation</h6>
                 </div>
 
                 <div class="col-lg-4 d-flex flex-column justify-content-center align-items-center my-4">
                     <div class="d-flex justify-content-center align-items-center mx-3 my-3"
                          style="background-color: #6462CD !important; border-radius: 15px !important; height: 80px; width: 80px;">
-                        <img src="assets/icons/lifebuoy.png" class="img-responsive" height="48px" width="48px">
+                        <img src="assets/icons/lifebuoy.png" class="img-responsive"
+                             height="48px" width="48px">
                     </div>
                     <h6 class="text-center"
-                        style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">Odoo
+                        style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">
+                        Odoo
                         Support</h6>
                 </div>
 
@@ -510,10 +603,12 @@
                 <div class="col-lg-4 d-flex flex-column justify-content-center align-items-center my-4">
                     <div class="d-flex justify-content-center align-items-center mx-3 my-3"
                          style="background-color: #ffa801 !important; border-radius: 15px !important; height: 80px; width: 80px;">
-                        <img src="assets/icons/user.png" class="img-responsive" height="48px" width="48px">
+                        <img src="assets/icons/user.png" class="img-responsive"
+                             height="48px" width="48px">
                     </div>
                     <h6 class="text-center"
-                        style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">Hire
+                        style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">
+                        Hire
                         Odoo
                         Developer</h6>
                 </div>
@@ -521,20 +616,24 @@
                 <div class="col-lg-4 d-flex flex-column justify-content-center align-items-center my-4">
                     <div class="d-flex justify-content-center align-items-center mx-3 my-3"
                          style="background-color: #54a0ff  !important; border-radius: 15px !important; height: 80px; width: 80px;">
-                        <img src="assets/icons/puzzle.png" class="img-responsive" height="48px" width="48px">
+                        <img src="assets/icons/puzzle.png" class="img-responsive"
+                             height="48px" width="48px">
                     </div>
                     <h6 class="text-center"
-                        style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">Odoo
+                        style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">
+                        Odoo
                         Integration</h6>
                 </div>
 
                 <div class="col-lg-4 d-flex flex-column justify-content-center align-items-center my-4">
                     <div class="d-flex justify-content-center align-items-center mx-3 my-3"
                          style="background-color: #6d7680 !important; border-radius: 15px !important; height: 80px; width: 80px;">
-                        <img src="assets/icons/update.png" class="img-responsive" height="48px" width="48px">
+                        <img src="assets/icons/update.png" class="img-responsive"
+                             height="48px" width="48px">
                     </div>
                     <h6 class="text-center"
-                        style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">Odoo
+                        style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">
+                        Odoo
                         Migration</h6>
                 </div>
 
@@ -542,30 +641,36 @@
                 <div class="col-lg-4 d-flex flex-column justify-content-center align-items-center my-4">
                     <div class="d-flex justify-content-center align-items-center mx-3 my-3"
                          style="background-color: #786fa6 !important; border-radius: 15px !important; height: 80px; width: 80px;">
-                        <img src="assets/icons/consultation.png" class="img-responsive" height="48px" width="48px">
+                        <img src="assets/icons/consultation.png" class="img-responsive"
+                             height="48px" width="48px">
                     </div>
                     <h6 class="text-center"
-                        style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">Odoo
+                        style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">
+                        Odoo
                         Consultancy</h6>
                 </div>
 
                 <div class="col-lg-4 d-flex flex-column justify-content-center align-items-center my-4">
                     <div class="d-flex justify-content-center align-items-center mx-3 my-3"
                          style="background-color: #f8a5c2 !important; border-radius: 15px !important; height: 80px; width: 80px;">
-                        <img src="assets/icons/training.png" class="img-responsive" height="48px" width="48px">
+                        <img src="assets/icons/training.png" class="img-responsive"
+                             height="48px" width="48px">
                     </div>
                     <h6 class="text-center"
-                        style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">Odoo
+                        style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">
+                        Odoo
                         Implementation</h6>
                 </div>
 
                 <div class="col-lg-4 d-flex flex-column justify-content-center align-items-center my-4">
                     <div class="d-flex justify-content-center align-items-center mx-3 my-3"
                          style="background-color: #e6be26 !important; border-radius: 15px !important; height: 80px; width: 80px;">
-                        <img src="assets/icons/license.png" class="img-responsive" height="48px" width="48px">
+                        <img src="assets/icons/license.png" class="img-responsive"
+                             height="48px" width="48px">
                     </div>
                     <h6 class="text-center"
-                        style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">Odoo
+                        style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">
+                        Odoo
                         Licensing Consultancy</h6>
                 </div>
             </div>
@@ -584,7 +689,8 @@
                 <div class="col-lg-3">
                     <div class="my-4 d-flex flex-column justify-content-center"
                          style="background-color: #f6f8f9 !important; border-radius: 10px; padding: 2rem !important; height: 250px !important;">
-                        <img src="./assets/icons/trading-black.png" class="img-responsive mb-3" height="48px"
+                        <img src="./assets/icons/trading-black.png"
+                             class="img-responsive mb-3" height="48px"
                              width="48px">
                         <h5
                                 style="font-family: Montserrat, sans-serif !important; color: #000 !important; font-weight: bold;">
@@ -600,7 +706,8 @@
                 <div class="col-lg-3">
                     <div class="my-4 d-flex flex-column justify-content-center"
                          style="background-color: #f6f8f9 !important; border-radius: 10px; padding: 2rem !important; height: 250px !important;">
-                        <img src="./assets/icons/pos-black.png" class="img-responsive mb-3" height="48px" width="48px">
+                        <img src="./assets/icons/pos-black.png"
+                             class="img-responsive mb-3" height="48px" width="48px">
                         <h5
                                 style="font-family: Montserrat, sans-serif !important; color: #000 !important; font-weight: bold;">
                             POS
@@ -615,7 +722,8 @@
                 <div class="col-lg-3">
                     <div class="my-4 d-flex flex-column justify-content-center"
                          style="background-color: #f6f8f9 !important; border-radius: 10px; padding: 2rem !important; height: 250px !important;">
-                        <img src="./assets/icons/education-black.png" class="img-responsive mb-3" height="48px"
+                        <img src="./assets/icons/education-black.png"
+                             class="img-responsive mb-3" height="48px"
                              width="48px">
                         <h5
                                 style="font-family: Montserrat, sans-serif !important; color: #000 !important; font-weight: bold;">
@@ -630,7 +738,8 @@
                 <div class="col-lg-3">
                     <div class="my-4 d-flex flex-column justify-content-center"
                          style="background-color: #f6f8f9 !important; border-radius: 10px; padding: 2rem !important; height: 250px !important;">
-                        <img src="./assets/icons/manufacturing-black.png" class="img-responsive mb-3" height="48px"
+                        <img src="./assets/icons/manufacturing-black.png"
+                             class="img-responsive mb-3" height="48px"
                              width="48px">
                         <h5
                                 style="font-family: Montserrat, sans-serif !important; color: #000 !important; font-weight: bold;">
@@ -645,7 +754,8 @@
                 <div class="col-lg-3">
                     <div class="my-4 d-flex flex-column justify-content-center"
                          style="background-color: #f6f8f9 !important; border-radius: 10px; padding: 2rem !important; height: 250px !important;">
-                        <img src="./assets/icons/ecom-black.png" class="img-responsive mb-3" height="48px" width="48px">
+                        <img src="./assets/icons/ecom-black.png"
+                             class="img-responsive mb-3" height="48px" width="48px">
                         <h5
                                 style="font-family: Montserrat, sans-serif !important; color: #000 !important; font-weight: bold;">
                             E-commerce &amp; Website
@@ -660,7 +770,8 @@
                 <div class="col-lg-3">
                     <div class="my-4 d-flex flex-column justify-content-center"
                          style="background-color: #f6f8f9 !important; border-radius: 10px; padding: 2rem !important; height: 250px !important;">
-                        <img src="./assets/icons/service-black.png" class="img-responsive mb-3" height="48px"
+                        <img src="./assets/icons/service-black.png"
+                             class="img-responsive mb-3" height="48px"
                              width="48px">
                         <h5
                                 style="font-family: Montserrat, sans-serif !important; color: #000 !important; font-weight: bold;">
@@ -675,7 +786,8 @@
                 <div class="col-lg-3">
                     <div class="my-4 d-flex flex-column justify-content-center"
                          style="background-color: #f6f8f9 !important; border-radius: 10px; padding: 2rem !important; height: 250px !important;">
-                        <img src="./assets/icons/restaurant-black.png" class="img-responsive mb-3" height="48px"
+                        <img src="./assets/icons/restaurant-black.png"
+                             class="img-responsive mb-3" height="48px"
                              width="48px">
                         <h5
                                 style="font-family: Montserrat, sans-serif !important; color: #000 !important; font-weight: bold;">
@@ -690,7 +802,8 @@
                 <div class="col-lg-3">
                     <div class="my-4 d-flex flex-column justify-content-center"
                          style="background-color: #f6f8f9 !important; border-radius: 10px; padding: 2rem !important; height: 250px !important;">
-                        <img src="./assets/icons/hotel-black.png" class="img-responsive mb-3" height="48px"
+                        <img src="./assets/icons/hotel-black.png"
+                             class="img-responsive mb-3" height="48px"
                              width="48px">
                         <h5
                                 style="font-family: Montserrat, sans-serif !important; color: #000 !important; font-weight: bold;">
@@ -723,16 +836,19 @@
             <div class="row d-flex justify-content-center align-items-center"
                  style="max-width:1540px; margin: 0 auto 2rem auto;">
 
-                <div class="col-lg-12" style="padding: 0rem 3rem 2rem; border-radius: 10px; margin-right: 3rem; ">
+                <div class="col-lg-12"
+                     style="padding: 0rem 3rem 2rem; border-radius: 10px; margin-right: 3rem; ">
 
                     <div class="row mt-4">
                         <div class="col-lg-6">
-                            <a href="mailto:odoo@cybrosys.com" target="_blank" class="btn btn-block mb-2 deep_hover"
+                            <a href="mailto:odoo@cybrosys.com" target="_blank"
+                               class="btn btn-block mb-2 deep_hover"
                                style="text-decoration: none;  background-color: #4d4d4d; color: #FFF;  border-radius: 4px;"><i
                                     class="fa fa-envelope mr-2"></i>odoo@cybrosys.com</a>
                         </div>
                         <div class="col-lg-6">
-                            <a href="https://api.whatsapp.com/send?phone=918606827707" target="_blank"
+                            <a href="https://api.whatsapp.com/send?phone=918606827707"
+                               target="_blank"
                                class="btn btn-block mb-2 deep_hover"
                                style="text-decoration: none;  background-color: #25D366; color: #FFF;  border-radius: 4px;"><i
                                     class="fa fa-whatsapp mr-2"></i>WhatsApp</a>
@@ -745,10 +861,13 @@
         </section>
         <!-- Footer -->
         <section class="oe_container" style="padding: 2rem 3rem 1rem;">
-            <div class="row" style="max-width:1540px; margin: 0 auto; margin-right: 3rem; ">
+            <div class="row"
+                 style="max-width:1540px; margin: 0 auto; margin-right: 3rem; ">
                 <!-- Logo -->
-                <div class="col-lg-12 d-flex justify-content-center align-items-center" style="margin-top: 3rem;">
-                    <img src="https://www.cybrosys.com/images/logo.png" width="200px" height="auto" />
+                <div class="col-lg-12 d-flex justify-content-center align-items-center"
+                     style="margin-top: 3rem;">
+                    <img src="https://www.cybrosys.com/images/logo.png" width="200px"
+                         height="auto"/>
                 </div>
                 <!-- End of Logo -->
                 <div class="col-lg-12">

fleet_rental/views/car_rental_view.xml

@@ -49,25 +49,33 @@
                 <form string="car_result">
                     <header>
                         <button name="action_confirm" string="Confirm" type="object"
-                                attrs="{'invisible': [('state', '!=', 'draft')]}" class="oe_highlight"/>
+                                attrs="{'invisible': [('state', '!=', 'draft')]}"
+                                class="oe_highlight"/>
                         <button name="action_run" string="Run" type="object"
-                                attrs="{'invisible': [('state', '!=', 'reserved')]}" class="oe_highlight"/>
+                                attrs="{'invisible': [('state', '!=', 'reserved')]}"
+                                class="oe_highlight"/>
                         <button name="action_cancel" string="Cancel" type="object"
-                                attrs="{'invisible': [('state', 'not in', ('draft', 'reserved'))]}" class="oe_highlight"/>
+                                attrs="{'invisible': [('state', 'not in', ('draft', 'reserved'))]}"
+                                class="oe_highlight"/>
                         <button name="action_invoice_create" string="Create Invoice"
                                 attrs="{'invisible': ['|',('state', '!=', 'running'),
-                                ('first_invoice_created','=',True)]}" type="object" class="oe_highlight"/>
+                                ('first_invoice_created','=',True)]}" type="object"
+                                class="oe_highlight"/>
                         <button name="force_checking" string="Force Checking"
                                 attrs="{'invisible': ['|',('state','!=','running'),
-                                ('first_invoice_created','=',False)]}" type="object" class="oe_highlight"/>
+                                ('first_invoice_created','=',False)]}" type="object"
+                                class="oe_highlight"/>
                         <button name="set_to_done" string="Set to Done"
                                 states="invoice" type="object" class="oe_highlight"/>
-                        <field name="state" widget="statusbar" statusbar_visible="draft,running,done"/>
+                        <field name="state" widget="statusbar"
+                               statusbar_visible="draft,running,done"/>
                     </header>
                     <sheet>
                         <div class="oe_button_box" name="buttons">
-                            <button name='action_view_invoice' class="oe_stat_button" type="object" icon="fa-money">
-                                <field string="Invoice" name="invoice_count" widget="statinfo" />
+                            <button name='action_view_invoice' class="oe_stat_button"
+                                    type="object" icon="fa-money">
+                                <field string="Invoice" name="invoice_count"
+                                       widget="statinfo"/>
                             </button>
                         </div>
                         <field name="image" widget='image' class="oe_avatar"/>
@@ -79,15 +87,19 @@
                         <group>
                             <separator string="Contract Details " colspan="4"/>
                             <group>
-                                <field name="customer_id"  string="Customer" attrs="{'readonly': [('state','!=','draft')]}"/>
-                                <field name="rent_start_date" attrs="{'readonly': [('state','!=','draft')]}"/>
-                                <field name="rent_end_date" attrs="{'readonly': [('state','!=','draft')]}"/>
+                                <field name="customer_id" string="Customer"
+                                       attrs="{'readonly': [('state','!=','draft')]}"/>
+                                <field name="rent_start_date"
+                                       attrs="{'readonly': [('state','!=','draft')]}"/>
+                                <field name="rent_end_date"
+                                       attrs="{'readonly': [('state','!=','draft')]}"/>
                                 <field name="vehicle_id" domain="[('rental_check_availability','=',True),
                                 ('state_id.name','!=','Inactive')]"
                                        options="{'no_create': True}"/>
                                 <field name="journal_type" invisible="1"/>
                                 <field name="check_verify" invisible="1"/>
-                                <field name="sales_person" attrs="{'readonly': [('state','!=','draft')]}"/>
+                                <field name="sales_person"
+                                       attrs="{'readonly': [('state','!=','draft')]}"/>
                             </group>
                             <group>
                                 <field name="car_brand"/>
@@ -98,7 +110,8 @@
                                     <field name="first_payment" class="oe_inline"
                                            attrs="{'readonly': ['|', ('state','not in',('draft', 'running')),
                                                 ('first_invoice_created','=',True)]}"/>
-                                    <field name="first_payment_inv" style="width:142px;" readonly="1"/>
+                                    <field name="first_payment_inv" style="width:142px;"
+                                           readonly="1"/>
                                 </div>
                                 <field name="account_type" invisible="1"/>
                                 <field name="cost" invisible="1"/>
@@ -114,7 +127,8 @@
                             </group>
                         </group>
                         <notebook>
-                            <page string="Recurring Invoices" attrs="{'invisible': [('cost_frequency','in',[None,False,'no'])]}">
+                            <page string="Recurring Invoices"
+                                  attrs="{'invisible': [('cost_frequency','in',[None,False,'no'])]}">
                                 <field name="recurring_line" mode="tree">
                                     <tree string="Fleet Reccurring Lines"
                                           colors="#0b7a35:payment_info=='paid';#f20b07:payment_info!='paid'">
@@ -131,14 +145,18 @@
                             <page string="Checklist">
                                 <group>
                                     <group>
-                                        <field name="attachment_ids" widget="many2many_binary" class="oe_inline"/>
+                                        <field name="attachment_ids"
+                                               widget="many2many_binary"
+                                               class="oe_inline"/>
                                     </group>
                                     <group>
-                                        <field name="damage_cost" attrs="{'invisible': [('state','!=','checking')]}"/>
+                                        <field name="damage_cost"
+                                               attrs="{'invisible': [('state','!=','checking')]}"/>
                                     </group>
                                 </group>
                                 <field name="checklist_line">
-                                    <tree string="Fleet Checklist Lines" editable="bottom">
+                                    <tree string="Fleet Checklist Lines"
+                                          editable="bottom">
                                         <field name="name"/>
                                         <field name="checklist_active"/>
                                         <field name="checklist_number" invisible="True"/>
@@ -148,8 +166,10 @@
                                         <sheet>
                                             <group>
                                                 <field name="name"/>
-                                                <field name="checklist_active" invisible="1"/>
-                                                <field name="checklist_number" invisible="1"/>
+                                                <field name="checklist_active"
+                                                       invisible="1"/>
+                                                <field name="checklist_number"
+                                                       invisible="1"/>
                                             </group>
                                         </sheet>
                                     </form>
@@ -159,11 +179,13 @@
                                         <field name="total"/>
                                         <field name="tools_missing_cost"/>
                                         <field name="damage_cost_sub"/>
-                                        <field name="total_cost" class="oe_subtotal_footer_separator"/>
+                                        <field name="total_cost"
+                                               class="oe_subtotal_footer_separator"/>
                                     </group>
                                 </div>
                                 <div style="float: right;margin-left: 78%;margin-bottom: 36px;">
-                                    <button name="action_verify" string="Verify" type="object"
+                                    <button name="action_verify" string="Verify"
+                                            type="object"
                                             style="width: 100px !important;height: 40px;"
                                             attrs="{'invisible': [('state', '!=', 'checking')]}"
                                             class="oe_subtotal_footer oe_right oe_highlight"/>
@@ -207,10 +229,13 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem name="Fleet Rental" id="fleet.menu_root" sequence="115" groups="fleet.fleet_group_user"
+        <menuitem name="Fleet Rental" id="fleet.menu_root" sequence="115"
+                  groups="fleet.fleet_group_user"
                   web_icon="fleet,static/description/icon.png"/>
-        <menuitem id="menu_car_parent" sequence="1" name="Rental Management" parent="fleet.menu_root"/>
-        <menuitem id="menu_car_rental_contract" parent="menu_car_parent" name="Rental Contract"
+        <menuitem id="menu_car_parent" sequence="1" name="Rental Management"
+                  parent="fleet.menu_root"/>
+        <menuitem id="menu_car_rental_contract" parent="menu_car_parent"
+                  name="Rental Contract"
                   action="action_car_rental_contract" sequence="1"/>
     </data>
 </odoo>

fleet_rental/views/checklist_view.xml

@@ -9,8 +9,10 @@
                 <form string="car_checklist2" create="false">
                     <header>
                         <button name="action_verify" string="Create invoice" type="object"
-                                attrs="{'invisible': ['|',('state','!=', 'checking'),('check_verify','=',True)]}" class="oe_highlight"/>
-                        <field name="state" widget="statusbar" statusbar_visible="checking"/>
+                                attrs="{'invisible': ['|',('state','!=', 'checking'),('check_verify','=',True)]}"
+                                class="oe_highlight"/>
+                        <field name="state" widget="statusbar"
+                               statusbar_visible="checking"/>
                     </header>
                     <sheet>
                         <group>
@@ -22,13 +24,15 @@
                             </group>
                             <group>
                                 <field name="damage_cost"/>
-                                <field name="attachment_ids" widget="many2many_binary" class="oe_inline" readonly="1"/>
+                                <field name="attachment_ids" widget="many2many_binary"
+                                       class="oe_inline" readonly="1"/>
                             </group>
                         </group>
                         <notebook>
                             <page string="Checklist">
                                 <field name="checklist_line">
-                                    <tree string="Fleet Checklist Lines" create="false" editable="bottom">
+                                    <tree string="Fleet Checklist Lines" create="false"
+                                          editable="bottom">
                                         <field name="name"/>
                                         <field name="checklist_active"/>
                                         <field name="price"/>
@@ -39,7 +43,8 @@
                                         <field name="total"/>
                                         <field name="tools_missing_cost"/>
                                         <field name="damage_cost_sub"/>
-                                        <field name="total_cost" class="oe_subtotal_footer_separator"/>
+                                        <field name="total_cost"
+                                               class="oe_subtotal_footer_separator"/>
                                     </group>
                                 </div>
                             </page>

fleet_rental/views/res_config_settings_views.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <!-- Fleet settings form view inherited   -->
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.fleet.rental</field>
+        <field name="model">res.config.settings</field>
+        <field name="priority" eval="1"/>
+        <field name="inherit_id" ref="fleet.res_config_settings_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@id='end_contract_setting']" position="inside">
+                <div class="col-12 col-lg-6 o_setting_box" id="discount_limit ">
+                    <div class="o_setting_left_pane">
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <span class="o_form_label">Default Fleet Rental Service Product
+                        </span>
+                        <div class="row mt16">
+                            <label for="fleet_service_product_id"
+                                   class="col-lg-4 o_light_label"/>
+                            <field name="fleet_service_product_id" class="oe_inline"/>
+                        </div>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+</odoo>