diff --git a/fleet_rental/README.rst b/fleet_rental/README.rst index 16b1037b3..df5908812 100755 --- a/fleet_rental/README.rst +++ b/fleet_rental/README.rst @@ -1,4 +1,4 @@ -Fleet Rental Management v11 +Fleet Rental Management v12 =========================== This module will helps you to give the vehicles for Rent. @@ -23,7 +23,7 @@ Tech Installation ============ -- www.odoo.com/documentation/11.0/setup/install.html +- www.odoo.com/documentation/12.0/setup/install.html - Install our custom addon Bug Tracker @@ -31,7 +31,7 @@ Bug Tracker Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. -Developer: Avinash NK @ cybrosys, avinash@cybrosys.in +Developer: Avinash NK @ cybrosys, odoo@cybrosys.com Maintainer ---------- diff --git a/fleet_rental/data/fleet_rental_data.xml b/fleet_rental/data/fleet_rental_data.xml index 7cc7850b3..b01dfd458 100755 --- a/fleet_rental/data/fleet_rental_data.xml +++ b/fleet_rental/data/fleet_rental_data.xml @@ -1,28 +1,27 @@ - + Fleet Rental Service service - - + In shop 1 - + Active 2 - + Inactive 3 - + Sold 4 @@ -757,4 +756,4 @@ zbJZNstm2SybZbO48v8DggJUjj9y5wwAAAAASUVORK5CYII= - + \ No newline at end of file diff --git a/fleet_rental/models/car_rental.py b/fleet_rental/models/car_rental.py index 0ac3abbcd..4a7a02431 100755 --- a/fleet_rental/models/car_rental.py +++ b/fleet_rental/models/car_rental.py @@ -153,11 +153,11 @@ class CarRentalContract(models.Model): state_id = self.env.ref('fleet_rental.vehicle_state_rent').id self.vehicle_id.write({'state_id': state_id}) elif self.state == "cancel": - state_id = self.env.ref('fleet.vehicle_state_active').id + state_id = self.env.ref('fleet_rental.vehicle_state_active').id self.vehicle_id.write({'state_id': state_id}) elif self.state == "invoice": - self.rent_end_date = fields.datetime.now() - state_id = self.env.ref('fleet.vehicle_state_active').id + self.rent_end_date = fields.Date.today() + state_id = self.env.ref('fleet_rental.vehicle_state_active').id self.vehicle_id.write({'state_id': state_id}) @api.constrains('checklist_line', 'damage_cost') @@ -339,7 +339,8 @@ class CarRentalContract(models.Model): def action_verify(self): self.state = "invoice" self.reserved_fleet_id.unlink() - self.rent_end_date = fields.datetime.now() + self.rent_end_date = fields.Date.today() + # print(rent_end_date,'ooooooooooooiiiiiiiiiiiii') if self.total_cost != 0: inv_obj = self.env['account.invoice'] inv_line_obj = self.env['account.invoice.line'] diff --git a/fleet_rental/static/description/check_list_form.png b/fleet_rental/static/description/check_list_form.png index 9a316e2a4..d7e80dab1 100755 Binary files a/fleet_rental/static/description/check_list_form.png and b/fleet_rental/static/description/check_list_form.png differ diff --git a/fleet_rental/static/description/check_list_tree.png b/fleet_rental/static/description/check_list_tree.png index ab36eaabe..3ee04b7f7 100755 Binary files a/fleet_rental/static/description/check_list_tree.png and b/fleet_rental/static/description/check_list_tree.png differ diff --git a/fleet_rental/static/description/checklist_contract.png b/fleet_rental/static/description/checklist_contract.png index f4fc09c31..b0bbda8f4 100755 Binary files a/fleet_rental/static/description/checklist_contract.png and b/fleet_rental/static/description/checklist_contract.png differ diff --git a/fleet_rental/static/description/contract_menu.png b/fleet_rental/static/description/contract_menu.png index 5a53dc121..3b5e6a0eb 100755 Binary files a/fleet_rental/static/description/contract_menu.png and b/fleet_rental/static/description/contract_menu.png differ diff --git a/fleet_rental/static/description/email1.png b/fleet_rental/static/description/email1.png index 0b99cd226..9fbd5896f 100755 Binary files a/fleet_rental/static/description/email1.png and b/fleet_rental/static/description/email1.png differ diff --git a/fleet_rental/static/description/email2.png b/fleet_rental/static/description/email2.png index cfe6c6376..6cd54feec 100755 Binary files a/fleet_rental/static/description/email2.png and b/fleet_rental/static/description/email2.png differ diff --git a/fleet_rental/static/description/email3.png b/fleet_rental/static/description/email3.png index bdb293a65..5ccaecafd 100755 Binary files a/fleet_rental/static/description/email3.png and b/fleet_rental/static/description/email3.png differ diff --git a/fleet_rental/static/description/index.html b/fleet_rental/static/description/index.html index 0c203d722..213166f68 100755 --- a/fleet_rental/static/description/index.html +++ b/fleet_rental/static/description/index.html @@ -1,476 +1,229 @@ - -
+
-

- Fleet/Vehicle Rental Management -

-

- This module helps with an opportunity to give the vehicles like car, van, bike, jeep etc. for Rent. -

-
- Cybrosys Technologies -
- -
- cybrosys technologies
- +

Fleet/Vehicle Rental Management

+

This module helps with an opportunity to give the vehicles like car,van,bike,jeep etc.. for Rent.

+

Cybrosys Technologies

+
+
+

Features:

+
+ ☑ Multiple Plans for Rental Contract(Days/Weeks/Months/Years).
+ ☑ Integrated with Accounting Module.
+ ☑ Automatically Create Recurring Invoices.
+ ☑ Sending email for confirmation, first payment and recurrent invoices.
+ ☑ Check List Facility.
+ ☑ Separate Tree view for Checklist.
+ ☑ Damage Checking Facility.
+ ☑ Billing Facility for Damages/Check Lists.
+ ☑ Contract Payment Validations.
+ ☑ Detailed Fleet Rental Analysis Report.
+ ☑ Access Rights From Multiple Level.
+ ☑ Flexible for further customization.
+
-
+
-

- Overview -

-

- This module is an application for Vehicle Rental System which helps in managing the rental of vehicles like car,van,bike, jeep etc... +
+

Overview

+

+ 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. -

-
-
-

- Access Rights -

-

- - Fleet Manager :- Fleet manager has the complete access across the fleet rental management
- - Fleet Rental User :- Fleet rental user can read, write and create the records. -

+

+
-
+
-

- Features -

-

- - Multiple Plans for Rental Contract(Days/Weeks/Months/Years). -

-

- - Integrated with Accounting Module. -

- - Automatically Create Recurring Invoices. -

-

- - Sending email for confirmation, first payment and recurrent invoices.

-

- - Check List Facility.

-

- - Separate Tree view for Checklist.

-

- - Damage Checking Facility.

-

- - Billing Facility for Damages/Check Lists.

-

- - Contract Payment Validations.

-

- - Detailed Fleet Rental Analysis Report.

-

- - Access Rights From Multiple Level.

-

- - Flexible for further customization.

-
-
-
-
-

- Fleet Rental Management -

-
-

Fleet Rental -> Rental Management

-

- - When you install the module, an extra menu named Rental Management is created +

Fleet Rental Management

+
+

+

Fleet Rental -> Rental Management

+

+

+
+ +
+ +
+ + ☛ 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. - + codes according to each state. This helps you in finding out contracts easily.
-
- -
-
-

Fleet Rental -> Rental Management -> Rental Contract

-

- - This is the Rental Contract form. You can see the Recurring lines created according to +
+
+
+

+

Fleet Rental -> Rental Management -> Rental Contract

+

+

+
+ +
+
+ ☛ This is the Rental Contract form. You can see the Recurring lines created according to the Recurring cost. And also you can see all the invoices related to this contract from the smart - button "Invoices". -

+ button "Invoices". +
-
- +
+
+ +
+
+

Checklist

+
+
+ +
+ ☛ Checklist Tab in Rental Contract Form.
-

- Checklist -

-
-

Checklist Tab in Rental Contract Form.

-

- - Here you can add the list of tools given with the vehicle. +
+
+
+

+ 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. -

-
-
- +

+

-

- Checklist Easy Access -

-
-

- - No need to open all rental contract to see the checklist. -

-
- +
+
+ +
+
+

Checklist Easy Access

+
+
+ +
+ ☛ No need to open all rental contract to see the checklist.
-

- - You can also create invoice against the checklist from here. +
+
+ +
+
+ + 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. -

-
-
- -
-
-

- Email Notifications -

-

- - The system will send email notification to notify the confirmation of contract.
- - The system will notify the first payment through email.
- - The system will remind all recurrent invoices through email.
- Note:- You should configure outgoing and incoming e-mail settings from your odoo for email service. -

-
-
- -
-
- -
-
- -
-
-

- Contract Payment Validations -

-
- -
-

- - Here you can see you have 4 invoices 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. -

-
-
- -
-

- Fleet Rental Analysis Report -

-

- - You can also analyse all your fleet rentals from Fleet Rental -> Reports -> Fleet Rental Analysis. -

-
- + If there is any damage or any missing tool, then you can charge all that from customer. +
-
-
- cybrosys technologies -
-
-
+
-

- Our Services -

-
-
- -
- - - -
-

- - Odoo Customization - -

- +

Email Notifications

+
+
+ + ☛The system will send email notification to notify the confirmation of contract.
+ ☛The system will notify the first payment through email.
+ ☛The system will remind all recurrent invoices through email.
+ Note:- You should configure outgoing and incoming e-mail settings from your odoo for email service. +
-
- -
- - - +
+
+
-

- - Odoo Implementation -

-
-
- -
- - - +
+
+
-

- - Odoo Integration - -

-
-
- -
- - - +
+
+
-

- - Odoo Support -

- -
-
-
-
-

- Our Industries -

-
-
- -
-
- - Odoo Industry - -
-
-
-

- - Trading - -

-

- Easily procure and sell your products. -

-
- -
-
- -
-
- - Odoo Industry - -
-
-
-

- - Manufacturing -

-

- Plan, track and schedule your operations. -

-
- -
-
- -
-
- - Odoo Industry - -
-
-
-

- - Restaurant -

-

- Run your bar or restaurant methodical. -

-
- -
-
- -
-
- - Odoo Industry - -
-
-
-

- - POS -

-

- Easy configuring and convivial selling. -

-
+
+
+

Contract Payment Validations

+
+
+
-
+
+ ☛ + Here you can see you have 4 invoices 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. + -
-
- - Odoo Industry - -
-
-
-

- - E-commerce & Website -

-

- Mobile friendly, awe-inspiring product pages. -

-
-
- -
-
- - Odoo Industry - -
-
-
-

- - Hotel Management -

-

- An all-inclusive hotel management application. -

-
+
+
-
+
+
+
-
-
- - Odoo Industry - -
-
-
-

- - Education -

-

- A Collaborative platform for educational management. -

-
+
+
+

Fleet Rental Analysis Report

+
+
+
-
+ ☛ + You can also analyse all your fleet rentals from Fleet Rental -> Reports -> Fleet Rental Analysis. + +
+
+
-
-
- - Odoo Industry - -
-
-
-

- - Service Management -

-

- Keep track of services and invoice accordingly. -

-
-
+
+
+

Access Rights

+
+ ☛Fleet Manager :- Fleet manager has the complete access across the fleet rental management
+ ☛Fleet Rental User :- Fleet rental user can read, write and create the records.
-
-
+ +
+

Need Any Help?

+

- +
- - - - - + + + + +
+ + diff --git a/fleet_rental/static/description/menu_items.png b/fleet_rental/static/description/menu_items.png index 17d53d9c1..14d26e6cc 100755 Binary files a/fleet_rental/static/description/menu_items.png and b/fleet_rental/static/description/menu_items.png differ diff --git a/fleet_rental/static/description/rental_inv.png b/fleet_rental/static/description/rental_inv.png index 2c10fe29c..ceb8a60d3 100755 Binary files a/fleet_rental/static/description/rental_inv.png and b/fleet_rental/static/description/rental_inv.png differ diff --git a/fleet_rental/static/description/rental_validation.png b/fleet_rental/static/description/rental_validation.png index 1e22c03cf..dbbe0c4ce 100755 Binary files a/fleet_rental/static/description/rental_validation.png and b/fleet_rental/static/description/rental_validation.png differ diff --git a/fleet_rental/static/description/report.png b/fleet_rental/static/description/report.png index 88eb6173e..9da5511c9 100755 Binary files a/fleet_rental/static/description/report.png and b/fleet_rental/static/description/report.png differ diff --git a/fleet_rental/views/car_rental_view.xml b/fleet_rental/views/car_rental_view.xml index 5d77e6bbe..5067bdd3d 100755 --- a/fleet_rental/views/car_rental_view.xml +++ b/fleet_rental/views/car_rental_view.xml @@ -193,8 +193,8 @@ - - + +