Skip to content

Commit 50f0a38

Browse files
dhrs-odoodhrs-odoo
committed
testing 2
1 parent cfdad23 commit 50f0a38

5 files changed

+45
-225
lines changed

‎cleaning_services/__manifest__.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
'crm_sale_subscription',
1010
'hr_skills',
1111
'industry_fsm_sale_report',
12+
'knowledge',
1213
'project_purchase',
1314
'project_sale_subscription',
14-
'knowledge',
1515
'web_studio',
1616
],
1717
'data': [
@@ -49,9 +49,7 @@
4949
'demo/product_supplierinfo.xml',
5050
'demo/sale_order.xml',
5151
'demo/sale_order_line.xml',
52-
# 'demo/sale_order_confirm.xml',
53-
# 'demo/sale_order_state.xml',
54-
'demo/project_task.xml',
52+
'demo/sale_order_confirm.xml',
5553
'demo/account_analytic_line.xml',
5654
'demo/purchase_order.xml',
5755
'demo/purchase_order_line.xml',

‎cleaning_services/demo/account_analytic_line.xml

+18-9
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,63 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<odoo noupdate="1">
33
<record id="account_analytic_line_11" model="account.analytic.line">
4+
<field name="name">Regular cleaning Visit</field>
45
<field name="product_id" ref="product_product_68"/>
56
<field name="unit_amount">3.0</field>
6-
<field name="task_id" search="[('sale_line_id', '=', ref('sale_order_line_9'))]"/>
7+
<field name="task_id" model="project.task" eval="obj().search([('sale_line_id', '=', ref('sale_order_line_9'))]).id"/>
78
<field name="employee_id" ref="hr.employee_admin"/>
89
</record>
910
<record id="account_analytic_line_10" model="account.analytic.line">
11+
<field name="name">Regular cleaning Visit</field>
1012
<field name="product_id" ref="product_product_68"/>
1113
<field name="unit_amount">3.0</field>
12-
<field name="task_id" search="[('sale_line_id', '=', ref('sale_order_line_9'))]"/>
14+
<field name="task_id" model="project.task" eval="obj().search([('sale_line_id', '=', ref('sale_order_line_9'))]).id"/>
1315
<field name="employee_id" ref="hr.employee_admin"/>
1416
</record>
1517
<record id="account_analytic_line_7" model="account.analytic.line">
18+
<field name="name">Regular cleaning Visit</field>
1619
<field name="product_id" ref="product_product_68"/>
1720
<field name="unit_amount">1.0</field>
18-
<field name="task_id" search="[('sale_line_id', '=', ref('sale_order_line_9'))]"/>
21+
<field name="task_id" model="project.task" eval="obj().search([('sale_line_id', '=', ref('sale_order_line_9'))]).id"/>
1922
<field name="employee_id" ref="hr.employee_admin"/>
2023
</record>
2124
<record id="account_analytic_line_6" model="account.analytic.line">
25+
<field name="name">Regular cleaning Visit</field>
2226
<field name="product_id" ref="product_product_68"/>
2327
<field name="unit_amount">1.0</field>
24-
<field name="task_id" search="[('sale_line_id', '=', ref('sale_order_line_9'))]"/>
28+
<field name="task_id" model="project.task" eval="obj().search([('sale_line_id', '=', ref('sale_order_line_9'))]).id"/>
2529
<field name="employee_id" ref="hr.employee_admin"/>
2630
</record>
2731
<record id="account_analytic_line_5" model="account.analytic.line">
32+
<field name="name">Regular cleaning Visit</field>
2833
<field name="product_id" ref="product_product_68"/>
2934
<field name="unit_amount">3.0</field>
30-
<field name="task_id" search="[('sale_line_id', '=', ref('sale_order_line_9'))]"/>
35+
<field name="task_id" model="project.task" eval="obj().search([('sale_line_id', '=', ref('sale_order_line_9'))]).id"/>
3136
<field name="employee_id" ref="hr.employee_admin"/>
3237
</record>
3338
<record id="account_analytic_line_9" model="account.analytic.line">
39+
<field name="name">Regular cleaning Visit</field>
3440
<field name="product_id" ref="product_product_68"/>
3541
<field name="unit_amount">1.0</field>
36-
<field name="task_id" search="[('sale_line_id', '=', ref('sale_order_line_9'))]"/>
42+
<field name="task_id" model="project.task" eval="obj().search([('sale_line_id', '=', ref('sale_order_line_9'))]).id"/>
3743
<field name="employee_id" ref="hr.employee_admin"/>
3844
</record>
3945
<record id="account_analytic_line_8" model="account.analytic.line">
46+
<field name="name">Regular cleaning Visit</field>
4047
<field name="product_id" ref="product_product_68"/>
4148
<field name="unit_amount">1.0</field>
42-
<field name="task_id" search="[('sale_line_id', '=', ref('sale_order_line_9'))]"/>
49+
<field name="task_id" model="project.task" eval="obj().search([('sale_line_id', '=', ref('sale_order_line_9'))]).id"/>
4350
<field name="employee_id" ref="hr.employee_admin"/>
4451
</record>
4552
<record id="account_analytic_line_4" model="account.analytic.line">
53+
<field name="name">Office deep clean</field>
4654
<field name="employee_id" ref="hr.employee_admin"/>
47-
<field name="task_id" search="[('sale_line_id', '=', ref('sale_order_line_11'))]"/>
55+
<field name="task_id" model="project.task" eval="obj().search([('sale_line_id', '=', ref('sale_order_line_11'))]).id"/>
4856
<field name="product_id" ref="product_product_17"/>
4957
</record>
5058
<record id="account_analytic_line_3" model="account.analytic.line">
51-
<field name="task_id" search="[('sale_line_id', '=', ref('sale_order_line_3'))]"/>
59+
<field name="name">Carpet Cleaning</field>
60+
<field name="task_id" model="project.task" eval="obj().search([('sale_line_id', '=', ref('sale_order_line_3'))]).id"/>
5261
<field name="employee_id" ref="hr_employee_3"/>
5362
<field name="product_id" ref="product_product_54"/>
5463
</record>

‎cleaning_services/demo/project_task.xml

-144
This file was deleted.

‎cleaning_services/demo/sale_order_confirm.xml

+25-53
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,33 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<odoo noupdate="1">
3-
<function name="action_confirm" model="sale.order" eval="[[ref('sale_order_1'), ref('sale_order_2'), ref('sale_order_3'), ref('sale_order_4')]]"/>
3+
<function model="sale.order" name="action_confirm" eval="[[ref('sale_order_1'),ref('sale_order_2'),ref('sale_order_3'),ref('sale_order_4')]]"/>
44

5-
<!-- <function model="ir.model.data" name="_update_xmlids">
6-
<value model="base" eval="[{
7-
'xml_id': 'cleaning_services.project_task_6',
8-
'record': obj().env.ref('cleaning_services.sale_order_line_9').task_id.id,
9-
'noupdate': True,
10-
}]" />
5+
<function model="project.task" name="write">
6+
<value model="project.task" eval="(
7+
obj().env.ref('cleaning_services.sale_order_line_2') +
8+
obj().env.ref('cleaning_services.sale_order_line_3') +
9+
obj().env.ref('cleaning_services.sale_order_line_4')
10+
).task_id.ids"/>
11+
<value eval="{'stage_id': ref('industry_fsm.planning_project_stage_1')}"/>
1112
</function>
12-
<function model="ir.model.data" name="_update_xmlids">
13-
<value model="base" eval="[{
14-
'xml_id': 'cleaning_services.project_task_10',
15-
'record': obj().env.ref('cleaning_services.sale_order_line_19').task_id.id,
16-
'noupdate': True,
17-
}]" />
13+
<function model="project.task" name="write">
14+
<value model="project.task" eval="(
15+
obj().env.ref('cleaning_services.sale_order_line_9')
16+
).task_id.ids"/>
17+
<value eval="{'stage_id': ref('industry_fsm.planning_project_stage_0')}"/>
1818
</function>
19-
<function model="ir.model.data" name="_update_xmlids">
20-
<value model="base" eval="[{
21-
'xml_id': 'cleaning_services.project_task_9',
22-
'record': obj().env.ref('cleaning_services.sale_order_line_20').task_id.id,
23-
'noupdate': True,
24-
}]" />
19+
<function model="project.task" name="write">
20+
<value model="project.task" eval="(
21+
obj().env.ref('cleaning_services.sale_order_line_11') +
22+
obj().env.ref('cleaning_services.sale_order_line_12')
23+
).task_id.ids"/>
24+
<value eval="{'stage_id': ref('industry_fsm.planning_project_stage_2')}"/>
2525
</function>
26-
<function model="ir.model.data" name="_update_xmlids">
27-
<value model="base" eval="[{
28-
'xml_id': 'cleaning_services.project_task_4',
29-
'record': obj().env.ref('cleaning_services.sale_order_line_3').task_id.id,
30-
'noupdate': True,
31-
}]" />
26+
<function model="project.task" name="write">
27+
<value model="project.task" eval="(
28+
obj().env.ref('cleaning_services.sale_order_line_19') +
29+
obj().env.ref('cleaning_services.sale_order_line_20')
30+
).task_id.ids"/>
31+
<value eval="{'stage_id': ref('industry_fsm.planning_project_stage_0')}"/>
3232
</function>
33-
<function model="ir.model.data" name="_update_xmlids">
34-
<value model="base" eval="[{
35-
'xml_id': 'cleaning_services.project_task_5',
36-
'record': obj().env.ref('cleaning_services.sale_order_line_4').task_id.id,
37-
'noupdate': True,
38-
}]" />
39-
</function>
40-
<function model="ir.model.data" name="_update_xmlids">
41-
<value model="base" eval="[{
42-
'xml_id': 'cleaning_services.project_task_3',
43-
'record': obj().env.ref('cleaning_services.sale_order_line_2').task_id.id,
44-
'noupdate': True,
45-
}]" />
46-
</function>
47-
<function model="ir.model.data" name="_update_xmlids">
48-
<value model="base" eval="[{
49-
'xml_id': 'cleaning_services.project_task_7',
50-
'record': obj().env.ref('cleaning_services.sale_order_line_11').task_id.id,
51-
'noupdate': True,
52-
}]" />
53-
</function>
54-
<function model="ir.model.data" name="_update_xmlids">
55-
<value model="base" eval="[{
56-
'xml_id': 'cleaning_services.project_task_8',
57-
'record': obj().env.ref('cleaning_services.sale_order_line_12').task_id.id,
58-
'noupdate': True,
59-
}]" />
60-
</function> -->
6133
</odoo>

‎cleaning_services/demo/sale_order_state.xml

-15
This file was deleted.

0 commit comments

Comments
 (0)