From 7ce9e16cbbfaefd0bcad851a2c239934a52c2df3 Mon Sep 17 00:00:00 2001
From: Dhrumil Shah <dhrs@odoo.com>
Date: Wed, 20 Dec 2023 12:23:41 +0530
Subject: [PATCH] [ADD] car_rental: second review suggested changes

---
 car_rental/__manifest__.py                   |  1 -
 car_rental/data/ir_attachment_post.xml       |  6 --
 car_rental/data/ir_model_fields.xml          | 30 ++++----
 car_rental/data/ir_ui_view.xml               | 23 +++---
 car_rental/data/knowledge_article.xml        |  1 +
 car_rental/data/knowledge_article_member.xml |  8 ---
 car_rental/data/product_product.xml          | 49 -------------
 car_rental/data/product_template.xml         | 54 ++++----------
 car_rental/data/project_project.xml          |  4 --
 car_rental/demo/crm_lead.xml                 |  4 --
 car_rental/demo/purchase_order.xml           | 12 ----
 car_rental/demo/purchase_order_confirm.xml   | 24 +++----
 car_rental/demo/purchase_order_line.xml      | 15 ----
 car_rental/demo/purchase_order_line_post.xml |  1 -
 car_rental/demo/res_partner.xml              |  1 -
 car_rental/demo/sale_order_line.xml          | 13 ----
 car_rental/demo/sale_order_post.xml          | 74 +++++++++++---------
 car_rental/demo/website.xml                  |  1 +
 car_rental/demo/website_view.xml             |  2 +-
 19 files changed, 92 insertions(+), 231 deletions(-)
 delete mode 100644 car_rental/data/knowledge_article_member.xml

diff --git a/car_rental/__manifest__.py b/car_rental/__manifest__.py
index b26889396..79a263d6f 100644
--- a/car_rental/__manifest__.py
+++ b/car_rental/__manifest__.py
@@ -37,7 +37,6 @@
         'data/res_config_settings.xml',
         'data/knowledge_cover.xml',
         'data/knowledge_article.xml',
-        'data/knowledge_article_member.xml',
         'data/ir_attachment_post.xml',
     ],
     'demo': [
diff --git a/car_rental/data/ir_attachment_post.xml b/car_rental/data/ir_attachment_post.xml
index 5705e9364..0f0629318 100644
--- a/car_rental/data/ir_attachment_post.xml
+++ b/car_rental/data/ir_attachment_post.xml
@@ -1,11 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <odoo noupdate="1">
-    <record id="ir_attachment_684" model="ir.attachment">
-        <field name="name">unsplash_ovrOPhu8vSw_car.webp</field>
-        <field name="datas" type="base64" file="car_rental/static/src/binary/ir_attachment/684-unsplash_ovrOPhu8vSw_car.webp"/>
-        <field name="res_model">ir.attachment</field>
-        <field name="website_id" ref="website.default_website"/>
-    </record>
     <record id="ir_attachment_687" model="ir.attachment">
         <field name="name">Audi-A5-Sportback-120420212020.jpg</field>
         <field name="datas" type="base64" file="car_rental/static/src/binary/ir_attachment/687-Audi-A5-Sportback-120420212020.jpg"/>
diff --git a/car_rental/data/ir_model_fields.xml b/car_rental/data/ir_model_fields.xml
index ededc7c12..5eb314022 100644
--- a/car_rental/data/ir_model_fields.xml
+++ b/car_rental/data/ir_model_fields.xml
@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <odoo>
-    <record id="new_decimal_analytic_572a5f52-d008-4150-a715-14e2462f8244" model="ir.model.fields">
+    <record id="new_decimal_analytic_in_odometer" model="ir.model.fields">
         <field name="name">x_in_odometer</field>
         <field name="model">account.analytic.line</field>
         <field name="model_id" ref="analytic.model_account_analytic_line"/>
         <field name="field_description">In Odometer</field>
         <field name="ttype">float</field>
     </record>
-    <record id="new_decimal_analytic_e866fd7b-409e-42e3-864a-82beca96e66d" model="ir.model.fields">
+    <record id="new_decimal_analytic_out_odometer" model="ir.model.fields">
         <field name="name">x_out_odometer</field>
         <field name="model">account.analytic.line</field>
         <field name="model_id" ref="analytic.model_account_analytic_line"/>
         <field name="field_description">Out Odometer</field>
         <field name="ttype">float</field>
     </record>
-    <record id="new_decimal_analytic_64689165-d621-445d-bf49-f03d161262b7" model="ir.model.fields">
+    <record id="new_decimal_analytic_total_km" model="ir.model.fields">
         <field name="name">x_total_km</field>
         <field name="model">account.analytic.line</field>
         <field name="model_id" ref="analytic.model_account_analytic_line"/>
@@ -25,7 +25,7 @@
         <field name="readonly" eval="True"/>
         <field name="ttype">float</field>
     </record>
-    <record id="new_many2one_product_1118051d-f5fc-42c8-8585-2211863a23ff" model="ir.model.fields">
+    <record id="new_many2one_product_vehicle_no" model="ir.model.fields">
         <field name="name">x_vehicle_no</field>
         <field name="model">product.template</field>
         <field name="model_id" ref="product.model_product_template"/>
@@ -33,7 +33,7 @@
         <field name="relation">fleet.vehicle</field>
         <field name="ttype">many2one</field>
     </record>
-    <record id="new_many2one_purchas_09c6869c-aee9-44ee-a629-a005a9ed2c97" model="ir.model.fields">
+    <record id="new_many2one_purchas_task" model="ir.model.fields">
         <field name="name">x_task</field>
         <field name="model">purchase.order.line</field>
         <field name="model_id" ref="purchase.model_purchase_order_line"/>
@@ -41,7 +41,7 @@
         <field name="relation">project.task</field>
         <field name="ttype">many2one</field>
     </record>
-    <record id="new_many2one_service_63929119-86b9-49aa-babd-87eaf63d7f90" model="ir.model.fields">
+    <record id="new_many2one_service_vehicle_status" model="ir.model.fields">
         <field name="name">x_vehicle_status</field>
         <field name="model">fleet.vehicle.log.services</field>
         <field name="model_id" ref="fleet.model_fleet_vehicle_log_services"/>
@@ -49,7 +49,7 @@
         <field name="relation">fleet.vehicle.state</field>
         <field name="ttype">many2one</field>
     </record>
-    <record id="new_many2one_task_28f37101-5082-4cdc-8aa1-ee7a66ef81c3" model="ir.model.fields">
+    <record id="new_many2one_task_vendor" model="ir.model.fields">
         <field name="name">x_vendor</field>
         <field name="model">project.task</field>
         <field name="model_id" ref="project.model_project_task"/>
@@ -57,14 +57,14 @@
         <field name="relation">res.partner</field>
         <field name="ttype">many2one</field>
     </record>
-    <record id="new_monetary_sales_o_24f7083d-cdd4-4e4d-b9ed-8f62aa60f374" model="ir.model.fields">
+    <record id="new_monetary_sales_security_deposit" model="ir.model.fields">
         <field name="name">x_security_deposit</field>
         <field name="model">sale.order</field>
         <field name="model_id" ref="sale.model_sale_order"/>
         <field name="field_description">Security Deposit</field>
         <field name="ttype">float</field>
     </record>
-    <record id="new_one2many_vehicle_37e5c4e3-5258-41d6-ac3b-4590323f9100" model="ir.model.fields">
+    <record id="new_one2many_vehicle_product_fleet" model="ir.model.fields">
         <field name="name">x_product_name_fleet</field>
         <field name="model">fleet.vehicle</field>
         <field name="model_id" ref="fleet.model_fleet_vehicle"/>
@@ -73,14 +73,14 @@
         <field name="relation_field">x_vehicle_no</field>
         <field name="ttype">one2many</field>
     </record>
-    <record id="new_text_contact_c60cc1e1-8b64-41ad-a1cd-644f0dfb8af0" model="ir.model.fields">
+    <record id="new_text_contact_licence_no" model="ir.model.fields">
         <field name="name">x_licence_no</field>
         <field name="model">res.partner</field>
         <field name="model_id" ref="base.model_res_partner"/>
         <field name="field_description">Licence No. </field>
         <field name="ttype">char</field>
     </record>
-    <record id="new_related_field_sa_0a3aa1b1-4d73-4e58-a311-4091ec3bb6e0" model="ir.model.fields">
+    <record id="new_related_field_sa_licence_no" model="ir.model.fields">
         <field name="name">x_licence_no</field>
         <field name="model">sale.order</field>
         <field name="model_id" ref="sale.model_sale_order"/>
@@ -89,7 +89,7 @@
         <field name="related">partner_id.x_licence_no</field>
         <field name="ttype">char</field>
     </record>
-    <record id="new_related_field_sa_25fd21b0-0335-4fd6-bda2-d905f1846755" model="ir.model.fields">
+    <record id="new_related_field_sa_rental_status" model="ir.model.fields">
         <field name="name">x_rental_status</field>
         <field name="model">sale.order.line</field>
         <field name="model_id" ref="sale.model_sale_order_line"/>
@@ -99,7 +99,7 @@
         <field name="selection">[('draft', 'Quotation'), ('sent', 'Quotation Sent'), ('pickup', 'Reserved'), ('return', 'Pickedup'), ('returned', 'Returned'), ('cancel', 'Cancelled')]</field>
         <field name="ttype">selection</field>
     </record>
-    <record id="new_related_field_sa_d4f91f4c-4b7b-4705-a0b8-e2718b162bc2" model="ir.model.fields">
+    <record id="new_related_field_sa_car" model="ir.model.fields">
         <field name="name">x_car</field>
         <field name="model">sale.order.line</field>
         <field name="model_id" ref="sale.model_sale_order_line"/>
@@ -107,17 +107,15 @@
         <field name="readonly" eval="True"/>
         <field name="related">product_id.x_vehicle_no</field>
         <field name="relation">fleet.vehicle</field>
-        <field name="store" eval="False"/>
         <field name="ttype">many2one</field>
     </record>
-    <record id="new_related_field_sa_3d5345a1-e715-4ea1-8a5d-88a4dd65376e" model="ir.model.fields">
+    <record id="new_related_field_sa_car_status" model="ir.model.fields">
         <field name="name">x_car_status</field>
         <field name="model">sale.order.line</field>
         <field name="model_id" ref="sale.model_sale_order_line"/>
         <field name="field_description">Car Status</field>
         <field name="related">x_car.state_id</field>
         <field name="relation">fleet.vehicle.state</field>
-        <field name="store" eval="False"/>
         <field name="ttype">many2one</field>
     </record>
 </odoo>
diff --git a/car_rental/data/ir_ui_view.xml b/car_rental/data/ir_ui_view.xml
index ccf0ad698..e84bca7fb 100644
--- a/car_rental/data/ir_ui_view.xml
+++ b/car_rental/data/ir_ui_view.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <odoo>
-    <record id="odoo_studio_fleet_ve_3fae68ac-5ff8-435b-b91d-efb9944dee05" model="ir.ui.view">
+    <record id="fleet_ve_log_services_form" model="ir.ui.view">
         <field name="name">fleet.vehicle.log.services.form.customization</field>
         <field name="model">fleet.vehicle.log.services</field>
         <field name="inherit_id" ref="fleet.fleet_vehicle_log_services_view_form"/>
@@ -9,24 +9,19 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='vendor_id']" position="after">
-                <field name="x_vehicle_status" string="Vehicle Status"/>
+                <field name="x_vehicle_status"/>
             </xpath>
         </field>
     </record>
-    <record id="odoo_studio_fleet_ve_a2831b47-fc83-4120-a7f1-7e0ba38d7874" model="ir.ui.view">
+    <record id="fleet_ve_form" model="ir.ui.view">
         <field name="name">fleet.vehicle.form.customization</field>
         <field name="model">fleet.vehicle</field>
         <field name="inherit_id" ref="fleet.fleet_vehicle_view_form"/>
         <field name="mode">extension</field>
         <field name="priority">160</field>
         <field name="type">form</field>
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='location']" position="after">
-                <field name="x_product_name_fleet" invisible="1"/>
-            </xpath>
-        </field>
     </record>
-    <record id="odoo_studio_product__d497eee1-f0c6-460d-ab22-af75533b6a03" model="ir.ui.view">
+    <record id="product_template_product_form" model="ir.ui.view">
         <field name="name">product.template.product.form.customization</field>
         <field name="model">product.template</field>
         <field name="inherit_id" ref="product.product_template_only_form_view"/>
@@ -39,7 +34,7 @@
             </xpath>
         </field>
     </record>
-    <record id="odoo_studio_project__11cc2179-021b-4057-88b3-78d47a16ca34" model="ir.ui.view">
+    <record id="project_project_task_form" model="ir.ui.view">
         <field name="name">project.task.form.customization</field>
         <field name="model">project.task</field>
         <field name="inherit_id" ref="project.view_task_form2"/>
@@ -60,7 +55,7 @@
             </xpath>
         </field>
     </record>
-    <record id="odoo_studio_purchase_02d7e16d-b81b-46a1-8dc1-145c6226e4d9" model="ir.ui.view">
+    <record id="purchase_purchase_order_form" model="ir.ui.view">
         <field name="name">purchase.order.form.customization</field>
         <field name="model">purchase.order</field>
         <field name="inherit_id" ref="purchase.purchase_order_form"/>
@@ -73,7 +68,7 @@
             </xpath>
         </field>
     </record>
-    <record id="odoo_studio_rental_o_ed1928d3-6ede-47c8-864e-f4fd1a7e1729" model="ir.ui.view">
+    <record id="rental_rental_order_form" model="ir.ui.view">
         <field name="name">rental.order.form.customization</field>
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale_renting.rental_order_primary_form_view"/>
@@ -88,13 +83,13 @@
                 <field name="x_security_deposit" string="Security Deposit" widget="monetary"/>
             </xpath>
             <xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="after">
-                <field optional="show" name="x_car" string="Car" invisible="1" attrs="{'readonly': True}"/>
+                <field optional="show" name="x_car" string="Car" invisible="1"/>
                 <field optional="show" name="x_car_status" string="Car Status"/>
                 <field optional="show" name="x_rental_status" string="Rental Status"/>
             </xpath>
         </field>
     </record>
-    <record id="odoo_studio_res_part_fad9bf29-eb91-4862-8582-0c7cd0f70921" model="ir.ui.view">
+    <record id="res_part_form" model="ir.ui.view">
         <field name="name">res.partner.form.customization</field>
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="base.view_partner_form"/>
diff --git a/car_rental/data/knowledge_article.xml b/car_rental/data/knowledge_article.xml
index 5f5e22968..8c10403c2 100644
--- a/car_rental/data/knowledge_article.xml
+++ b/car_rental/data/knowledge_article.xml
@@ -6,6 +6,7 @@
         <field name="is_published" eval="True"/>
         <field name="is_locked" eval="True"/>
         <field name="internal_permission">write</field>
+        <field name="is_article_visible_by_everyone" eval="True"/>
         <field name="cover_image_id" ref="knowledge_cover_2"/>
         <field name="body">
             <![CDATA[ 
diff --git a/car_rental/data/knowledge_article_member.xml b/car_rental/data/knowledge_article_member.xml
deleted file mode 100644
index e483fd251..000000000
--- a/car_rental/data/knowledge_article_member.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<odoo noupdate="1">
-    <record id="knowledge_article_member_1" model="knowledge.article.member">
-        <field name="partner_id" ref="base.partner_admin"/>
-        <field name="article_id" ref="knowledge_article_4"/>
-        <field name="permission">write</field>
-    </record>
-</odoo>
diff --git a/car_rental/data/product_product.xml b/car_rental/data/product_product.xml
index cb1ce39b5..dcf906339 100644
--- a/car_rental/data/product_product.xml
+++ b/car_rental/data/product_product.xml
@@ -1,14 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <odoo noupdate="1">
-    <record id="product_product_10" model="product.product">
-        <field name="product_tmpl_id" ref="product_template_12"/>
-    </record>
-    <record id="product_product_11" model="product.product">
-        <field name="product_tmpl_id" ref="product_template_13"/>
-    </record>
-    <record id="product_product_12" model="product.product">
-        <field name="product_tmpl_id" ref="product_template_14"/>
-    </record>
     <record id="product_product_14" model="product.product">
         <field name="standard_price">5.0</field>
         <field name="product_tmpl_id" ref="product_template_16"/>
@@ -21,48 +12,8 @@
         <field name="default_code">RENTAL</field>
         <field name="product_tmpl_id" ref="product_template_18"/>
     </record>
-    <record id="product_product_17" model="product.product">
-        <field name="base_unit_count" eval="False"/>
-        <field name="product_tmpl_id" ref="product_template_19"/>
-    </record>
-    <record id="product_product_18" model="product.product">
-        <field name="base_unit_count" eval="False"/>
-        <field name="product_tmpl_id" ref="product_template_20"/>
-    </record>
-    <record id="product_product_19" model="product.product">
-        <field name="base_unit_count" eval="False"/>
-        <field name="product_tmpl_id" ref="product_template_21"/>
-    </record>
-    <record id="product_product_20" model="product.product">
-        <field name="base_unit_count" eval="False"/>
-        <field name="product_tmpl_id" ref="product_template_22"/>
-    </record>
-    <record id="product_product_3" model="product.product">
-        <field name="product_tmpl_id" ref="product_template_5"/>
-    </record>
     <record id="product_product_4" model="product.product">
         <field name="standard_price">7.0</field>
         <field name="product_tmpl_id" ref="product_template_6"/>
     </record>
-    <record id="product_product_5" model="product.product">
-        <field name="product_tmpl_id" ref="product_template_7"/>
-    </record>
-    <record id="product_product_6" model="product.product">
-        <field name="product_tmpl_id" ref="product_template_8"/>
-    </record>
-    <record id="product_product_7" model="product.product">
-        <field name="product_tmpl_id" ref="product_template_9"/>
-    </record>
-    <record id="product_product_8" model="product.product">
-        <field name="product_tmpl_id" ref="product_template_10"/>
-    </record>
-    <record id="product_product_9" model="product.product">
-        <field name="product_tmpl_id" ref="product_template_11"/>
-    </record>
-    <record id="delivery.product_product_delivery" model="product.product">
-        <field name="product_tmpl_id" ref="delivery.product_product_delivery_product_template"/>
-    </record>
-    <record id="sale_timesheet.time_product" model="product.product">
-        <field name="product_tmpl_id" ref="sale_timesheet.time_product_product_template"/>
-    </record>
 </odoo>
diff --git a/car_rental/data/product_template.xml b/car_rental/data/product_template.xml
index d155cbc4f..38d650f5b 100644
--- a/car_rental/data/product_template.xml
+++ b/car_rental/data/product_template.xml
@@ -1,60 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <odoo noupdate="1">
-    <record id="product_template_10" model="product.template" context="{'create_product_product': False}">
+    <record id="product_template_10" model="product.template">
         <field name="name">Hyundai/Creta/GJ567655</field>
         <field name="image_1920" type="base64" file="car_rental/static/src/binary/product_template/10-image_1920"/>
         <field name="detailed_type">product</field>
         <field name="extra_hourly">20.0</field>
         <field name="is_published" eval="True"/>
-        <field name="invoice_policy">order</field>
         <field name="categ_id" ref="product_category_7"/>
         <field name="website_sequence">10045</field>
         <field name="rent_ok" eval="True"/>
         <field name="extra_daily">120.0</field>
     </record>
-    <record id="product_template_11" model="product.template" context="{'create_product_product': False}">
+    <record id="product_template_11" model="product.template">
         <field name="name">Damage Charges</field>
         <field name="detailed_type">service</field>
         <field name="purchase_ok" eval="False"/>
-        <field name="invoice_policy">order</field>
-        <field name="categ_id" ref="product.product_category_all"/>
         <field name="service_type">timesheet</field>
         <field name="website_sequence">10010</field>
         <field name="purchase_method">purchase</field>
     </record>
-    <record id="product_template_12" model="product.template" context="{'create_product_product': False}">
+    <record id="product_template_12" model="product.template">
         <field name="name">FASTag Charges</field>
         <field name="image_1920" type="base64" file="car_rental/static/src/binary/product_template/12-image_1920"/>
         <field name="detailed_type">service</field>
         <field name="purchase_ok" eval="False"/>
-        <field name="invoice_policy">order</field>
-        <field name="categ_id" ref="product.product_category_all"/>
         <field name="service_type">timesheet</field>
         <field name="website_sequence">10075</field>
         <field name="purchase_method">purchase</field>
     </record>
-    <record id="product_template_13" model="product.template" context="{'create_product_product': False}">
+    <record id="product_template_13" model="product.template">
         <field name="name">Fuel Charges</field>
         <field name="image_1920" type="base64" file="car_rental/static/src/binary/product_template/13-image_1920"/>
         <field name="detailed_type">service</field>
         <field name="purchase_ok" eval="False"/>
-        <field name="invoice_policy">order</field>
-        <field name="categ_id" ref="product.product_category_all"/>
         <field name="service_type">timesheet</field>
         <field name="can_image_1024_be_zoomed" eval="True"/>
         <field name="website_sequence">10070</field>
         <field name="purchase_method">purchase</field>
         <field name="description_sale">Charges depend on the current price.</field>
     </record>
-    <record id="product_template_14" model="product.template" context="{'create_product_product': False}">
+    <record id="product_template_14" model="product.template">
         <field name="name">Child Seat</field>
         <field name="image_1920" type="base64" file="car_rental/static/src/binary/product_template/14-image_1920"/>
         <field name="detailed_type">product</field>
         <field name="extra_hourly">5.0</field>
         <field name="is_published" eval="True"/>
         <field name="sale_ok" eval="False"/>
-        <field name="invoice_policy">order</field>
-        <field name="categ_id" ref="product.product_category_all"/>
         <field name="website_sequence">10060</field>
         <field name="rent_ok" eval="True"/>
         <field name="extra_daily">35.0</field>
@@ -68,7 +59,6 @@
         <field name="project_id" ref="project_project_3"/>
         <field name="uom_id" ref="uom_uom_27"/>
         <field name="invoice_policy">delivery</field>
-        <field name="categ_id" ref="product.product_category_all"/>
         <field name="service_type">timesheet</field>
         <field name="website_sequence">10015</field>
         <field name="purchase_method">purchase</field>
@@ -82,7 +72,6 @@
         <field name="project_id" ref="project_project_4"/>
         <field name="uom_id" ref="uom_uom_27"/>
         <field name="invoice_policy">delivery</field>
-        <field name="categ_id" ref="product.product_category_all"/>
         <field name="service_type">timesheet</field>
         <field name="website_sequence">10030</field>
         <field name="purchase_method">purchase</field>
@@ -91,54 +80,43 @@
         <field name="name">Rental Delay Cost</field>
         <field name="detailed_type">service</field>
         <field name="purchase_ok" eval="False"/>
-        <field name="invoice_policy">order</field>
-        <field name="categ_id" ref="product.product_category_all"/>
         <field name="website_sequence">10065</field>
         <field name="purchase_method">purchase</field>
     </record>
-    <record id="product_template_19" model="product.template" context="{'create_product_product': False}">
+    <record id="product_template_19" model="product.template">
         <field name="name">Audi/A3/Mh47535H</field>
         <field name="detailed_type">product</field>
-        <field name="invoice_policy">order</field>
-        <field name="categ_id" ref="product.product_category_all"/>
         <field name="website_sequence">10080</field>
         <field name="rent_ok" eval="True"/>
     </record>
-    <record id="product_template_20" model="product.template" context="{'create_product_product': False}">
+    <record id="product_template_20" model="product.template">
         <field name="name">Audi/A5/HJU47634</field>
         <field name="detailed_type">product</field>
-        <field name="invoice_policy">order</field>
-        <field name="categ_id" ref="product.product_category_all"/>
         <field name="website_sequence">10085</field>
         <field name="rent_ok" eval="True"/>
     </record>
-    <record id="product_template_21" model="product.template" context="{'create_product_product': False}">
+    <record id="product_template_21" model="product.template">
         <field name="name">Opel/Agila/KL6464t6</field>
         <field name="detailed_type">product</field>
         <field name="extra_hourly">15.0</field>
-        <field name="invoice_policy">order</field>
-        <field name="categ_id" ref="product.product_category_all"/>
         <field name="website_sequence">10090</field>
         <field name="rent_ok" eval="True"/>
         <field name="extra_daily">100.0</field>
     </record>
-    <record id="product_template_22" model="product.template" context="{'create_product_product': False}">
+    <record id="product_template_22" model="product.template">
         <field name="name">Hyundai/i20/DG6864464</field>
         <field name="detailed_type">product</field>
         <field name="extra_hourly">15.0</field>
-        <field name="invoice_policy">order</field>
-        <field name="categ_id" ref="product.product_category_all"/>
         <field name="website_sequence">10095</field>
         <field name="rent_ok" eval="True"/>
         <field name="extra_daily">100.0</field>
     </record>
-    <record id="product_template_5" model="product.template" context="{'create_product_product': False}">
+    <record id="product_template_5" model="product.template">
         <field name="name">Audi/A5/GJ657863</field>
         <field name="image_1920" type="base64" file="car_rental/static/src/binary/product_template/5-image_1920"/>
         <field name="detailed_type">product</field>
         <field name="extra_hourly">45.0</field>
         <field name="is_published" eval="True"/>
-        <field name="invoice_policy">order</field>
         <field name="categ_id" ref="product_category_5"/>
         <field name="website_sequence">10025</field>
         <field name="rent_ok" eval="True"/>
@@ -154,43 +132,39 @@
         <field name="project_id" ref="project_project_2"/>
         <field name="uom_id" ref="uom_uom_27"/>
         <field name="invoice_policy">delivery</field>
-        <field name="categ_id" ref="product.product_category_all"/>
         <field name="service_type">timesheet</field>
         <field name="website_sequence">10035</field>
         <field name="purchase_method">purchase</field>
     </record>
-    <record id="product_template_7" model="product.template" context="{'create_product_product': False}">
+    <record id="product_template_7" model="product.template">
         <field name="name">Audi/A5/KGF62652</field>
         <field name="image_1920" type="base64" file="car_rental/static/src/binary/product_template/7-image_1920"/>
         <field name="detailed_type">product</field>
         <field name="extra_hourly">42.0</field>
         <field name="is_published" eval="True"/>
-        <field name="invoice_policy">order</field>
         <field name="categ_id" ref="product_category_5"/>
         <field name="can_image_1024_be_zoomed" eval="True"/>
         <field name="website_sequence">10020</field>
         <field name="rent_ok" eval="True"/>
         <field name="extra_daily">380.0</field>
     </record>
-    <record id="product_template_8" model="product.template" context="{'create_product_product': False}">
+    <record id="product_template_8" model="product.template">
         <field name="name">Mercedes/Class M/JK46556</field>
         <field name="image_1920" type="base64" file="car_rental/static/src/binary/product_template/8-image_1920"/>
         <field name="detailed_type">product</field>
         <field name="extra_hourly">30.0</field>
         <field name="is_published" eval="True"/>
-        <field name="invoice_policy">order</field>
         <field name="categ_id" ref="product_category_8"/>
         <field name="website_sequence">10040</field>
         <field name="rent_ok" eval="True"/>
         <field name="extra_daily">240.0</field>
     </record>
-    <record id="product_template_9" model="product.template" context="{'create_product_product': False}">
+    <record id="product_template_9" model="product.template">
         <field name="name">Toyota/Fortuner/GJU685657</field>
         <field name="image_1920" type="base64" file="car_rental/static/src/binary/product_template/9-image_1920"/>
         <field name="detailed_type">product</field>
         <field name="extra_hourly">15.0</field>
         <field name="is_published" eval="True"/>
-        <field name="invoice_policy">order</field>
         <field name="categ_id" ref="product_category_9"/>
         <field name="can_image_1024_be_zoomed" eval="True"/>
         <field name="website_sequence">10055</field>
@@ -202,7 +176,6 @@
         <field name="detailed_type">service</field>
         <field name="purchase_ok" eval="False"/>
         <field name="sale_ok" eval="False"/>
-        <field name="invoice_policy">order</field>
         <field name="categ_id" ref="delivery.product_category_deliveries"/>
         <field name="service_type">timesheet</field>
         <field name="website_sequence">10005</field>
@@ -216,7 +189,6 @@
         <field name="list_price">40.0</field>
         <field name="uom_id" ref="uom.product_uom_hour"/>
         <field name="invoice_policy">delivery</field>
-        <field name="categ_id" ref="product.product_category_all"/>
         <field name="service_type">timesheet</field>
         <field name="website_sequence">10000</field>
         <field name="purchase_method">purchase</field>
diff --git a/car_rental/data/project_project.xml b/car_rental/data/project_project.xml
index 10e4fa8b0..798b82542 100644
--- a/car_rental/data/project_project.xml
+++ b/car_rental/data/project_project.xml
@@ -4,28 +4,24 @@
         <field name="name">Internal</field>
         <field name="analytic_account_id" ref="account_analytic_account_1"/>
         <field name="type_ids" eval="[(6, 0, [ref('hr_timesheet.internal_project_default_stage')])]"/>
-        <field name="stage_id" ref="project.project_project_stage_0"/>
         <field name="timesheet_product_id" eval="False"/>
     </record>
     <record id="project_project_2" model="project.project">
         <field name="name">Airport Pickup and Drop</field>
         <field name="analytic_account_id" ref="account_analytic_account_2"/>
         <field name="type_ids" eval="[(6, 0, [ref('project_task_type_9')])]"/>
-        <field name="stage_id" ref="project.project_project_stage_0"/>
         <field name="allow_billable" eval="True"/>
         <field name="timesheet_product_id" ref="sale_timesheet.time_product"/>
     </record>
     <record id="project_project_3" model="project.project">
         <field name="name">Door to door pickup</field>
         <field name="analytic_account_id" ref="account_analytic_account_3"/>
-        <field name="stage_id" ref="project.project_project_stage_0"/>
         <field name="allow_billable" eval="True"/>
         <field name="timesheet_product_id" ref="sale_timesheet.time_product"/>
     </record>
     <record id="project_project_4" model="project.project">
         <field name="name">Monthly Rental</field>
         <field name="analytic_account_id" ref="account_analytic_account_4"/>
-        <field name="stage_id" ref="project.project_project_stage_0"/>
         <field name="allow_billable" eval="True"/>
         <field name="timesheet_product_id" ref="sale_timesheet.time_product"/>
     </record>
diff --git a/car_rental/demo/crm_lead.xml b/car_rental/demo/crm_lead.xml
index 883af6b96..b0908b2b9 100644
--- a/car_rental/demo/crm_lead.xml
+++ b/car_rental/demo/crm_lead.xml
@@ -22,7 +22,6 @@
                 No. of days : 5
             </p>]]>
         </field>
-        <field name="email_normalized">mitchell@test.com</field>
         <field name="type">opportunity</field>
         <field name="phone">+1 46657555</field>
     </record>
@@ -44,7 +43,6 @@
             ]]>
         </field>
         <field name="name">Need it with Driver </field>
-        <field name="email_normalized">mitchell@test.com</field>
         <field name="phone">+157652764</field>
     </record>
     <record id="crm_lead_3" model="crm.lead">
@@ -64,7 +62,6 @@
             <p>Service: Airport Pickup and drop</p>
             <p>Pickup Timing and date: 12 October at 11 am</p>]]>
         </field>
-        <field name="email_normalized">megha@test.com</field>
         <field name="type">opportunity</field>
         <field name="city">Cleveland</field>
         <field name="partner_name">Megha Singh</field>
@@ -87,7 +84,6 @@
             <br />
             ]]>
         </field>
-        <field name="email_normalized">megha@gmail.com</field>
         <field name="phone">+1 46657555</field>
     </record>
 </odoo>
diff --git a/car_rental/demo/purchase_order.xml b/car_rental/demo/purchase_order.xml
index 0d96706b9..2fcde1f4b 100644
--- a/car_rental/demo/purchase_order.xml
+++ b/car_rental/demo/purchase_order.xml
@@ -2,50 +2,38 @@
 <odoo noupdate="1">
     <record id="purchase_order_1" model="purchase.order">
         <field name="partner_id" ref="res_partner_8"/>
-        <field name="date_approve" eval="datetime.now()"/>
     </record>
     <record id="purchase_order_2" model="purchase.order">
         <field name="partner_id" ref="res_partner_9"/>
-        <field name="date_approve" eval="datetime.now()"/>
     </record>
     <record id="purchase_order_3" model="purchase.order">
         <field name="partner_id" ref="res_partner_10"/>
-        <field name="date_approve" eval="datetime.now()"/>
     </record>
     <record id="purchase_order_4" model="purchase.order">
         <field name="partner_id" ref="res_partner_11"/>
-        <field name="date_approve" eval="datetime.now()"/>
     </record>
     <record id="purchase_order_5" model="purchase.order">
         <field name="partner_id" ref="res_partner_12"/>
-        <field name="date_approve" eval="datetime.now()"/>
     </record>
     <record id="purchase_order_6" model="purchase.order">
         <field name="partner_id" ref="res_partner_15"/>
-        <field name="date_approve" eval="datetime.now()"/>
     </record>
     <record id="purchase_order_7" model="purchase.order">
         <field name="partner_id" ref="res_partner_10"/>
-        <field name="date_approve" eval="datetime.now()"/>
     </record>
     <record id="purchase_order_8" model="purchase.order">
         <field name="partner_id" ref="res_partner_12"/>
-        <field name="date_approve" eval="datetime.now()"/>
     </record>
     <record id="purchase_order_9" model="purchase.order">
         <field name="partner_id" ref="res_partner_13"/>
-        <field name="date_approve" eval="datetime.now()"/>
     </record>
     <record id="purchase_order_10" model="purchase.order">
         <field name="partner_id" ref="res_partner_14"/>
-        <field name="date_approve" eval="datetime.now()"/>
     </record>
     <record id="purchase_order_11" model="purchase.order">
         <field name="partner_id" ref="res_partner_13"/>
-        <field name="date_approve" eval="datetime.now()"/>
     </record>
     <record id="purchase_order_12" model="purchase.order">
         <field name="partner_id" ref="res_partner_14"/>
-        <field name="date_approve" eval="datetime.now()"/>
     </record>
 </odoo>
diff --git a/car_rental/demo/purchase_order_confirm.xml b/car_rental/demo/purchase_order_confirm.xml
index b1bebfbf1..7c9055d9e 100644
--- a/car_rental/demo/purchase_order_confirm.xml
+++ b/car_rental/demo/purchase_order_confirm.xml
@@ -1,18 +1,18 @@
 <odoo>
     <function model="purchase.order" name="button_confirm">
         <value eval="[
-        ref('car_rental.purchase_order_1'),
-        ref('car_rental.purchase_order_2'),
-        ref('car_rental.purchase_order_3'),
-        ref('car_rental.purchase_order_4'),
-        ref('car_rental.purchase_order_5'),
-        ref('car_rental.purchase_order_6'),
-        ref('car_rental.purchase_order_7'),
-        ref('car_rental.purchase_order_8'),
-        ref('car_rental.purchase_order_9'),
-        ref('car_rental.purchase_order_10'),
-        ref('car_rental.purchase_order_11'),
-        ref('car_rental.purchase_order_12')]"
+        ref('purchase_order_1'),
+        ref('purchase_order_2'),
+        ref('purchase_order_3'),
+        ref('purchase_order_4'),
+        ref('purchase_order_5'),
+        ref('purchase_order_6'),
+        ref('purchase_order_7'),
+        ref('purchase_order_8'),
+        ref('purchase_order_9'),
+        ref('purchase_order_10'),
+        ref('purchase_order_11'),
+        ref('purchase_order_12')]"
 
         />
     </function>
diff --git a/car_rental/demo/purchase_order_line.xml b/car_rental/demo/purchase_order_line.xml
index 51e1ba3c6..fd7a5c197 100644
--- a/car_rental/demo/purchase_order_line.xml
+++ b/car_rental/demo/purchase_order_line.xml
@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <odoo noupdate="1">
     <record id="purchase_order_line_1" model="purchase.order.line">
-        <field name="name">Child Seat</field>
         <field name="product_id" ref="product_product_12"/>
         <field name="price_unit">50.0</field>
         <field name="product_qty">15.0</field>
@@ -9,79 +8,65 @@
     </record>
 
     <record id="purchase_order_line_11" model="purchase.order.line">
-        <field name="name">Hyundai/i20/DG6864464</field>
         <field name="product_id" ref="product_product_20"/>
         <field name="price_unit">3500.0</field>
         <field name="order_id" ref="purchase_order_11"/>
     </record>
 
     <record id="purchase_order_line_12" model="purchase.order.line" >
-        <field name="name">Airport Pickup and Drop</field>
         <field name="product_id" ref="product_product_4"/>
         <field name="order_id" ref="purchase_order_12"/>
         <field name="product_qty">1.0</field>
         <field name="price_unit">250.0</field>
-        <field name="product_uom" ref="uom_uom_27"/>
     </record>
     
     <record id="purchase_order_line_2" model="purchase.order.line">
-        <field name="name">Audi/A5/GJ657863</field>
         <field name="product_id" ref="product_product_3"/>
         <field name="price_unit">35007.0</field>
         <field name="order_id" ref="purchase_order_2"/>
     </record>
     <record id="purchase_order_line_3" model="purchase.order.line">
-        <field name="name">Audi/A5/KGF62652</field>
         <field name="product_id" ref="product_product_5"/>
         <field name="price_unit">28970.0</field>
         <field name="order_id" ref="purchase_order_3"/>
     </record>
     <record id="purchase_order_line_4" model="purchase.order.line">
-        <field name="name">Hyundai/Creta/GJ567655</field>
         <field name="product_id" ref="product_product_8"/>
         <field name="price_unit">15678.0</field>
         <field name="order_id" ref="purchase_order_4"/>
     </record>
     <record id="purchase_order_line_5" model="purchase.order.line">
-        <field name="name">Mercedes/Class M/JK46556</field>
         <field name="product_id" ref="product_product_6"/>
         <field name="price_unit">20757.0</field>
         <field name="order_id" ref="purchase_order_5"/>
     </record>
 
     <record id="purchase_order_line_6" model="purchase.order.line" >
-        <field name="name">Airport Pickup and Drop</field>
         <field name="product_id" ref="product_product_4"/>
         <field name="order_id" ref="purchase_order_6"/>
         <field name="product_qty">201.0</field>
         <field name="price_unit">7.0</field>
-        <field name="product_uom" ref="uom_uom_27"/>
     </record>
     
     <record id="purchase_order_line_7" model="purchase.order.line">
-        <field name="name">Toyota/Fortuner/GJU685657</field>
         <field name="product_id" ref="product_product_7"/>
         <field name="price_unit">14678.0</field>
         <field name="order_id" ref="purchase_order_7"/>
     </record>
     <record id="purchase_order_line_8" model="purchase.order.line">
-        <field name="name">Audi/A5/HJU47634</field>
         <field name="product_id" ref="product_product_18"/>
         <field name="price_unit">4500.0</field>
         <field name="order_id" ref="purchase_order_8"/>
     </record>
     <record id="purchase_order_line_9" model="purchase.order.line">
-        <field name="name">Opel/Agila/KL6464t6</field>
         <field name="product_id" ref="product_product_19"/>
         <field name="price_unit">4500.0</field>
         <field name="order_id" ref="purchase_order_9"/>
     </record>
     <record id="purchase_order_line_10" model="purchase.order.line">
-        <field name="name">Airport Pickup and Drop</field>
         <field name="product_id" ref="product_product_4"/>
         <field name="order_id" ref="purchase_order_10"/>
         <field name="product_qty">1.0</field>
         <field name="price_unit">7.0</field>
-        <field name="product_uom" ref="uom_uom_27"/>
     </record>
 </odoo>
diff --git a/car_rental/demo/purchase_order_line_post.xml b/car_rental/demo/purchase_order_line_post.xml
index e12b3cd8b..29a704640 100644
--- a/car_rental/demo/purchase_order_line_post.xml
+++ b/car_rental/demo/purchase_order_line_post.xml
@@ -18,7 +18,6 @@
         <field name="unit_amount">201</field>
         <field name="x_out_odometer">3564.00</field>
         <field name="x_in_odometer">3765.00</field>
-        <field name="x_total_km">201.00</field>
         <field name="project_id" model="project.project" eval="obj().env.ref('car_rental.sale_order_2').project_id.id"/>
         <field name="task_id" model="project.task" eval="obj().env.ref('car_rental.sale_order_2').tasks_ids.id"/>
     </record>
diff --git a/car_rental/demo/res_partner.xml b/car_rental/demo/res_partner.xml
index 5962c7246..81a5a5866 100644
--- a/car_rental/demo/res_partner.xml
+++ b/car_rental/demo/res_partner.xml
@@ -40,7 +40,6 @@
     <record id="res_partner_18" model="res.partner">
         <field name="name">Megha Singh</field>
         <field name="is_company" eval="True"/>
-        <field name="email_normalized">megha@test.com</field>
         <field name="team_id" ref="sales_team.team_sales_department"/>
         <field name="email">megha@test.com</field>
     </record>
diff --git a/car_rental/demo/sale_order_line.xml b/car_rental/demo/sale_order_line.xml
index 6586ed382..10a5812c6 100644
--- a/car_rental/demo/sale_order_line.xml
+++ b/car_rental/demo/sale_order_line.xml
@@ -1,57 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <odoo noupdate="1">
     <record id="sale_order_line_10" model="sale.order.line" context="{'in_rental_app': True}">
-        <field name="name">Hyundai/i20/DG6864464</field>
         <field name="product_id" ref="product_product_20"/>
         <field name="order_id" ref="sale_order_7"/>
     </record>
     <record id="sale_order_line_11" model="sale.order.line" context="{'in_rental_app': True}">
-        <field name="name">Toyota/Fortuner/GJU685657</field>
         <field name="product_id" ref="product_product_7"/>
         <field name="order_id" ref="sale_order_5"/>
     </record>
     <record id="sale_order_line_12" model="sale.order.line">
-        <field name="name">Airport Pickup and Drop</field>
-        <field name="product_uom" ref="uom_uom_27"/>
         <field name="product_id" ref="product_product_4"/>
         <field name="order_id" ref="sale_order_8"/>
     </record>
     <record id="sale_order_line_2" model="sale.order.line" context="{'in_rental_app': True}">
-        <field name="name">Audi/A5/GJ657863</field>
         <field name="product_id" ref="product_product_3"/>
         <field name="order_id" ref="sale_order_1"/>
     </record>
     <record id="sale_order_line_3" model="sale.order.line">
-        <field name="name">Airport Pickup and Drop</field>
-        <field name="product_uom" ref="uom_uom_27"/>
         <field name="product_id" ref="product_product_4"/>
         <field name="qty_delivered">12.0</field>
         <field name="order_id" ref="sale_order_2"/>
     </record>
     <record id="sale_order_line_4" model="sale.order.line" context="{'in_rental_app': True}">
-        <field name="name">Audi/A5/GJ657863</field>
         <field name="product_id" ref="product_product_16"/>
         <field name="order_id" ref="sale_order_1"/>
     </record>
     <record id="sale_order_line_5" model="sale.order.line" context="{'in_rental_app': True}">
-        <field name="name">Audi/A5/KGF62652</field>
         <field name="product_id" ref="product_product_5"/>
         <field name="order_id" ref="sale_order_3"/>
     </record>
     <record id="sale_order_line_6" model="sale.order.line" context="{'in_rental_app': True}">
-        <field name="name">Damage Charges</field>
         <field name="sequence">11</field>
         <field name="product_id" ref="product_product_9"/>
         <field name="order_id" ref="sale_order_3"/>
     </record>
     <record id="sale_order_line_7" model="sale.order.line" context="{'in_rental_app': True}">
-        <field name="name">Opel/Agila/KL6464t6</field>
         <field name="product_id" ref="product_product_19"/>
         <field name="order_id" ref="sale_order_4"/>
     </record>
     <record id="sale_order_line_9" model="sale.order.line">
-        <field name="name">Airport Pickup and Drop</field>
-        <field name="product_uom" ref="uom_uom_27"/>
         <field name="product_id" ref="product_product_4"/>
         <field name="order_id" ref="sale_order_6"/>
     </record>
diff --git a/car_rental/demo/sale_order_post.xml b/car_rental/demo/sale_order_post.xml
index 691564023..90970643f 100644
--- a/car_rental/demo/sale_order_post.xml
+++ b/car_rental/demo/sale_order_post.xml
@@ -1,134 +1,142 @@
 <odoo>
     <function model="sale.order" name="action_confirm">
         <value eval="[
-            ref('car_rental.sale_order_1'),
-            ref('car_rental.sale_order_2'),
-            ref('car_rental.sale_order_3'),
-            ref('car_rental.sale_order_4'),
-            ref('car_rental.sale_order_7')]"/>
+            ref('sale_order_1'),
+            ref('sale_order_2'),
+            ref('sale_order_3'),
+            ref('sale_order_4'),
+            ref('sale_order_7')]"/>
     </function>
 
 <!--    Pickup product so1-->
-    <record id="car_rental.rental_order_wizard_so1_pickup" model="rental.order.wizard">
+    <record id="rental_order_wizard_so1_pickup" model="rental.order.wizard">
         <field name="order_id" ref="sale_order_1"/>
         <field name="status">pickup</field>
     </record>
 
     <function name="create" model="rental.order.wizard.line">
-        <value eval="dict(obj()._default_wizard_line_vals(obj().env.ref('car_rental.sale_order_line_2'), 'pickup'), **{'rental_order_wizard_id': ref('car_rental.rental_order_wizard_so1_pickup')})" model="rental.order.wizard.line"/>
+        <value eval="dict(obj()._default_wizard_line_vals(obj().env.ref('car_rental.sale_order_line_2'), 'pickup'), 
+        **{'rental_order_wizard_id': ref('rental_order_wizard_so1_pickup')})" model="rental.order.wizard.line"/>
     </function>
 
     <function model="rental.order.wizard" name="apply">
-        <value eval="ref('car_rental.rental_order_wizard_so1_pickup')"/>
+        <value eval="ref('rental_order_wizard_so1_pickup')"/>
     </function>
 
 <!--    Return product so1-->
-    <record id="car_rental.rental_order_wizard_so1_return" model="rental.order.wizard">
+    <record id="rental_order_wizard_so1_return" model="rental.order.wizard">
         <field name="order_id" ref="sale_order_1"/>
         <field name="status">return</field>
     </record>
 
     <function name="create" model="rental.order.wizard.line">
-        <value eval="dict(obj()._default_wizard_line_vals(obj().env.ref('car_rental.sale_order_line_2'), 'return'), **{'rental_order_wizard_id': ref('car_rental.rental_order_wizard_so1_return')})" model="rental.order.wizard.line"/>
+        <value eval="dict(obj()._default_wizard_line_vals(obj().env.ref('car_rental.sale_order_line_2'), 'return'), 
+        **{'rental_order_wizard_id': ref('rental_order_wizard_so1_return')})" model="rental.order.wizard.line"/>
     </function>
 
     <function model="rental.order.wizard" name="apply">
-        <value eval="ref('car_rental.rental_order_wizard_so1_return')"/>
+        <value eval="ref('rental_order_wizard_so1_return')"/>
     </function>
 
     <!--    Pickup product so3-->
-    <record id="car_rental.rental_order_wizard_so3_pickup" model="rental.order.wizard">
+    <record id="rental_order_wizard_so3_pickup" model="rental.order.wizard">
         <field name="order_id" ref="sale_order_3"/>
         <field name="status">pickup</field>
     </record>
 
     <function name="create" model="rental.order.wizard.line">
-        <value eval="dict(obj()._default_wizard_line_vals(obj().env.ref('car_rental.sale_order_line_5'), 'pickup'), **{'rental_order_wizard_id': ref('car_rental.rental_order_wizard_so3_pickup')})" model="rental.order.wizard.line"/>
+        <value eval="dict(obj()._default_wizard_line_vals(obj().env.ref('car_rental.sale_order_line_5'), 'pickup'), 
+        **{'rental_order_wizard_id': ref('rental_order_wizard_so3_pickup')})" model="rental.order.wizard.line"/>
     </function>
 
     <function model="rental.order.wizard" name="apply">
-        <value eval="ref('car_rental.rental_order_wizard_so3_pickup')"/>
+        <value eval="ref('rental_order_wizard_so3_pickup')"/>
     </function>
 
 <!--    Return product so3-->
-    <record id="car_rental.rental_order_wizard_so3_return" model="rental.order.wizard">
+    <record id="rental_order_wizard_so3_return" model="rental.order.wizard">
         <field name="order_id" ref="sale_order_3"/>
         <field name="status">return</field>
     </record>
 
     <function name="create" model="rental.order.wizard.line">
-        <value eval="dict(obj()._default_wizard_line_vals(obj().env.ref('car_rental.sale_order_line_5'), 'return'), **{'rental_order_wizard_id': ref('car_rental.rental_order_wizard_so3_return')})" model="rental.order.wizard.line"/>
+        <value eval="dict(obj()._default_wizard_line_vals(obj().env.ref('car_rental.sale_order_line_5'), 'return'), 
+        **{'rental_order_wizard_id': ref('rental_order_wizard_so3_return')})" model="rental.order.wizard.line"/>
     </function>
 
     <function model="rental.order.wizard" name="apply">
-        <value eval="ref('car_rental.rental_order_wizard_so3_return')"/>
+        <value eval="ref('rental_order_wizard_so3_return')"/>
     </function>
 
 <!--    Pickup product so4-->
-    <record id="car_rental.rental_order_wizard_so4_pickup" model="rental.order.wizard">
-        <field name="order_id" ref="car_rental.sale_order_4"/>
+    <record id="rental_order_wizard_so4_pickup" model="rental.order.wizard">
+        <field name="order_id" ref="sale_order_4"/>
         <field name="status">pickup</field>
     </record>
 
     <function name="create" model="rental.order.wizard.line">
-        <value eval="dict(obj()._default_wizard_line_vals(obj().env.ref('car_rental.sale_order_line_7'), 'pickup'), **{'rental_order_wizard_id': ref('car_rental.rental_order_wizard_so4_pickup')})" model="rental.order.wizard.line"/>
+        <value eval="dict(obj()._default_wizard_line_vals(obj().env.ref('car_rental.sale_order_line_7'), 'pickup'), 
+        **{'rental_order_wizard_id': ref('rental_order_wizard_so4_pickup')})" model="rental.order.wizard.line"/>
     </function>
 
     <function model="rental.order.wizard" name="apply">
-        <value eval="ref('car_rental.rental_order_wizard_so4_pickup')"/>
+        <value eval="ref('rental_order_wizard_so4_pickup')"/>
     </function>
 
 <!--    Return product so4-->
-    <record id="car_rental.rental_order_wizard_so4_return" model="rental.order.wizard">
+    <record id="rental_order_wizard_so4_return" model="rental.order.wizard">
         <field name="order_id" ref="sale_order_4"/>
         <field name="status">return</field>
     </record>
 
     <function name="create" model="rental.order.wizard.line">
-        <value eval="dict(obj()._default_wizard_line_vals(obj().env.ref('car_rental.sale_order_line_7'), 'return'), **{'rental_order_wizard_id': ref('car_rental.rental_order_wizard_so4_return')})" model="rental.order.wizard.line"/>
+        <value eval="dict(obj()._default_wizard_line_vals(obj().env.ref('car_rental.sale_order_line_7'), 'return'), 
+        **{'rental_order_wizard_id': ref('rental_order_wizard_so4_return')})" model="rental.order.wizard.line"/>
     </function>
 
     <function model="rental.order.wizard" name="apply">
-        <value eval="ref('car_rental.rental_order_wizard_so4_return')"/>
+        <value eval="ref('rental_order_wizard_so4_return')"/>
     </function>
 
 <!--    Pickup product so7-->
-    <record id="car_rental.rental_order_wizard_so7_pickup" model="rental.order.wizard">
-        <field name="order_id" ref="car_rental.sale_order_7"/>
+    <record id="rental_order_wizard_so7_pickup" model="rental.order.wizard">
+        <field name="order_id" ref="sale_order_7"/>
         <field name="status">pickup</field>
     </record>
 
     <function name="create" model="rental.order.wizard.line">
-        <value eval="dict(obj()._default_wizard_line_vals(obj().env.ref('car_rental.sale_order_line_10'), 'pickup'), **{'rental_order_wizard_id': ref('car_rental.rental_order_wizard_so7_pickup')})" model="rental.order.wizard.line"/>
+        <value eval="dict(obj()._default_wizard_line_vals(obj().env.ref('car_rental.sale_order_line_10'), 'pickup'), 
+        **{'rental_order_wizard_id': ref('rental_order_wizard_so7_pickup')})" model="rental.order.wizard.line"/>
     </function>
 
     <function model="rental.order.wizard" name="apply">
-        <value eval="ref('car_rental.rental_order_wizard_so7_pickup')"/>
+        <value eval="ref('rental_order_wizard_so7_pickup')"/>
     </function>
 
 <!--    Return product so7-->
-    <record id="car_rental.rental_order_wizard_so7_return" model="rental.order.wizard">
+    <record id="rental_order_wizard_so7_return" model="rental.order.wizard">
         <field name="order_id" ref="sale_order_7"/>
         <field name="status">return</field>
     </record>
 
     <function name="create" model="rental.order.wizard.line">
-        <value eval="dict(obj()._default_wizard_line_vals(obj().env.ref('car_rental.sale_order_line_10'), 'return'), **{'rental_order_wizard_id': ref('car_rental.rental_order_wizard_so7_return')})" model="rental.order.wizard.line"/>
+        <value eval="dict(obj()._default_wizard_line_vals(obj().env.ref('car_rental.sale_order_line_10'), 'return'), 
+        **{'rental_order_wizard_id': ref('rental_order_wizard_so7_return')})" model="rental.order.wizard.line"/>
     </function>
 
     <function model="rental.order.wizard" name="apply">
-        <value eval="ref('car_rental.rental_order_wizard_so7_return')"/>
+        <value eval="ref('rental_order_wizard_so7_return')"/>
     </function>
 
     <!-- create invoice -->
     <function name="_create_invoices" model="sale.order">
-        <value eval="[ref('car_rental.sale_order_2')]"/>
+        <value eval="[ref('sale_order_2')]"/>
     </function>
 
     <function name="action_post" model="account.move">
         <value model="sale.order" eval="
             (
-                obj().env.ref('car_rental.sale_order_2')
+                obj().env.ref('sale_order_2')
             ).invoice_ids.ids
         "/>
     </function>
diff --git a/car_rental/demo/website.xml b/car_rental/demo/website.xml
index 48b3fbf51..fe9fffa60 100644
--- a/car_rental/demo/website.xml
+++ b/car_rental/demo/website.xml
@@ -3,6 +3,7 @@
     <record id="website.default_website" model="website">
         <field name="name">Car_Rental</field>
         <field name="configurator_done" eval="True"/>
+        <field name="logo" type="base64" file="car_rental/static/src/binary/website/1-logo"/>
         <field name="favicon" type="base64" file="car_rental/static/src/binary/website/1-favicon"/>
         <field name="salesteam_id" ref="sales_team.salesteam_website_sales"/>
     </record>
diff --git a/car_rental/demo/website_view.xml b/car_rental/demo/website_view.xml
index 647482493..5cdcf0535 100644
--- a/car_rental/demo/website_view.xml
+++ b/car_rental/demo/website_view.xml
@@ -484,4 +484,4 @@
             </t>
         </field>
     </record>
-</odoo>
\ No newline at end of file
+</odoo>