Skip to content

Commit 0407366

Browse files
mihienhuguesdk
authored andcommitted
[MIG] container_meals: Migration to 16.0
1 parent 7f64885 commit 0407366

21 files changed

Lines changed: 248 additions & 186 deletions

container_meals/README.rst

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
.. image:: https://odoo-community.org/readme-banner-image
2+
:target: https://odoo-community.org/get-involved?utm_source=readme
3+
:alt: Odoo Community Association
4+
15
===============
26
Container Meals
37
===============
@@ -13,11 +17,11 @@ Container Meals
1317
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
1418
:target: https://odoo-community.org/page/development-status
1519
:alt: Beta
16-
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
20+
.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
1721
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
1822
:alt: License: AGPL-3
1923
.. |badge3| image:: https://img.shields.io/badge/github-coopiteasy%2Faddons-lightgray.png?logo=github
20-
:target: https://github.com/coopiteasy/addons/tree/14.0/container_meals
24+
:target: https://github.com/coopiteasy/addons/tree/16.0/container_meals
2125
:alt: coopiteasy/addons
2226

2327
|badge1| |badge2| |badge3|
@@ -70,6 +74,8 @@ Known issues / Roadmap
7074

7175
- Support differing units of measurement.
7276
- Better support for changing the deposit product.
77+
- Fix the fact that invoices might use the same deposit multiple times if
78+
created in series before all being paid.
7379

7480
Changelog
7581
=========
@@ -89,7 +95,7 @@ Bug Tracker
8995
Bugs are tracked on `GitHub Issues <https://github.com/coopiteasy/addons/issues>`_.
9096
In case of trouble, please check there if your issue has already been reported.
9197
If you spotted it first, help us to smash it by providing a detailed and welcomed
92-
`feedback <https://github.com/coopiteasy/addons/issues/new?body=module:%20container_meals%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
98+
`feedback <https://github.com/coopiteasy/addons/issues/new?body=module:%20container_meals%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
9399

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

@@ -111,6 +117,6 @@ Contributors
111117
Maintainers
112118
~~~~~~~~~~~
113119

114-
This module is part of the `coopiteasy/addons <https://github.com/coopiteasy/addons/tree/14.0/container_meals>`_ project on GitHub.
120+
This module is part of the `coopiteasy/addons <https://github.com/coopiteasy/addons/tree/16.0/container_meals>`_ project on GitHub.
115121

116122
You are welcome to contribute.

container_meals/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
from . import controllers
21
from . import models

container_meals/__manifest__.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,26 @@
33

44
{
55
"name": "Container Meals",
6-
"summary": """Deliver meals in containers.""",
7-
"version": "14.0.1.1.1",
6+
"summary": "Deliver meals in containers",
7+
"version": "16.0.1.0.0",
88
"category": "Uncategorized",
9-
"website": "https://coopiteasy.be",
9+
"website": "https://github.com/coopiteasy/addons",
1010
"author": "Coop IT Easy SC",
1111
"license": "AGPL-3",
12-
"application": False,
1312
"depends": [
1413
"partner_manual_rank", # is_customer
1514
"product",
15+
"sale_management", # deposit management
1616
"uom_extra_data", # mL
1717
"website_sale",
1818
],
19-
"excludes": [],
2019
"data": [
2120
"data/portion_attributes.xml",
2221
"views/product_views.xml",
2322
"views/res_config_settings_views.xml",
2423
"views/res_partner_views.xml",
24+
"views/sale_order_line_views.xml",
2525
"views/sale_order_views.xml",
2626
"views/sale_menu.xml",
2727
],
28-
"demo": [],
29-
"qweb": [],
3028
}

container_meals/controllers/__init__.py

Lines changed: 0 additions & 1 deletion
This file was deleted.

container_meals/controllers/main.py

Lines changed: 0 additions & 16 deletions
This file was deleted.

container_meals/models/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
from . import ir_config_parameter
2-
from . import product
2+
from . import product_product
3+
from . import product_template
34
from . import res_config_settings
45
from . import res_partner
56
from . import sale_order
7+
from . import sale_order_line

container_meals/models/ir_config_parameter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from odoo import api, models
55

66

7-
class ConfigParameter(models.Model):
7+
class IrConfigParameter(models.Model):
88
_inherit = "ir.config_parameter"
99

1010
@api.model
Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@ class Product(models.Model):
1515

1616
# Overrides
1717
container_1_volume = fields.Float(
18-
"Container 1 Volume",
1918
compute="_compute_container_volume",
2019
digits="Volume",
2120
store=True,
2221
)
2322
container_2_volume = fields.Float(
24-
"Container 2 Volume",
2523
compute="_compute_container_volume",
2624
digits="Volume",
2725
store=True,
@@ -58,33 +56,3 @@ def _compute_container_volume(self):
5856
product.container_2_volume = (
5957
product.product_tmpl_id.container_2_volume * modifier
6058
)
61-
62-
63-
class ProductTemplate(models.Model):
64-
_inherit = "product.template"
65-
66-
@api.model
67-
def _get_container_uom_domain(self):
68-
return [("category_id", "=", self.env.ref("uom.product_uom_categ_vol").id)]
69-
70-
# Container
71-
is_container = fields.Boolean(string="Is a Container", default=False)
72-
container_volume = fields.Float("Container Volume", digits="Volume")
73-
74-
# Meal
75-
is_meal = fields.Boolean(string="Is a Meal", default=False)
76-
container_1_volume = fields.Float("Container 1 Volume", digits="Volume")
77-
container_2_volume = fields.Float("Container 2 Volume", digits="Volume")
78-
79-
# Common
80-
container_uom_id = fields.Many2one(
81-
comodel_name="uom.uom",
82-
string="Container Unit of Measure",
83-
domain=lambda self: self._get_container_uom_domain(),
84-
default=lambda self: self.env.ref("uom_extra_data.product_uom_millilitre"),
85-
)
86-
container_uom_name = fields.Char(
87-
string="Container Unit of Measure Name",
88-
related="container_uom_id.name",
89-
readonly=True,
90-
)
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Copyright 2025 Coop IT Easy SC
2+
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
3+
4+
from odoo import api, fields, models
5+
6+
7+
class ProductTemplate(models.Model):
8+
_inherit = "product.template"
9+
10+
@api.model
11+
def _get_container_uom_domain(self):
12+
return [("category_id", "=", self.env.ref("uom.product_uom_categ_vol").id)]
13+
14+
# Container
15+
is_container = fields.Boolean(string="Is a Container", default=False)
16+
container_volume = fields.Float(digits="Volume")
17+
18+
# Meal
19+
is_meal = fields.Boolean(string="Is a Meal", default=False)
20+
container_1_volume = fields.Float(digits="Volume")
21+
container_2_volume = fields.Float(digits="Volume")
22+
23+
# Common
24+
container_uom_id = fields.Many2one(
25+
comodel_name="uom.uom",
26+
string="Container Unit of Measure",
27+
domain=lambda self: self._get_container_uom_domain(),
28+
default=lambda self: self.env.ref("uom_extra_data.product_uom_millilitre"),
29+
)
30+
container_uom_name = fields.Char(
31+
string="Container Unit of Measure Name",
32+
related="container_uom_id.name",
33+
readonly=True,
34+
)

container_meals/models/res_config_settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class ResConfigSettings(models.TransientModel):
99

1010
container_deposit_product_id = fields.Many2one(
1111
"product.product",
12-
"Container Deposit Product",
12+
string="Container Deposit Product",
1313
domain="[('type', '=', 'service')]",
1414
config_parameter="container_meals.container_deposit_product_id",
1515
help="Product used as deposit for containers",

0 commit comments

Comments
 (0)