[ADD] car_rental: add suggested changes

added the suggested changes
task-3460478

car_rental/__manifest__.py

@@ -1,10 +1,9 @@
-# -*- coding: utf-8 -*-
 {
     'name': 'Car Rental',
     'version': '1.0',
-    'category': 'Industry',
+    'category': 'Service',
     'description': """
-This module is for those seeking to rent a car for either short or long-distance travel, the company specializes in providing tailored car rental services based on the customer's specific requirements.
+This module pre-configures Odoo to manage your fleet. Easily purchase a new car or rent one for short or long-distance travel. Provide also tailored car rental services based on the customer's specific requirements.
 """,
     'author': 'Odoo S.A.',
     'depends': [
@@ -44,12 +43,13 @@
         'data/uom_uom.xml',
         'data/product_template.xml',
         'data/product_product.xml',
+        'data/res_config_settings.xml',
         'data/knowledge_cover.xml',
         'data/knowledge_article.xml',
+        'data/knowledge_article_member.xml',
         'data/ir_attachment_post.xml',
     ],
     'demo': [
-        'demo/res_config_settings.xml',
         'demo/website.xml',
         'demo/res_partner.xml',
         'demo/crm_team.xml',
@@ -69,4 +69,5 @@
     ],
     'application': False,
     'license': 'OPL-1',
+    'images': ['images/main.png'],
 }

car_rental/data/account_analytic_account.xml

@@ -3,21 +3,17 @@
     <record id="car_rental.account_analytic_account_1" model="account.analytic.account">
         <field name="name">Internal</field>
         <field name="plan_id" ref="car_rental.account_analytic_plan_1"/>
-        <field name="root_plan_id" ref="car_rental.account_analytic_plan_1"/>
     </record>
     <record id="car_rental.account_analytic_account_2" model="account.analytic.account">
         <field name="name">Airport Pickup and Drop</field>
         <field name="plan_id" ref="car_rental.account_analytic_plan_1"/>
-        <field name="root_plan_id" ref="car_rental.account_analytic_plan_1"/>
     </record>
     <record id="car_rental.account_analytic_account_3" model="account.analytic.account">
         <field name="name">Door to door pickup</field>
         <field name="plan_id" ref="car_rental.account_analytic_plan_1"/>
-        <field name="root_plan_id" ref="car_rental.account_analytic_plan_1"/>
     </record>
     <record id="car_rental.account_analytic_account_4" model="account.analytic.account">
         <field name="name">Monthly Rental</field>
         <field name="plan_id" ref="car_rental.account_analytic_plan_1"/>
-        <field name="root_plan_id" ref="car_rental.account_analytic_plan_1"/>
     </record>
 </odoo>

car_rental/data/base_automation.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <odoo>
-    <record id="create_the_product_f7fc4954-df76-46f6-84ea-ff726e6648b4" model="base.automation">
+    <record id="create_the_product" model="base.automation">
         <field name="name">Create Product - Server Actions</field>
         <field name="model_id" ref="fleet.model_fleet_vehicle"/>
         <field name="trigger">on_create</field>

car_rental/data/ir_actions_server.xml

@@ -4,7 +4,7 @@
         <field name="name">Create Product - Server Actions</field>
         <field name="model_id" ref="fleet.model_fleet_vehicle"/>
         <field name="state">code</field>
-        <field name="base_automation_id" ref="car_rental.create_the_product_f7fc4954-df76-46f6-84ea-ff726e6648b4"/>
+        <field name="base_automation_id" ref="car_rental.create_the_product"/>
         <field name="code">
             <![CDATA[
                 record.write({

car_rental/data/ir_model_fields.xml

@@ -1,110 +1,102 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <odoo>
     <record id="car_rental.new_decimal_analytic_572a5f52-d008-4150-a715-14e2462f8244" model="ir.model.fields">
-        <field name="name">x_studio_in_odometer</field>
+        <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="copied" eval="True"/>
         <field name="field_description">In Odometer</field>
         <field name="on_delete" eval="False"/>
         <field name="ttype">float</field>
     </record>
     <record id="car_rental.new_decimal_analytic_e866fd7b-409e-42e3-864a-82beca96e66d" model="ir.model.fields">
-        <field name="name">x_studio_out_odometer</field>
+        <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="copied" eval="True"/>
         <field name="field_description">Out Odometer</field>
         <field name="on_delete" eval="False"/>
         <field name="ttype">float</field>
     </record>
     <record id="car_rental.new_decimal_analytic_64689165-d621-445d-bf49-f03d161262b7" model="ir.model.fields">
-        <field name="name">x_studio_total_km</field>
+        <field name="name">x_total_km</field>
         <field name="model">account.analytic.line</field>
         <field name="model_id" ref="analytic.model_account_analytic_line"/>
         <field name="compute"><![CDATA[for record in self:
-                record['x_studio_total_km'] = record.x_studio_in_odometer - record.x_studio_out_odometer]]></field>
-        <field name="depends">x_studio_in_odometer,x_studio_out_odometer</field>
+                record['x_total_km'] = record.x_in_odometer - record.x_out_odometer]]></field>
+        <field name="depends">x_in_odometer,x_out_odometer</field>
         <field name="field_description">Total KM</field>
         <field name="on_delete" eval="False"/>
         <field name="readonly" eval="True"/>
         <field name="ttype">float</field>
     </record>
     <record id="car_rental.new_many2one_product_1118051d-f5fc-42c8-8585-2211863a23ff" model="ir.model.fields">
-        <field name="name">x_studio_vehicle_no</field>
+        <field name="name">x_vehicle_no</field>
         <field name="model">product.template</field>
         <field name="model_id" ref="product.model_product_template"/>
-        <field name="copied" eval="True"/>
         <field name="field_description">Vehicle No.</field>
         <field name="relation">fleet.vehicle</field>
         <field name="ttype">many2one</field>
     </record>
     <record id="car_rental.new_many2one_purchas_09c6869c-aee9-44ee-a629-a005a9ed2c97" model="ir.model.fields">
-        <field name="name">x_studio_task</field>
+        <field name="name">x_task</field>
         <field name="model">purchase.order.line</field>
         <field name="model_id" ref="purchase.model_purchase_order_line"/>
-        <field name="copied" eval="True"/>
         <field name="field_description">Task</field>
         <field name="relation">project.task</field>
         <field name="ttype">many2one</field>
     </record>
     <record id="car_rental.new_many2one_service_63929119-86b9-49aa-babd-87eaf63d7f90" model="ir.model.fields">
-        <field name="name">x_studio_vehicle_status</field>
+        <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"/>
-        <field name="copied" eval="True"/>
         <field name="field_description">Vehicle Status</field>
         <field name="relation">fleet.vehicle.state</field>
         <field name="ttype">many2one</field>
     </record>
     <record id="car_rental.new_many2one_task_28f37101-5082-4cdc-8aa1-ee7a66ef81c3" model="ir.model.fields">
-        <field name="name">x_studio_vendor</field>
+        <field name="name">x_vendor</field>
         <field name="model">project.task</field>
         <field name="model_id" ref="project.model_project_task"/>
-        <field name="copied" eval="True"/>
         <field name="field_description">Vendor</field>
         <field name="relation">res.partner</field>
         <field name="ttype">many2one</field>
     </record>
     <record id="car_rental.new_monetary_sales_o_24f7083d-cdd4-4e4d-b9ed-8f62aa60f374" model="ir.model.fields">
-        <field name="name">x_studio_security_deposit</field>
+        <field name="name">x_security_deposit</field>
         <field name="model">sale.order</field>
         <field name="model_id" ref="sale.model_sale_order"/>
-        <field name="copied" eval="True"/>
         <field name="field_description">Security Deposit</field>
         <field name="ttype">float</field>
     </record>
     <record id="car_rental.new_one2many_vehicle_37e5c4e3-5258-41d6-ac3b-4590323f9100" model="ir.model.fields">
-        <field name="name">x_studio_product_name_fleet</field>
+        <field name="name">x_product_name_fleet</field>
         <field name="model">fleet.vehicle</field>
         <field name="model_id" ref="fleet.model_fleet_vehicle"/>
         <field name="field_description">Product Name</field>
         <field name="on_delete" eval="False"/>
         <field name="relation">product.template</field>
-        <field name="relation_field">x_studio_vehicle_no</field>
+        <field name="relation_field">x_vehicle_no</field>
         <field name="ttype">one2many</field>
     </record>
     <record id="car_rental.new_text_contact_c60cc1e1-8b64-41ad-a1cd-644f0dfb8af0" model="ir.model.fields">
-        <field name="name">x_studio_licence_no</field>
+        <field name="name">x_licence_no</field>
         <field name="model">res.partner</field>
         <field name="model_id" ref="base.model_res_partner"/>
-        <field name="copied" eval="True"/>
         <field name="field_description">Licence No. </field>
         <field name="on_delete" eval="False"/>
         <field name="ttype">char</field>
     </record>
     <record id="car_rental.new_related_field_sa_0a3aa1b1-4d73-4e58-a311-4091ec3bb6e0" model="ir.model.fields">
-        <field name="name">x_studio_licence_no</field>
+        <field name="name">x_licence_no</field>
         <field name="model">sale.order</field>
         <field name="model_id" ref="sale.model_sale_order"/>
         <field name="field_description">Licence No.</field>
         <field name="on_delete" eval="False"/>
         <field name="readonly" eval="True"/>
-        <field name="related">partner_id.x_studio_licence_no</field>
+        <field name="related">partner_id.x_licence_no</field>
         <field name="ttype">char</field>
     </record>
     <record id="car_rental.new_related_field_sa_25fd21b0-0335-4fd6-bda2-d905f1846755" model="ir.model.fields">
-        <field name="name">x_studio_rental_status</field>
+        <field name="name">x_rental_status</field>
         <field name="model">sale.order.line</field>
         <field name="model_id" ref="sale.model_sale_order_line"/>
         <field name="field_description">Rental Status</field>
@@ -115,22 +107,22 @@
         <field name="ttype">selection</field>
     </record>
     <record id="car_rental.new_related_field_sa_d4f91f4c-4b7b-4705-a0b8-e2718b162bc2" model="ir.model.fields">
-        <field name="name">x_studio_car</field>
+        <field name="name">x_car</field>
         <field name="model">sale.order.line</field>
         <field name="model_id" ref="sale.model_sale_order_line"/>
         <field name="field_description">Car</field>
         <field name="readonly" eval="True"/>
-        <field name="related">product_id.x_studio_vehicle_no</field>
+        <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="car_rental.new_related_field_sa_3d5345a1-e715-4ea1-8a5d-88a4dd65376e" model="ir.model.fields">
-        <field name="name">x_studio_car_status</field>
+        <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_studio_car.state_id</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>

car_rental/data/ir_ui_view.xml

@@ -9,7 +9,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='vendor_id']" position="after">
-                <field name="x_studio_vehicle_status" string="Vehicle Status"/>
+                <field name="x_vehicle_status" string="Vehicle Status"/>
             </xpath>
         </field>
     </record>
@@ -22,7 +22,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='location']" position="after">
-                <field name="x_studio_product_name_fleet" string="Product Name" invisible="1"/>
+                <field name="x_product_name_fleet" invisible="1"/>
             </xpath>
         </field>
     </record>
@@ -35,7 +35,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='uom_po_id']" position="after">
-                <field name="x_studio_vehicle_no" string="Vehicle No."/>
+                <field name="x_vehicle_no" string="Vehicle No."/>
             </xpath>
         </field>
     </record>
@@ -48,12 +48,12 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='tag_ids']" position="after">
-                <field name="x_studio_vendor" string="Vendor"/>
+                <field name="x_vendor" string="Vendor"/>
             </xpath>
             <xpath expr="//field[@name='timesheet_ids']//tree//field[@name='name']" position="after">
-                <field optional="show" name="x_studio_out_odometer" string="Out Odometer"/>
-                <field optional="show" name="x_studio_in_odometer" string="In Odometer"/>
-                <field optional="show" name="x_studio_total_km" string="Total KM"/>
+                <field optional="show" name="x_out_odometer" string="Out Odometer"/>
+                <field optional="show" name="x_in_odometer" string="In Odometer"/>
+                <field optional="show" name="x_total_km" string="Total KM"/>
             </xpath>
             <xpath expr="//field[@name='timesheet_ids']//tree//field[@name='unit_amount']" position="attributes">
                 <attribute name="readonly">readonly_timesheet != False</attribute>
@@ -70,7 +70,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <xpath expr="//form[1]/sheet[1]/notebook[1]/page[@name='products']/field[@name='order_line']/tree[1]/field[@name='name']" position="after">
-                <field optional="show" name="x_studio_task" string="Task"/>
+                <field optional="show" name="x_task" string="Task"/>
             </xpath>
         </field>
     </record>
@@ -83,15 +83,15 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='partner_id']" position="after">
-                <field name="x_studio_licence_no" string="Licence No."/>
+                <field name="x_licence_no" string="Licence No."/>
             </xpath>
             <xpath expr="//group[@name='order_details']" position="inside">
-                <field name="x_studio_security_deposit" string="Security Deposit" widget="monetary"/>
+                <field name="x_security_deposit" string="Security Deposit" widget="monetary"/>
             </xpath>
             <xpath expr="//form[1]/sheet[1]/notebook[1]/page[@name='order_lines']/field[@name='order_line']/tree[1]/field[@name='name']" position="after">
-                <field optional="show" name="x_studio_car" string="Car" invisible="1" attrs="{'readonly': True}"/>
-                <field optional="show" name="x_studio_car_status" string="Car Status"/>
-                <field optional="show" name="x_studio_rental_status" string="Rental Status"/>
+                <field optional="show" name="x_car" string="Car" invisible="1" attrs="{'readonly': True}"/>
+                <field optional="show" name="x_car_status" string="Car Status"/>
+                <field optional="show" name="x_rental_status" string="Rental Status"/>
             </xpath>
         </field>
     </record>
@@ -104,7 +104,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <xpath expr="//form[1]/sheet[1]/group[1]/group[1]/div[1]" position="after">
-                <field name="x_studio_licence_no" string="Licence No. "/>
+                <field name="x_licence_no" string="Licence No. "/>
             </xpath>
         </field>
     </record>

car_rental/data/knowledge_article_member.xml

@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<odoo noupdate="1">
+    <record id="car_rental.knowledge_article_member_1" model="knowledge.article.member">
+        <field name="partner_id" ref="base.partner_admin"/>
+        <field name="article_id" ref="car_rental.knowledge_article_4"/>
+        <field name="permission">write</field>
+    </record>
+</odoo>

car_rental/data/product_category.xml

@@ -22,19 +22,4 @@
         <field name="name">Toyota</field>
         <field name="parent_id" ref="car_rental.product_category_6"/>
     </record>
-    <record id="product.product_category_all" model="product.category">
-        <field name="name">All</field>
-    </record>
-    <record id="delivery.product_category_deliveries" model="product.category">
-        <field name="name">Deliveries</field>
-        <field name="parent_id" ref="product.product_category_all"/>
-    </record>
-    <record id="product.cat_expense" model="product.category">
-        <field name="name">Expenses</field>
-        <field name="parent_id" ref="product.product_category_all"/>
-    </record>
-    <record id="product.product_category_1" model="product.category">
-        <field name="name">Saleable</field>
-        <field name="parent_id" ref="product.product_category_all"/>
-    </record>
 </odoo>

car_rental/data/product_product.xml

@@ -60,7 +60,6 @@
         <field name="product_tmpl_id" ref="car_rental.product_template_11"/>
     </record>
     <record id="delivery.product_product_delivery" model="product.product">
-        <field name="default_code">Delivery_007</field>
         <field name="product_tmpl_id" ref="delivery.product_product_delivery_product_template"/>
     </record>
     <record id="sale_timesheet.time_product" model="product.product">

car_rental/demo/res_config_settings.xml → car_rental/data/res_config_settings.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<odoo>
+<odoo noupdate="1">
 
     <record model="res.config.settings" id="res_config_settings_enable">
         <field name="group_discount_per_so_line" eval="1"/>
@@ -9,4 +9,4 @@
         <value eval="[ref('res_config_settings_enable')]"/>
     </function>
 
-</odoo>
+</odoo>