Skip to content

Commit 242ac8e

Browse files
frva-odoofrva-odoo
committed
[FIX] accounting_firm: fix review 21/10
1 parent 0b416f2 commit 242ac8e

File tree

11 files changed

+94
-107
lines changed

11 files changed

+94
-107
lines changed

‎accounting_firm/__manifest__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
'data/ir_ui_view.xml',
2929
'data/ir_actions_act_window.xml',
3030
'data/ir_ui_menu.xml',
31+
'data/x_aml_risk_type.xml',
3132
'data/mail_activity_type.xml',
3233
'data/crm_stage.xml',
3334
'data/knowledge_article.xml',

‎accounting_firm/data/ir_actions_server.xml‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ action ={
2525
"views": [[False, "form"]],
2626
"target": "new",
2727
"context": {
28-
"default_folder_id": 2,
29-
"default_res_id": record.id or False,
28+
"default_folder_id": env.ref('documents.document_inbox_folder').id,
29+
"default_res_id": record.id,
3030
"default_res_model": env.context.get("default_res_model", False),
3131
"default_name": "Identity Document - " + record.name,
3232
"default_requestee_id": record.id,
@@ -44,15 +44,12 @@ action ={
4444
<field name="state">code</field>
4545
<field name="name">Update Owner ID</field>
4646
<field name="code"><![CDATA[
47-
for ubo in records.filtered('attachment_ids'):
47+
for ubo in records:
4848
ubo.holder_id['x_id_scan'] = ubo.attachment_ids[-1].datas
4949
ubo.holder_id['x_id_expiration_date'] = ubo.attachment_expiration_date
5050
ubo.holder_id.message_post(
5151
body="The Identity Document Scan changed for this one: ",
52-
attachment_ids=[env['ir.attachment'].create({
53-
'name': 'Identity Document - ' + ubo.holder_id.name + ' - History',
54-
'datas': ubo.holder_id.x_id_scan,
55-
}).id]
52+
attachment_ids=[ubo.attachment_ids[-1].id]
5653
)
5754
action = {
5855
'type': 'ir.actions.client',
@@ -97,11 +94,8 @@ for partner in records:
9794
for document in records:
9895
document.partner_id['x_id_scan'] = document.attachment_id.datas
9996
document.partner_id.message_post(
100-
body="The Identity Document Scan changed for this one: ",
101-
attachment_ids=[env['ir.attachment'].create({
102-
'name': 'Identity Document - ' + document.partner_id.name + ' - History',
103-
'datas': document.partner_id.x_id_scan,
104-
}).id]
97+
body="The Identity Document Scan changed for this one: ",
98+
attachment_ids=[document.attachment_id.id]
10599
)
106100
action = {
107101
'view_mode': 'form',

‎accounting_firm/data/ir_cron.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<field name="model_id" ref="base.model_res_partner"/>
88
<field name="state">code</field>
99
<field name="code"><![CDATA[
10-
for contact in model.search([('x_id_expiration_date', '!=', False)]):
11-
if contact.x_id_expiration_date < datetime.datetime.today().date() + dateutil.relativedelta.relativedelta(days=7) and not env['documents.document'].search_count([('partner_id', '=', contact.id), ('x_is_identity_document_request', '!=', False), ('attachment_id', '=', False)]):
10+
for contact in model.search([('x_id_expiration_date', '!=', False), ('x_id_expiration_date', '<=', datetime.datetime.today().date() + dateutil.relativedelta.relativedelta(days=7))]):
11+
if not env['documents.document'].search_count([('partner_id', '=', contact.id), ('x_is_identity_document_request', '!=', False), ('attachment_id', '=', False)], limit=1):
1212
doc = env['documents.request_wizard'].create({
13-
"folder_id": 2,
14-
"res_id": contact.id or False,
13+
"folder_id": env.ref('documents.document_inbox_folder').id,
14+
"res_id": contact.id,
1515
"res_model": env.context.get("default_res_model", False),
1616
"name": "Identity Document - " + contact.name,
1717
"requestee_id": contact.id,

‎accounting_firm/data/ir_model.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,8 @@
88
<field name="name">AML Risk</field>
99
<field name="model">x_aml_risk</field>
1010
</record>
11+
<record id="x_aml_risk_type_model" model="ir.model">
12+
<field name="name">Risk Type</field>
13+
<field name="model">x_aml_risk_type</field>
14+
</record>
1115
</odoo>

‎accounting_firm/data/ir_model_access.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,13 @@
1818
<field name="perm_unlink" eval="True"/>
1919
<field name="perm_write" eval="True"/>
2020
</record>
21+
<record id="aml_risk_type_user_access" model="ir.model.access">
22+
<field name="group_id" ref="base.group_user"/>
23+
<field name="model_id" ref="x_aml_risk_type_model"/>
24+
<field name="name">x_aml_risk_type_user_access</field>
25+
<field name="perm_create" eval="True"/>
26+
<field name="perm_read" eval="True"/>
27+
<field name="perm_unlink" eval="True"/>
28+
<field name="perm_write" eval="True"/>
29+
</record>
2130
</odoo>

‎accounting_firm/data/ir_model_fields.xml‎

Lines changed: 23 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,20 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<odoo>
3-
<!-- AML Risk fields -->
4-
<record id="x_name_field_x_aml_risk" model="ir.model.fields">
3+
<!-- AML Risk type fields -->
4+
<record id="x_name_field_x_aml_risk_type" model="ir.model.fields">
55
<field name="name">x_name</field>
66
<field name="field_description">Risk</field>
7-
<field name="model_id" ref="x_aml_risk_model"/>
8-
<field name="ttype">selection</field>
9-
</record>
10-
<record id="x_name_risk_field_selection_customer" model="ir.model.fields.selection">
11-
<field name="name">Customer</field>
12-
<field name="field_id" ref="x_name_field_x_aml_risk" />
13-
<field name="value">customer</field>
14-
</record>
15-
<record id="x_name_risk_field_selection_mission" model="ir.model.fields.selection">
16-
<field name="name">Mission</field>
17-
<field name="field_id" ref="x_name_field_x_aml_risk" />
18-
<field name="value">mission</field>
19-
</record>
20-
<record id="x_name_risk_field_selection_activity" model="ir.model.fields.selection">
21-
<field name="name">Activity</field>
22-
<field name="field_id" ref="x_name_field_x_aml_risk" />
23-
<field name="value">activity</field>
24-
</record>
25-
<record id="x_name_risk_field_selection_geography" model="ir.model.fields.selection">
26-
<field name="name">Geography</field>
27-
<field name="field_id" ref="x_name_field_x_aml_risk" />
28-
<field name="value">geography</field>
7+
<field name="model_id" ref="x_aml_risk_type_model"/>
8+
<field name="ttype">char</field>
299
</record>
30-
<record id="x_name_risk_field_selection_overall" model="ir.model.fields.selection">
31-
<field name="name">Overall</field>
32-
<field name="field_id" ref="x_name_field_x_aml_risk" />
33-
<field name="value">overall</field>
10+
11+
<!-- AML Risk fields -->
12+
<record id="x_risk_type_field_x_aml_risk" model="ir.model.fields">
13+
<field name="name">x_risk_type</field>
14+
<field name="field_description">Risk</field>
15+
<field name="model_id" ref="x_aml_risk_model"/>
16+
<field name="ttype">many2one</field>
17+
<field name="relation">x_aml_risk_type</field>
3418
</record>
3519
<record id="x_level_field_x_aml_risk" model="ir.model.fields">
3620
<field name="name">x_level</field>
@@ -70,7 +54,7 @@
7054
<!-- Res partner fields -->
7155
<record id="x_id_expiration_date_field_res_partner" model="ir.model.fields">
7256
<field name="name">x_id_expiration_date</field>
73-
<field name="field_description">Expiration Date</field>
57+
<field name="field_description">ID Expiration Date</field>
7458
<field name="model_id" ref="base.model_res_partner"/>
7559
<field name="ttype">date</field>
7660
</record>
@@ -197,17 +181,17 @@
197181
<record id="x_vat_declaration_recurrence_field_selection_quarterly" model="ir.model.fields.selection">
198182
<field name="name">Quarterly</field>
199183
<field name="field_id" ref="x_vat_declaration_recurrence_field_res_partner" />
200-
<field name="value">Quarterly</field>
184+
<field name="value">quarterly</field>
201185
</record>
202186
<record id="x_vat_declaration_recurrence_field_selection_franchise" model="ir.model.fields.selection">
203187
<field name="name">Franchise</field>
204188
<field name="field_id" ref="x_vat_declaration_recurrence_field_res_partner" />
205-
<field name="value">Franchise</field>
189+
<field name="value">franchise</field>
206190
</record>
207191
<record id="x_vat_declaration_recurrence_field_selection_exempted" model="ir.model.fields.selection">
208192
<field name="name">Exempted</field>
209193
<field name="field_id" ref="x_vat_declaration_recurrence_field_res_partner" />
210-
<field name="value">Exempted</field>
194+
<field name="value">exempted</field>
211195
</record>
212196

213197
<record id="x_interim_situation_field_res_partner" model="ir.model.fields">
@@ -224,7 +208,7 @@
224208
<record id="x_interim_situation_field_selection_quarterly" model="ir.model.fields.selection">
225209
<field name="name">Quarterly</field>
226210
<field name="field_id" ref="x_interim_situation_field_res_partner" />
227-
<field name="value">Quarterly</field>
211+
<field name="value">quarterly</field>
228212
</record>
229213

230214
<record id="x_mandate_ids_field_res_partner" model="ir.model.fields">
@@ -273,17 +257,17 @@
273257

274258

275259
<!-- Project Project fields -->
276-
<record id="x_assistant_id_field_project_project" model="ir.model.fields">
277-
<field name="name">x_assistant_id</field>
278-
<field name="field_description">Assistant</field>
260+
<record id="x_assistant_ids_field_project_project" model="ir.model.fields">
261+
<field name="name">x_assistant_ids</field>
262+
<field name="field_description">Assistants</field>
279263
<field name="model_id" ref="project.model_project_project"/>
280264
<field name="ttype">many2many</field>
281265
<field name="relation">res.partner</field>
282266
<field name="relation_table">x_project_project_res_partner_assistant_rel</field>
283267
</record>
284-
<record id="x_reviewer_id_field_project_project" model="ir.model.fields">
285-
<field name="name">x_reviewer_id</field>
286-
<field name="field_description">Reviewer</field>
268+
<record id="x_reviewer_ids_field_project_project" model="ir.model.fields">
269+
<field name="name">x_reviewer_ids</field>
270+
<field name="field_description">Reviewers</field>
287271
<field name="model_id" ref="project.model_project_project"/>
288272
<field name="ttype">many2many</field>
289273
<field name="relation">res.partner</field>

‎accounting_firm/data/ir_ui_view.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<group>
4848
<field name="x_risk_ids" nolabel="1">
4949
<list editable="bottom">
50-
<field name="x_name"/>
50+
<field name="x_risk_type"/>
5151
<field name="x_level"/>
5252
<field name="x_explanation" width="500"/>
5353
</list>
@@ -127,8 +127,8 @@
127127
<field name="priority" eval="100"/>
128128
<field name="arch" type="xml">
129129
<xpath expr="//field[@name='user_id']" position="after">
130-
<field name="x_assistant_id" widget="many2many_avatar_user"/>
131-
<field name="x_reviewer_id" widget="many2many_avatar_user"/>
130+
<field name="x_assistant_ids" widget="many2many_avatar_user"/>
131+
<field name="x_reviewer_ids" widget="many2many_avatar_user"/>
132132
</xpath>
133133
</field>
134134
</record>
@@ -140,8 +140,8 @@
140140
<field name="active" eval="True"/>
141141
<field name="arch" type="xml">
142142
<xpath expr="//field[@name='user_id']" position="before">
143-
<field name="x_reviewer_id" class="me-1" widget="many2many_avatar_user"/>
144-
<field name="x_assistant_id" class="me-1" widget="many2many_avatar_user"/>
143+
<field name="x_reviewer_ids" class="me-1" widget="many2many_avatar_user"/>
144+
<field name="x_assistant_ids" class="me-1" widget="many2many_avatar_user"/>
145145
</xpath>
146146
</field>
147147
</record>
@@ -156,7 +156,7 @@
156156
<form>
157157
<sheet>
158158
<h1>
159-
<field name="x_name"/>
159+
<field name="x_risk_type"/>
160160
</h1>
161161
<group>
162162
<field name="x_level"/>

‎accounting_firm/data/x_aml_risk_type.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<odoo noupdate="1" auto_sequence="1">
3+
<record id="x_name_risk_customer" model="x_aml_risk_type">
4+
<field name="x_name">Customer</field>
5+
</record>
6+
<record id="x_name_risk_mission" model="x_aml_risk_type">
7+
<field name="x_name">Mission</field>
8+
</record>
9+
<record id="x_name_risk_activity" model="x_aml_risk_type">
10+
<field name="x_name">Activity</field>
11+
</record>
12+
<record id="x_name_risk_geography" model="x_aml_risk_type">
13+
<field name="x_name">Geography</field>
14+
</record>
15+
<record id="x_name_risk_overall" model="x_aml_risk_type">
16+
<field name="x_name">Overall</field>
17+
</record>
18+
</odoo>

‎accounting_firm/demo/base_automation.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<odoo>
3-
<function name="button_immediate_install" model="ir.module.module" eval="[ref('base.module_web_studio', raise_if_not_found=False)]"/>
43
<record id="base_automation_1" model="base.automation">
54
<field name="name">Accounting Firm: Update the tasks</field>
65
<field name="model_id" ref="project.model_project_task" />

0 commit comments

Comments
 (0)