diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f952f80a..0f9f55f8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -43,7 +43,7 @@ repos: hooks: - id: whool-init - repo: https://github.com/oca/maintainer-tools - rev: d5fab7ee87fceee858a3d01048c78a548974d935 + rev: f9b919b9868143135a9c9cb03021089cabba8223 hooks: # update the NOT INSTALLABLE ADDONS section above - id: oca-update-pre-commit-excluded-addons @@ -60,7 +60,7 @@ repos: - --convert-fragments-to-markdown - id: oca-gen-external-dependencies - repo: https://github.com/OCA/odoo-pre-commit-hooks - rev: v0.0.25 + rev: v0.1.4 hooks: - id: oca-checks-odoo-module - id: oca-checks-po @@ -118,13 +118,13 @@ repos: - id: mixed-line-ending args: ["--fix=lf"] - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.1.3 + rev: v0.12.4 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] - id: ruff-format - repo: https://github.com/OCA/pylint-odoo - rev: v9.0.4 + rev: v9.3.12 hooks: - id: pylint_odoo name: pylint with optional checks diff --git a/fleet_vehicle_log_fuel/README.rst b/fleet_vehicle_log_fuel/README.rst new file mode 100644 index 00000000..a5857ac4 --- /dev/null +++ b/fleet_vehicle_log_fuel/README.rst @@ -0,0 +1,87 @@ +.. image:: https://odoo-community.org/readme-banner-image + :target: https://odoo-community.org/get-involved?utm_source=readme + :alt: Odoo Community Association + +====================== +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/license-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/17.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-17-0/fleet-17-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=17.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..4b4955f0 --- /dev/null +++ b/fleet_vehicle_log_fuel/models/fleet_vehicle_log_fuel.py @@ -0,0 +1,172 @@ +# 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" + + # REMOVE READONLY_STATES completely - handle readonly in views only + + active = fields.Boolean(default=True) + vehicle_id = fields.Many2one( + "fleet.vehicle", + "Vehicle", + required=True, + help="Vehicle concerned by this log", + tracking=True, + ) + amount = fields.Monetary("Cost", tracking=True) + description = fields.Char(tracking=True) + odometer_id = fields.Many2one( + "fleet.vehicle.odometer", + "Odometer", + help="Odometer measure of the vehicle at the moment of this log", + ) + 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", + 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, + 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, + tracking=True, + ) + inv_ref = fields.Char("Vendor Reference") + vendor_id = fields.Many2one("res.partner", "Vendor", 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 + ), + tracking=True, + ) + state = fields.Selection( + [ + ("todo", "To Do"), + ("running", "Running"), + ("done", "Done"), + ("cancelled", "Cancelled"), + ], + default="todo", + string="Stage", + tracking=True, + ) + liter = fields.Float(tracking=True) + price_per_liter = fields.Float(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/pyproject.toml b/fleet_vehicle_log_fuel/pyproject.toml new file mode 100644 index 00000000..4231d0cc --- /dev/null +++ b/fleet_vehicle_log_fuel/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/fleet_vehicle_log_fuel/readme/CONTRIBUTORS.md b/fleet_vehicle_log_fuel/readme/CONTRIBUTORS.md new file mode 100644 index 00000000..e0713425 --- /dev/null +++ b/fleet_vehicle_log_fuel/readme/CONTRIBUTORS.md @@ -0,0 +1,6 @@ +- Miquel Raïch \ +- [Tecnativa](https://www.tecnativa.com): + - Víctor Martínez + - Pedro M. Baeza + - Carolina Fernandez + - Shubham Kumar Pal diff --git a/fleet_vehicle_log_fuel/readme/DESCRIPTION.md b/fleet_vehicle_log_fuel/readme/DESCRIPTION.md new file mode 100644 index 00000000..bb9e599e --- /dev/null +++ b/fleet_vehicle_log_fuel/readme/DESCRIPTION.md @@ -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 00000000..3a0328b5 Binary files /dev/null and b/fleet_vehicle_log_fuel/static/description/icon.png differ 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..2234dee6 --- /dev/null +++ b/fleet_vehicle_log_fuel/static/description/index.html @@ -0,0 +1,437 @@ + + + + + +Fleet Vehicle Log Fuel + + + +
+ + + +Odoo Community Association + +
+

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..3eef9e93 --- /dev/null +++ b/fleet_vehicle_log_fuel/views/fleet_vehicle_log_fuel_views.xml @@ -0,0 +1,233 @@ + + + + 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..36b18edb --- /dev/null +++ b/fleet_vehicle_log_fuel/views/fleet_vehicle_views.xml @@ -0,0 +1,21 @@ + + + + fleet.vehicle.form + fleet.vehicle + + +
+ +
+ + +