Skip to content
Snippets Groups Projects
Commit 79230eed authored by Benjamin - Le Filament's avatar Benjamin - Le Filament
Browse files

Merge branch '12.0-lm-00' into '12.0'

12.0 lm 00

See merge request !1
parents 0916956f 36539023
Branches
No related tags found
1 merge request!112.0 lm 00
......@@ -10,6 +10,7 @@
'base',
'web',
'cgscop_partner',
'cgscop_liste_ministere',
],
"data": [
"security/ir.model.access.csv",
......
......@@ -18,7 +18,7 @@
</record>
<record id="odoo_scop_liasse_fiscale" model="riga.files.matching">
<field name="model_id" ref="cgscop_partner.model_scop_liasse_fiscale"/>
<field name="model_id" ref="cgscop_liste_ministere.model_scop_liasse_fiscale"/>
<field name="riga_filename" eval="5900"/>
<field name="primary_key">EVTID</field>
<field name="header_key">PMID</field>
......
......@@ -23,9 +23,9 @@ class ScopQuestionnaireImport(models.Model):
['id_riga', '=', liasse.year_riga]])
liasse.year = year.name
liasse.type_id = liasse.env.ref(
'cgscop_partner.liasse_type_2').id
'cgscop_liste_ministere.liasse_type_2').id
else:
if liasse.partner_id.date_1st_sign:
liasse.year = liasse.partner_id.date_1st_sign.year
liasse.type_id = liasse.env.ref(
'cgscop_partner.liasse_type_1').id
'cgscop_liste_ministere.liasse_type_1').id
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment