From 0c1f79051a8922bcf26b5a99dcdc31581547da19 Mon Sep 17 00:00:00 2001 From: shubham Date: Wed, 7 May 2025 15:45:51 +0530 Subject: [PATCH 1/9] converted fleet_vehicle_log_fuel 16v to 17v --- fleet_vehicle_log_fuel/README.rst | 83 ++++ fleet_vehicle_log_fuel/__init__.py | 2 + fleet_vehicle_log_fuel/__manifest__.py | 22 + fleet_vehicle_log_fuel/models/__init__.py | 2 + .../models/fleet_vehicle.py | 42 ++ .../models/fleet_vehicle_log_fuel.py | 182 ++++++++ .../readme/CONTRIBUTORS.rst | 7 + fleet_vehicle_log_fuel/readme/DESCRIPTION.rst | 1 + fleet_vehicle_log_fuel/report/__init__.py | 1 + fleet_vehicle_log_fuel/report/fleet_report.py | 82 ++++ .../security/fleet_security.xml | 25 + .../security/ir.model.access.csv | 3 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 430 ++++++++++++++++++ fleet_vehicle_log_fuel/tests/__init__.py | 1 + fleet_vehicle_log_fuel/tests/common.py | 24 + .../tests/test_fleet_vehicle_log_fuel.py | 94 ++++ .../views/fleet_board_view.xml | 17 + .../views/fleet_vehicle_log_fuel_views.xml | 207 +++++++++ .../views/fleet_vehicle_views.xml | 21 + 20 files changed, 1246 insertions(+) create mode 100644 fleet_vehicle_log_fuel/README.rst create mode 100644 fleet_vehicle_log_fuel/__init__.py create mode 100644 fleet_vehicle_log_fuel/__manifest__.py create mode 100644 fleet_vehicle_log_fuel/models/__init__.py create mode 100644 fleet_vehicle_log_fuel/models/fleet_vehicle.py create mode 100644 fleet_vehicle_log_fuel/models/fleet_vehicle_log_fuel.py create mode 100644 fleet_vehicle_log_fuel/readme/CONTRIBUTORS.rst create mode 100644 fleet_vehicle_log_fuel/readme/DESCRIPTION.rst create mode 100644 fleet_vehicle_log_fuel/report/__init__.py create mode 100644 fleet_vehicle_log_fuel/report/fleet_report.py create mode 100644 fleet_vehicle_log_fuel/security/fleet_security.xml create mode 100644 fleet_vehicle_log_fuel/security/ir.model.access.csv create mode 100644 fleet_vehicle_log_fuel/static/description/icon.png create mode 100644 fleet_vehicle_log_fuel/static/description/index.html create mode 100644 fleet_vehicle_log_fuel/tests/__init__.py create mode 100644 fleet_vehicle_log_fuel/tests/common.py create mode 100644 fleet_vehicle_log_fuel/tests/test_fleet_vehicle_log_fuel.py create mode 100644 fleet_vehicle_log_fuel/views/fleet_board_view.xml create mode 100644 fleet_vehicle_log_fuel/views/fleet_vehicle_log_fuel_views.xml create mode 100644 fleet_vehicle_log_fuel/views/fleet_vehicle_views.xml diff --git a/fleet_vehicle_log_fuel/README.rst b/fleet_vehicle_log_fuel/README.rst new file mode 100644 index 00000000..ad18bf66 --- /dev/null +++ b/fleet_vehicle_log_fuel/README.rst @@ -0,0 +1,83 @@ +====================== +Fleet Vehicle Log Fuel +====================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:1c7da63ec09d49cf85859f6ca3a31fcb5ea46266d54e8b03fbffaf82d1c53ee3 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Ffleet-lightgray.png?logo=github + :target: https://github.com/OCA/fleet/tree/16.0/fleet_vehicle_log_fuel + :alt: OCA/fleet +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/fleet-16-0/fleet-16-0-fleet_vehicle_log_fuel + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/fleet&target_branch=16.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module adds fuel logs in a similar way as services. + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* ForgeFlow +* Tecnativa + +Contributors +~~~~~~~~~~~~ + +* Miquel Raïch +* `Tecnativa `_: + + * Víctor Martínez + * Pedro M. Baeza + * Carolina Fernandez + * Shubham Kumar Pal + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +This module is part of the `OCA/fleet `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/fleet_vehicle_log_fuel/__init__.py b/fleet_vehicle_log_fuel/__init__.py new file mode 100644 index 00000000..bf588bc8 --- /dev/null +++ b/fleet_vehicle_log_fuel/__init__.py @@ -0,0 +1,2 @@ +from . import models +from . import report diff --git a/fleet_vehicle_log_fuel/__manifest__.py b/fleet_vehicle_log_fuel/__manifest__.py new file mode 100644 index 00000000..63ec1eae --- /dev/null +++ b/fleet_vehicle_log_fuel/__manifest__.py @@ -0,0 +1,22 @@ +# Copyright 2022 ForgeFlow S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +{ + "name": "Fleet Vehicle Log Fuel", + "summary": "Add Log Fuels for your vehicles.", + "version": "17.0.1.0.0", + "category": "Fleet", + "author": "ForgeFlow, Tecnativa, Odoo Community Association (OCA)", + "website": "https://github.com/OCA/fleet", + "license": "AGPL-3", + "depends": ["fleet"], + "data": [ + "security/ir.model.access.csv", + "security/fleet_security.xml", + "views/fleet_board_view.xml", + "views/fleet_vehicle_log_fuel_views.xml", + "views/fleet_vehicle_views.xml", + ], + "installable": True, + "auto_install": False, +} diff --git a/fleet_vehicle_log_fuel/models/__init__.py b/fleet_vehicle_log_fuel/models/__init__.py new file mode 100644 index 00000000..ce6bad7e --- /dev/null +++ b/fleet_vehicle_log_fuel/models/__init__.py @@ -0,0 +1,2 @@ +from . import fleet_vehicle_log_fuel +from . import fleet_vehicle diff --git a/fleet_vehicle_log_fuel/models/fleet_vehicle.py b/fleet_vehicle_log_fuel/models/fleet_vehicle.py new file mode 100644 index 00000000..ac5465b8 --- /dev/null +++ b/fleet_vehicle_log_fuel/models/fleet_vehicle.py @@ -0,0 +1,42 @@ +# Copyright 2022 ForgeFlow S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + + +from odoo import api, fields, models + + +class FleetVehicle(models.Model): + _inherit = "fleet.vehicle" + + log_fuels = fields.One2many("fleet.vehicle.log.fuel", "vehicle_id", "Fuel Logs") + fuel_count = fields.Integer(compute="_compute_fuel_count", string="Fuel Log Count") + + @api.depends("log_fuels") + def _compute_fuel_count(self): + res = self.env["fleet.vehicle.log.fuel"].read_group( + domain=[("vehicle_id", "in", self.ids)], + fields=["vehicle_id"], + groupby=["vehicle_id"], + ) + res_dict = {x["vehicle_id"][0]: x["vehicle_id_count"] for x in res} + for record in self: + record.fuel_count = res_dict.get(record.id, 0) + return res + + def action_view_log_fuel(self): + action = self.env["ir.actions.act_window"]._for_xml_id( + "fleet_vehicle_log_fuel.fleet_vehicle_log_fuel_action" + ) + action.update( + context=dict(self.env.context, default_vehicle_id=self.id, group_by=False), + domain=[("vehicle_id", "=", self.id)], + ) + return action + + +class FleetServiceType(models.Model): + _inherit = "fleet.service.type" + + category = fields.Selection( + selection_add=[("fuel", "Fuel Log")], ondelete={"fuel": "cascade"} + ) diff --git a/fleet_vehicle_log_fuel/models/fleet_vehicle_log_fuel.py b/fleet_vehicle_log_fuel/models/fleet_vehicle_log_fuel.py new file mode 100644 index 00000000..339bae5c --- /dev/null +++ b/fleet_vehicle_log_fuel/models/fleet_vehicle_log_fuel.py @@ -0,0 +1,182 @@ +# Copyright 2022 ForgeFlow S.L. +# Copyright 2024 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import _, api, fields, models +from odoo.exceptions import UserError + + +class FleetVehicleLogFuel(models.Model): + _name = "fleet.vehicle.log.fuel" + _inherit = ["mail.thread", "mail.activity.mixin"] + _rec_name = "service_type_id" + _description = "Fuel log for vehicles" + + READONLY_STATES = { + "running": [("readonly", True)], + "done": [("readonly", True)], + "cancelled": [("readonly", True)], + } + + active = fields.Boolean(default=True) + vehicle_id = fields.Many2one( + "fleet.vehicle", + "Vehicle", + required=True, + help="Vehicle concerned by this log", + states=READONLY_STATES, + tracking=True, + ) + amount = fields.Monetary("Cost", states=READONLY_STATES, tracking=True) + description = fields.Char(states=READONLY_STATES, tracking=True) + odometer_id = fields.Many2one( + "fleet.vehicle.odometer", + "Odometer", + help="Odometer measure of the vehicle at the moment of this log", + states=READONLY_STATES, + ) + odometer = fields.Float( + compute="_compute_odometer", + store=True, + inverse="_inverse_odometer", + string="Odometer Value", + help="Odometer measure of the vehicle at the moment of this log", + states=READONLY_STATES, + tracking=True, + ) + odometer_unit = fields.Selection(related="vehicle_id.odometer_unit", string="Unit") + date = fields.Date( + help="Date when the cost has been executed", + default=fields.Date.context_today, + states=READONLY_STATES, + tracking=True, + ) + company_id = fields.Many2one( + "res.company", "Company", default=lambda self: self.env.company + ) + currency_id = fields.Many2one("res.currency", related="company_id.currency_id") + purchaser_id = fields.Many2one( + "res.partner", + string="Driver", + compute="_compute_purchaser_id", + store=True, + states=READONLY_STATES, + tracking=True, + ) + inv_ref = fields.Char("Vendor Reference", states=READONLY_STATES) + vendor_id = fields.Many2one( + "res.partner", "Vendor", states=READONLY_STATES, tracking=True + ) + notes = fields.Text() + service_type_id = fields.Many2one( + "fleet.service.type", + "Service Type", + required=True, + default=lambda self: self.env.ref( + "fleet.type_service_refueling", raise_if_not_found=False + ), + states=READONLY_STATES, + tracking=True, + ) + state = fields.Selection( + [ + ("todo", "To Do"), + ("running", "Running"), + ("done", "Done"), + ("cancelled", "Cancelled"), + ], + default="todo", + string="Stage", + tracking=True, + ) + liter = fields.Float(states=READONLY_STATES, tracking=True) + price_per_liter = fields.Float(states=READONLY_STATES, tracking=True) + service_id = fields.Many2one( + comodel_name="fleet.vehicle.log.services", readonly=True, copy=False + ) + + @api.onchange("liter", "price_per_liter", "amount") + def _onchange_liter_price_amount(self): + liter = float(self.liter or 0.0) + price_per_liter = float(self.price_per_liter or 0.0) + amount = float(self.amount or 0.0) + if ( + liter > 0 + and price_per_liter > 0 + and round(liter * price_per_liter, 2) != amount + ): + self.amount = round(liter * price_per_liter, 2) + elif amount > 0 and liter > 0 and round(amount / liter, 2) != price_per_liter: + self.price_per_liter = round(amount / liter, 2) + elif ( + amount > 0 + and price_per_liter > 0 + and round(amount / price_per_liter, 2) != liter + ): + self.liter = round(amount / price_per_liter, 2) + + @api.depends("odometer_id", "odometer_id.value") + def _compute_odometer(self): + for record in self.filtered("odometer_id"): + record.odometer = record.odometer_id.value + + def _inverse_odometer(self): + if any(not x.odometer for x in self): + raise UserError( + _("Emptying the odometer value of a vehicle is not allowed.") + ) + for record in self: + odometer_obj = self.env["fleet.vehicle.odometer"] + odometer = odometer_obj.create( + record._prepare_fleet_vehicle_odometer_vals() + ) + record.odometer_id = odometer + + @api.depends("vehicle_id.driver_id") + def _compute_purchaser_id(self): + for service in self: + service.purchaser_id = service.vehicle_id.driver_id + + def button_running(self): + self.filtered(lambda x: x.state == "todo").write({"state": "running"}) + return True + + def _prepare_fleet_vehicle_odometer_vals(self): + return { + "value": self.odometer, + "date": self.date or fields.Date.context_today(self), + "vehicle_id": self.vehicle_id.id, + } + + def _prepare_fleet_vehicle_log_services_vals(self): + return { + "service_type_id": self.service_type_id.id, + "description": self.description, + "vehicle_id": self.vehicle_id.id, + "amount": self.amount, + "odometer": self.odometer, + "vendor_id": self.vendor_id.id if self.vendor_id else False, + "state": "done", + } + + def button_todo(self): + records = self.filtered(lambda x: x.state == "cancelled") + records.write({"state": "todo"}) + return True + + def button_done(self): + for item in self.filtered(lambda x: x.state == "running"): + service = self.env["fleet.vehicle.log.services"].create( + item._prepare_fleet_vehicle_log_services_vals() + ) + item.write({ + "service_id": service.id, + "state": "done", + }) + return True + + def button_cancel(self): + records = self.filtered(lambda x: x.state in ["todo", "running", "done"]) + records.mapped("service_id").sudo().unlink() + records.write({"state": "cancelled"}) + return True diff --git a/fleet_vehicle_log_fuel/readme/CONTRIBUTORS.rst b/fleet_vehicle_log_fuel/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..4d7f0b2a --- /dev/null +++ b/fleet_vehicle_log_fuel/readme/CONTRIBUTORS.rst @@ -0,0 +1,7 @@ +* Miquel Raïch +* `Tecnativa `_: + + * Víctor Martínez + * Pedro M. Baeza + * Carolina Fernandez + * Shubham Kumar Pal diff --git a/fleet_vehicle_log_fuel/readme/DESCRIPTION.rst b/fleet_vehicle_log_fuel/readme/DESCRIPTION.rst new file mode 100644 index 00000000..bb9e599e --- /dev/null +++ b/fleet_vehicle_log_fuel/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module adds fuel logs in a similar way as services. diff --git a/fleet_vehicle_log_fuel/report/__init__.py b/fleet_vehicle_log_fuel/report/__init__.py new file mode 100644 index 00000000..a5b36f4d --- /dev/null +++ b/fleet_vehicle_log_fuel/report/__init__.py @@ -0,0 +1 @@ +from . import fleet_report diff --git a/fleet_vehicle_log_fuel/report/fleet_report.py b/fleet_vehicle_log_fuel/report/fleet_report.py new file mode 100644 index 00000000..d6d2ca0a --- /dev/null +++ b/fleet_vehicle_log_fuel/report/fleet_report.py @@ -0,0 +1,82 @@ +# Copyright 2022 ForgeFlow S.L. +# Copyright 2024 Tecnativa - Pedro M. Baeza +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from psycopg2 import sql + +from odoo import fields, models, tools + + +class FleetReport(models.Model): + _inherit = "fleet.vehicle.cost.report" + + cost_type = fields.Selection(selection_add=[("fuel", "Fuel")]) + + def init(self): + """Inject parts in the query with this hack, fetching the query and + recreating it. Query is returned all in upper case and with final ';'. + """ + super().init() + self.env.cr.execute(f"SELECT pg_get_viewdef('{self._table}', true)") + view_def = self.env.cr.fetchone()[0] + if view_def[-1] == ";": # Remove trailing semicolon + view_def = view_def[:-1] + # Subquery + view_def = view_def.replace( + "contract_costs AS (", + """ + fuel_costs AS ( + SELECT + ve.id AS vehicle_id, + ve.company_id AS company_id, + ve.name AS name, + ve.driver_id AS driver_id, + ve.fuel_type AS fuel_type, + date(date_trunc('month', d)) AS date_start, + vem.vehicle_type as vehicle_type, + COALESCE(sum(fvlf.amount), 0) AS cost, + 'fuel' AS cost_type + FROM + fleet_vehicle ve + JOIN + fleet_vehicle_model vem ON vem.id = ve.model_id + CROSS JOIN generate_series( + ( + SELECT min(date) + FROM fleet_vehicle_log_fuel), + CURRENT_DATE + '1 month'::interval, '1 month') d + LEFT JOIN fleet_vehicle_log_fuel fvlf ON fvlf.vehicle_id = ve.id + AND date_trunc('month', fvlf.date) = date_trunc('month', d) + WHERE + ve.active AND fvlf.active AND fvlf.state <> 'cancelled' + GROUP BY ve.id, ve.company_id, ve.name, vem.vehicle_type, date_start, d + ORDER BY ve.id, date_start + ), + contract_costs AS (""", + ) + # Union + view_def = view_def.replace( + "UNION ALL", + """ + UNION ALL + SELECT + fc.company_id, + fc.vehicle_id, + fc.name, + fc.driver_id, + fc.fuel_type, + fc.date_start, + fc.vehicle_type, + fc.cost, + 'fuel' as cost_type + FROM + fuel_costs fc + UNION ALL""", + ) + # Re-create view + tools.drop_view_if_exists(self.env.cr, self._table) + self.env.cr.execute( + sql.SQL("""CREATE or REPLACE VIEW {} as ({})""").format( + sql.Identifier(self._table), sql.SQL(view_def) + ) + ) + return True diff --git a/fleet_vehicle_log_fuel/security/fleet_security.xml b/fleet_vehicle_log_fuel/security/fleet_security.xml new file mode 100644 index 00000000..90191fe4 --- /dev/null +++ b/fleet_vehicle_log_fuel/security/fleet_security.xml @@ -0,0 +1,25 @@ + + + + User can only see his/her vehicle's fuel log + + + + + + + [('vehicle_id.driver_id','=',user.partner_id.id)] + + + Administrator has all rights on vehicle's fuel log + + + [(1, '=', 1)] + + + + + + diff --git a/fleet_vehicle_log_fuel/security/ir.model.access.csv b/fleet_vehicle_log_fuel/security/ir.model.access.csv new file mode 100644 index 00000000..3c987f88 --- /dev/null +++ b/fleet_vehicle_log_fuel/security/ir.model.access.csv @@ -0,0 +1,3 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +fleet_vehicle_log_fuel_access_right_user,fleet_vehicle_log_fuel_access_right,model_fleet_vehicle_log_fuel,fleet.fleet_group_user,1,1,1,1 +fleet_vehicle_log_fuel_access_right,fleet_vehicle_log_fuel_access_right,model_fleet_vehicle_log_fuel,fleet.fleet_group_manager,1,1,1,1 diff --git a/fleet_vehicle_log_fuel/static/description/icon.png b/fleet_vehicle_log_fuel/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/fleet_vehicle_log_fuel/static/description/index.html b/fleet_vehicle_log_fuel/static/description/index.html new file mode 100644 index 00000000..5019e485 --- /dev/null +++ b/fleet_vehicle_log_fuel/static/description/index.html @@ -0,0 +1,430 @@ + + + + + + +Fleet Vehicle Log Fuel + + + +
+

Fleet Vehicle Log Fuel

+ + +

Beta License: AGPL-3 OCA/fleet Translate me on Weblate Try me on Runboat

+

This module adds fuel logs in a similar way as services.

+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • ForgeFlow
    • +
  • Tecnativa
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/fleet project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/fleet_vehicle_log_fuel/tests/__init__.py b/fleet_vehicle_log_fuel/tests/__init__.py new file mode 100644 index 00000000..bab7a1ec --- /dev/null +++ b/fleet_vehicle_log_fuel/tests/__init__.py @@ -0,0 +1 @@ +from . import test_fleet_vehicle_log_fuel diff --git a/fleet_vehicle_log_fuel/tests/common.py b/fleet_vehicle_log_fuel/tests/common.py new file mode 100644 index 00000000..4ac4f8a0 --- /dev/null +++ b/fleet_vehicle_log_fuel/tests/common.py @@ -0,0 +1,24 @@ +# Copyright 2024 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl +from odoo.addons.base.tests.common import BaseCommon + + +class TestFleetVehicleLogFuelBase(BaseCommon): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.driver = cls.env["res.partner"].create({"name": "Test Driver"}) + cls.brand = cls.env["fleet.vehicle.model.brand"].create({"name": "Test brand"}) + cls.model = cls.env["fleet.vehicle.model"].create( + { + "name": "Test model", + "brand_id": cls.brand.id, + } + ) + cls.vehicle = cls.env["fleet.vehicle"].create( + { + "model_id": cls.model.id, + "driver_id": cls.driver.id, + "license_plate": "TEST123", + } + ) diff --git a/fleet_vehicle_log_fuel/tests/test_fleet_vehicle_log_fuel.py b/fleet_vehicle_log_fuel/tests/test_fleet_vehicle_log_fuel.py new file mode 100644 index 00000000..9b2e9694 --- /dev/null +++ b/fleet_vehicle_log_fuel/tests/test_fleet_vehicle_log_fuel.py @@ -0,0 +1,94 @@ +# Copyright 2024 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl +from odoo.exceptions import UserError +from odoo.tests import Form + +from .common import TestFleetVehicleLogFuelBase + + +class TestFleetVehicleLogFuelMisc(TestFleetVehicleLogFuelBase): + def test_fleet_vehicle_log_fuel_process(self): + fuel_form = Form( + self.env["fleet.vehicle.log.fuel"].with_context( + default_vehicle_id=self.vehicle.id + ) + ) + with self.assertRaises(UserError): + fuel_form.odometer = 0 + fuel_form.save() + fuel_form.odometer = 5000 + fuel = fuel_form.save() + self.assertTrue(fuel.odometer_id) + self.assertEqual(self.vehicle.odometer, 5000) + self.assertEqual(self.vehicle.fuel_count, 1) + res = self.vehicle.action_view_log_fuel() + items = self.env[res["res_model"]].search(res["domain"]) + self.assertIn(fuel, items) + fuel.button_running() + self.assertEqual(fuel.state, "running") + fuel.button_done() + self.assertEqual(fuel.state, "done") + self.assertTrue(fuel.service_id) + self.assertEqual(fuel.service_id.service_type_id, fuel.service_type_id) + self.assertEqual(fuel.service_id.state, "done") + fuel.button_cancel() + self.assertEqual(fuel.state, "cancelled") + self.assertFalse(fuel.service_id) + fuel.button_todo() + self.assertEqual(fuel.state, "todo") + + def test_fleet_vehicle_log_fuel_onchange(self): + # Check amount + fuel_form_1 = Form( + self.env["fleet.vehicle.log.fuel"].with_context( + default_vehicle_id=self.vehicle.id + ) + ) + fuel_form_1.liter = 50 + fuel_form_1.price_per_liter = 1.5 + self.assertEqual(fuel_form_1.amount, 75) + # Check price_per_liter + fuel_form_2 = Form( + self.env["fleet.vehicle.log.fuel"].with_context( + default_vehicle_id=self.vehicle.id + ) + ) + fuel_form_2.amount = 75 + fuel_form_2.liter = 50 + self.assertEqual(fuel_form_2.price_per_liter, 1.5) + # Check liter + fuel_form_2 = Form( + self.env["fleet.vehicle.log.fuel"].with_context( + default_vehicle_id=self.vehicle.id + ) + ) + fuel_form_2.amount = 75 + fuel_form_2.price_per_liter = 1.5 + self.assertEqual(fuel_form_2.liter, 50) + + +class TestFleetVehicleLogFuelReport(TestFleetVehicleLogFuelBase): + @classmethod + def setUpClass(cls): + super().setUpClass() + # Create log fuel + log service to check report after + fuel = cls.env["fleet.vehicle.log.fuel"].create( + { + "vehicle_id": cls.vehicle.id, + "date": "2024-01-01", + "amount": 75, + "price_per_liter": 1.5, + "liter": 50, + } + ) + fuel.button_running() + fuel.button_done() + + def test_fleet_vehicle_cost_report(self): + items = self.env["fleet.vehicle.cost.report"].search( + [("vehicle_id", "=", self.vehicle.id), ("date_start", "=", "2024-01-01")] + ) + self.assertIn("fuel", items.mapped("cost_type")) + self.assertEqual( + sum(items.filtered(lambda x: x.cost_type == "fuel").mapped("cost")), 75 + ) diff --git a/fleet_vehicle_log_fuel/views/fleet_board_view.xml b/fleet_vehicle_log_fuel/views/fleet_board_view.xml new file mode 100644 index 00000000..db581614 --- /dev/null +++ b/fleet_vehicle_log_fuel/views/fleet_board_view.xml @@ -0,0 +1,17 @@ + + + + fleet.vehicle.cost.view.search + fleet.vehicle.cost.report + + + + + + + + diff --git a/fleet_vehicle_log_fuel/views/fleet_vehicle_log_fuel_views.xml b/fleet_vehicle_log_fuel/views/fleet_vehicle_log_fuel_views.xml new file mode 100644 index 00000000..66f3df62 --- /dev/null +++ b/fleet_vehicle_log_fuel/views/fleet_vehicle_log_fuel_views.xml @@ -0,0 +1,207 @@ + + + + fleet.vehicle.log.fuel.form + fleet.vehicle.log.fuel + +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + +
+ + fleet.vehicle.log.fuel.tree + fleet.vehicle.log.fuel + + + + + + + + + + + + + + + + + + + + + + fleet.vehicle.log.fuel.kanban + fleet.vehicle.log.fuel + + + + + +
+
+ + + + +
+
+ +
+
+ + Liter + +
+
+ + + + + + + fleet.vehicle.log.fuel.graph + fleet.vehicle.log.fuel + + + + + + + + + + fleet.vehicle.log.fuel.search + fleet.vehicle.log.fuel + + + + + + + + + + + + Fuel Logs + fleet.vehicle.log.fuel + tree,kanban,form,graph + +

+ Create a new fuel log entry +

+ Here you can add refuelling entries for all vehicles. +

+ + + + diff --git a/fleet_vehicle_log_fuel/views/fleet_vehicle_views.xml b/fleet_vehicle_log_fuel/views/fleet_vehicle_views.xml new file mode 100644 index 00000000..b6d78702 --- /dev/null +++ b/fleet_vehicle_log_fuel/views/fleet_vehicle_views.xml @@ -0,0 +1,21 @@ + + + + fleet.vehicle.form + fleet.vehicle + + +
+ +
+ + + From a4d85dfdd0e066e708254a40a0c22fad8512904d Mon Sep 17 00:00:00 2001 From: shubham Date: Wed, 7 May 2025 15:52:36 +0530 Subject: [PATCH 2/9] converted fleet_vehicle_log_fuel 16v to 17v --- fleet_vehicle_log_fuel/views/fleet_vehicle_log_fuel_views.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/fleet_vehicle_log_fuel/views/fleet_vehicle_log_fuel_views.xml b/fleet_vehicle_log_fuel/views/fleet_vehicle_log_fuel_views.xml index 66f3df62..748bb921 100644 --- a/fleet_vehicle_log_fuel/views/fleet_vehicle_log_fuel_views.xml +++ b/fleet_vehicle_log_fuel/views/fleet_vehicle_log_fuel_views.xml @@ -113,7 +113,6 @@ - fleet.vehicle.log.fuel.kanban fleet.vehicle.log.fuel From b54a30af2af768e2be88c45ceed2a3d966a69979 Mon Sep 17 00:00:00 2001 From: shubham Date: Wed, 7 May 2025 16:01:37 +0530 Subject: [PATCH 3/9] Add pyproject.toml for whool-init in fleet_vehicle_log_fuel --- fleet_vehicle_log_fuel/pyproject.toml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 fleet_vehicle_log_fuel/pyproject.toml diff --git a/fleet_vehicle_log_fuel/pyproject.toml b/fleet_vehicle_log_fuel/pyproject.toml new file mode 100644 index 00000000..1c45ffcf --- /dev/null +++ b/fleet_vehicle_log_fuel/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" \ No newline at end of file From d76d7b81d4f30daa8445410ffff9f8b6af2fc441 Mon Sep 17 00:00:00 2001 From: shubham Date: Wed, 7 May 2025 16:44:01 +0530 Subject: [PATCH 4/9] form view code update --- .../views/fleet_vehicle_log_fuel_views.xml | 46 +++++++++++++++---- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/fleet_vehicle_log_fuel/views/fleet_vehicle_log_fuel_views.xml b/fleet_vehicle_log_fuel/views/fleet_vehicle_log_fuel_views.xml index 748bb921..5aa6c12b 100644 --- a/fleet_vehicle_log_fuel/views/fleet_vehicle_log_fuel_views.xml +++ b/fleet_vehicle_log_fuel/views/fleet_vehicle_log_fuel_views.xml @@ -45,17 +45,45 @@ /> - - - - - + ++ ++ ++ ++ - - - - + ++ ++ ++