Skip to content

Commit b213904

Browse files
committed
[MIG] okr_module: Migration to 17.0
1 parent 828d113 commit b213904

5 files changed

Lines changed: 28 additions & 15 deletions

File tree

‎okr_module/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
from . import models
1+
from . import models

‎okr_module/__manifest__.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
'name': 'OKR Module',
3-
'version': '16.0.1.0.0',
3+
'version': "17.0.1.0.0",
44
'category': 'Base',
55
'sequence': 14,
66
'summary': '',
@@ -9,7 +9,7 @@
99
'license': 'AGPL-3',
1010
'images': [
1111
],
12-
'depends': [
12+
'depends': ['contacts'
1313
],
1414
'data': ['security/ir.model.access.csv',
1515
'views/okr_base.xml',
@@ -20,4 +20,4 @@
2020
'installable': True,
2121
'auto_install': False,
2222
'application': True,
23-
}
23+
}

‎okr_module/models/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
from . import okr_base
1+
from . import okr_base

‎okr_module/models/okr_base.py‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,22 @@ class OkrBase(models.Model):
44
_description = 'OKR BASE'
55
_name = "okr.base"
66

7-
name = fields.Char()
7+
name = fields.Char(required=True)
8+
description = fields.Char()
9+
user_id = fields.Many2one('res.users')
810
completed_percentage = fields.Float(compute='_compute_completed_percentage')
11+
type = fields.Selection(selection=[('commitment', 'commitment'),('inspirational', 'inspirational')], required=True)
912
kr_line_ids = fields.One2many('okr.base.line', 'okr_base_id')
1013

1114
def _compute_completed_percentage(self):
1215
for kr in self:
1316
if kr.kr_line_ids:
14-
cum = 0
15-
cant = 0
17+
w_cum = 0
18+
sum_weigh = 0
1619
for krl in kr.kr_line_ids:
17-
cum += krl.completed_percentage
18-
cant += 1
19-
kr.completed_percentage = cum/cant
20+
w_cum += krl.completed_percentage*krl.weight
21+
sum_weigh += krl.weight
22+
kr.completed_percentage = w_cum/sum_weigh
2023
else:
2124
kr.completed_percentage = 0
2225

@@ -27,8 +30,11 @@ class OkrBaseLine(models.Model):
2730
_name = "okr.base.line"
2831

2932
name = fields.Char()
33+
description = fields.Char()
34+
user_id = fields.Many2one('res.users')
3035
okr_base_id = fields.Many2one(comodel_name='okr.base', required=True)
3136
actual_value = fields.Float()
37+
weight = fields.Float()
3238
target = fields.Float()
3339
completed_percentage = fields.Float(compute='_compute_completed_percentage_line')
3440

@@ -39,4 +45,3 @@ def _compute_completed_percentage_line(self):
3945
kr.completed_percentage = (kr.actual_value/kr.target)
4046
else:
4147
kr.completed_percentage = 1
42-

‎okr_module/views/okr_base.xml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,22 @@
1616
<field name="model">okr.base</field>
1717
<field name="arch" type="xml">
1818
<form create="1">
19-
<field name="name"/>
20-
<field name="completed_percentage"/>
19+
<group>
20+
<group>
21+
<field name="name"/>
22+
<field name="type"/>
23+
<field name="user_id"/>
24+
<field name="completed_percentage"/>
25+
</group>
26+
</group>
2127
<field name="kr_line_ids">
2228
<tree create="1">
2329
<field name="name"/>
2430
<field name="actual_value"/>
2531
<field name="target"/>
2632
<field name="completed_percentage"/>
33+
<field name="weight"/>
34+
<field name="user_id"/>
2735
</tree>
2836
</field>
2937
</form>
@@ -40,4 +48,4 @@
4048
</field>
4149
</record>
4250

43-
</odoo>
51+
</odoo>

0 commit comments

Comments
 (0)