Skip to content

Commit 5dbb4ca

Browse files
committed
[ADD] Report and wizard added in model
1 parent 12f9b1f commit 5dbb4ca

File tree

4 files changed

+22
-17
lines changed

4 files changed

+22
-17
lines changed

employee_demo/__init__.py

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

employee_demo/__manifest__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
'data': [
1616
'views/tree.xml',
1717
'data/data.xml',
18+
'wizard/employee_add_comp_views.xml',
19+
'report/employee_report.xml'
1820
],
1921

2022
'application': True

employee_demo/models/employee.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class Employee(models.Model):
77

88
name = fields.Char('Employee Name', required=True)
99
dept = fields.Char('Department')
10-
average = fields.Float(compute='_compute')
10+
average = fields.Float(compute='_compute_average')
1111
age = fields.Integer('Age')
1212
number = fields.Char('Phone Number')
1313
address = fields.Text('Address')
@@ -25,7 +25,7 @@ class Employee(models.Model):
2525
pr = fields.Float('Percentage')
2626
grade = fields.Char('Grade')
2727
total = fields.Integer('Total')
28-
company = fields.Many2one('employee.company', string="Company")
28+
company_id = fields.Many2one('employee.company', string="Company")
2929
skills = fields.Many2many('employee.skills', string='Skills')
3030

3131

@@ -34,28 +34,29 @@ def _calculate_total(self):
3434
self.total = self.math + self.phy + self.chem
3535
self.average = self.total / 3
3636

37-
@api.depends('math', 'phy', 'chem')
38-
def _compute(self):
39-
# self.total = self.math + self.phy + self.chem
40-
self.average = self.total / 3
37+
@api.depends('total')
38+
def _compute_average(self):
39+
for rec in self:
40+
# self.total = self.math + self.phy + self.chem
41+
rec.average = rec.total / 3
4142

4243
@api.constrains('age')
4344
def _age_constraint(self):
4445
if self.age < 18:
4546
raise ValidationError("Age should be more than 18")
4647

47-
48+
4849
class Company(models.Model):
4950
_name = 'employee.company'
5051
_rec_name = "company_name"
5152

5253
company_name = fields.Char("Name")
5354
city = fields.Char("City")
54-
emp_record = fields.One2many('employee', 'company', string="Employee Records")
55+
emp_record_id = fields.One2many('employee', 'company_id', string="Employee Records")
5556

5657

5758
class Skills(models.Model):
5859
_name = 'employee.skills'
5960
_rec_name="skills"
6061

61-
skills = fields.Char('Skills')
62+
skills = fields.Char('Skills')

employee_demo/views/tree.xml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
<field name="arch" type="xml">
77
<tree>
88
<field name="name"/>
9-
<field name="company"/>
9+
<field name="company_id"/>
1010
<field name="dept"/>
1111
<field name="gender"/>
1212
<field name="age"/>
1313
<field name="number"/>
14+
<field name="average"/>
1415
<field name="address"/>
1516
<field name="bday"/>
1617
<field name="email"/>
@@ -37,7 +38,7 @@
3738
</page>
3839
<page string="Technical Details">
3940
<group>
40-
<field name="company"/>
41+
<field name="company_id"/>
4142
<field name="dept"/>
4243
<field name="branch"/>
4344
<field name="skills" widget='many2many_tags'/>
@@ -70,7 +71,7 @@
7071
<calendar string="Calendar" date_start="date" date_stop="date" mode="year" color="name">
7172
<field name="name"/>
7273
<field name="dept"/>
73-
<field name="company"/>
74+
<field name="company_id"/>
7475
<field name="profile" widget="image" class="oe_avatar"/>
7576
<field name="gender"/>
7677
<field name="age"/>
@@ -91,7 +92,7 @@
9192
<graph string="Pivot" type="pie">
9293
<field name="name"/>
9394
<field name="dept"/>
94-
<field name="company"/>
95+
<field name="company_id"/>
9596
<field name="gender"/>
9697
<field name="age"/>
9798
<field name="number"/>
@@ -117,7 +118,7 @@
117118
<field name="arch" type="xml">
118119
<pivot string="Pivot">
119120
<field name="name"/>
120-
<field name="company"/>
121+
<field name="company_id"/>
121122
<field name="dept"/>
122123
<field name="gender"/>
123124
<field name="age"/>
@@ -146,7 +147,7 @@
146147
date_start="date" date_stop="date"
147148
default_group_by="dept">
148149
<field name="name"/>
149-
<field name="company"/>
150+
<field name="company_id"/>
150151
<field name="dept"/>
151152
<field name="date"/>
152153
<field name="gender"/>
@@ -224,7 +225,7 @@
224225
<tree>
225226
<field name="company_name"/>
226227
<field name="city"/>
227-
<field name="emp_record"/>
228+
<field name="emp_record_id"/>
228229
</tree>
229230
</field>
230231
</record>

0 commit comments

Comments
 (0)