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 @@
-
- unsplash_ovrOPhu8vSw_car.webp
-
- ir.attachment
-
-
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 @@
-
+
x_in_odometer
account.analytic.line
In Odometer
float
-
+
x_out_odometer
account.analytic.line
Out Odometer
float
-
+
x_total_km
account.analytic.line
@@ -25,7 +25,7 @@
float
-
+
x_vehicle_no
product.template
@@ -33,7 +33,7 @@
fleet.vehicle
many2one
-
+
x_task
purchase.order.line
@@ -41,7 +41,7 @@
project.task
many2one
-
+
x_vehicle_status
fleet.vehicle.log.services
@@ -49,7 +49,7 @@
fleet.vehicle.state
many2one
-
+
x_vendor
project.task
@@ -57,14 +57,14 @@
res.partner
many2one
-
+
x_security_deposit
sale.order
Security Deposit
float
-
+
x_product_name_fleet
fleet.vehicle
@@ -73,14 +73,14 @@
x_vehicle_no
one2many
-
+
x_licence_no
res.partner
Licence No.
char
-
+
x_licence_no
sale.order
@@ -89,7 +89,7 @@
partner_id.x_licence_no
char
-
+
x_rental_status
sale.order.line
@@ -99,7 +99,7 @@
[('draft', 'Quotation'), ('sent', 'Quotation Sent'), ('pickup', 'Reserved'), ('return', 'Pickedup'), ('returned', 'Returned'), ('cancel', 'Cancelled')]
selection
-
+
x_car
sale.order.line
@@ -107,17 +107,15 @@
product_id.x_vehicle_no
fleet.vehicle
-
many2one
-
+
x_car_status
sale.order.line
Car Status
x_car.state_id
fleet.vehicle.state
-
many2one
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 @@
-
+
fleet.vehicle.log.services.form.customization
fleet.vehicle.log.services
@@ -9,24 +9,19 @@
form
-
+
-
+
fleet.vehicle.form.customization
fleet.vehicle
extension
160
form
-
-
-
-
-
-
+
product.template.product.form.customization
product.template
@@ -39,7 +34,7 @@
-
+
project.task.form.customization
project.task
@@ -60,7 +55,7 @@
-
+
purchase.order.form.customization
purchase.order
@@ -73,7 +68,7 @@
-
+
rental.order.form.customization
sale.order
@@ -88,13 +83,13 @@
-
+
-
+
res.partner.form.customization
res.partner
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 @@
write
+
-
-
-
-
- write
-
-
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 @@
-
-
-
-
-
-
-
-
-
5.0
@@ -21,48 +12,8 @@
RENTAL
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
7.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 @@
-
+
Hyundai/Creta/GJ567655
product
20.0
- order
10045
120.0
-
+
Damage Charges
service
- order
-
timesheet
10010
purchase
-
+
FASTag Charges
service
- order
-
timesheet
10075
purchase
-
+
Fuel Charges
service
- order
-
timesheet
10070
purchase
Charges depend on the current price.
-
+
Child Seat
product
5.0
- order
-
10060
35.0
@@ -68,7 +59,6 @@
delivery
-
timesheet
10015
purchase
@@ -82,7 +72,6 @@
delivery
-
timesheet
10030
purchase
@@ -91,54 +80,43 @@
Rental Delay Cost
service
- order
-
10065
purchase
-
+
Audi/A3/Mh47535H
product
- order
-
10080
-
+
Audi/A5/HJU47634
product
- order
-
10085
-
+
Opel/Agila/KL6464t6
product
15.0
- order
-
10090
100.0
-
+
Hyundai/i20/DG6864464
product
15.0
- order
-
10095
100.0
-
+
Audi/A5/GJ657863
product
45.0
- order
10025
@@ -154,43 +132,39 @@
delivery
-
timesheet
10035
purchase
-
+
Audi/A5/KGF62652
product
42.0
- order
10020
380.0
-
+
Mercedes/Class M/JK46556
product
30.0
- order
10040
240.0
-
+
Toyota/Fortuner/GJU685657
product
15.0
- order
10055
@@ -202,7 +176,6 @@
service
- order
timesheet
10005
@@ -216,7 +189,6 @@
40.0
delivery
-
timesheet
10000
purchase
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 @@
Internal
-
Airport Pickup and Drop
-
Door to door pickup
-
Monthly Rental
-
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
]]>
- mitchell@test.com
opportunity
+1 46657555
@@ -44,7 +43,6 @@
]]>
Need it with Driver
- mitchell@test.com
+157652764
@@ -64,7 +62,6 @@
Service: Airport Pickup and drop
Pickup Timing and date: 12 October at 11 am
]]>
- megha@test.com
opportunity
Cleveland
Megha Singh
@@ -87,7 +84,6 @@
]]>
- megha@gmail.com
+1 46657555
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 @@
-
-
-
-
-
-
-
-
-
-
-
-
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 @@
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 @@
- Child Seat
50.0
15.0
@@ -9,79 +8,65 @@
- Hyundai/i20/DG6864464
3500.0
- Airport Pickup and Drop
1.0
250.0
-
- Audi/A5/GJ657863
35007.0
- Audi/A5/KGF62652
28970.0
- Hyundai/Creta/GJ567655
15678.0
- Mercedes/Class M/JK46556
20757.0
- Airport Pickup and Drop
201.0
7.0
-
- Toyota/Fortuner/GJU685657
14678.0
- Audi/A5/HJU47634
4500.0
- Opel/Agila/KL6464t6
4500.0
- Airport Pickup and Drop
1.0
7.0
-
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 @@
201
3564.00
3765.00
- 201.00
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 @@
Megha Singh
- megha@test.com
megha@test.com
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 @@
- Hyundai/i20/DG6864464
- Toyota/Fortuner/GJU685657
- Airport Pickup and Drop
-
- Audi/A5/GJ657863
- Airport Pickup and Drop
-
12.0
- Audi/A5/GJ657863
- Audi/A5/KGF62652
- Damage Charges
11
- Opel/Agila/KL6464t6
- Airport Pickup and Drop
-
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 @@
+ ref('sale_order_1'),
+ ref('sale_order_2'),
+ ref('sale_order_3'),
+ ref('sale_order_4'),
+ ref('sale_order_7')]"/>
-
+
pickup
-
+
-
+
-
+
return
-
+
-
+
-
+
pickup
-
+
-
+
-
+
return
-
+
-
+
-
-
+
+
pickup
-
+
-
+
-
+
return
-
+
-
+
-
-
+
+
pickup
-
+
-
+
-
+
return
-
+
-
+
-
+
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 @@
Car_Rental
+
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 @@
-
\ No newline at end of file
+