diff --git a/__manifest__.py b/__manifest__.py
index e2cf56b7a1ad07d15c415114c1ed86fe6877c728..39ab2aa48eec5f9df47cf1a587d3510223ac1431 100755
--- a/__manifest__.py
+++ b/__manifest__.py
@@ -4,7 +4,7 @@
'name': 'Export Journal Tool',
'summary': 'Export des journaux',
'author': 'LE FILAMENT',
- 'version': '12.0.1.2.0',
+ 'version': '12.0.0.0',
'license': "AGPL-3",
'depends': ['account'],
'qweb': [],
diff --git a/datas/export_journal_datas.xml b/datas/export_journal_datas.xml
index d7c7718294f21574c00f5bdf237327332b6e3cdf..8147b7dd66d0df287494648a622648126a310078 100755
--- a/datas/export_journal_datas.xml
+++ b/datas/export_journal_datas.xml
@@ -83,13 +83,13 @@
<record id="ibiza_vt_6" model="export.journal.field">
<field name="name">libelle</field>
<field name="sequence">6</field>
- <field name="field_name">line.partner_id.name if not line.name else 'Facture ' + line.invoice_id.number + ' - ' + line.name</field>
+ <field name="field_name">line.partner_id.name if not line.name else 'Facture ' + line.move_id.name + ' - ' + line.name</field>
<field name="export_id" ref="lefilament_export_journal_tool.ibiza_export_ventes"/>
</record>
<record id="ibiza_vt_7" model="export.journal.field">
<field name="name">piece</field>
<field name="sequence">7</field>
- <field name="field_name">line.invoice_id.number</field>
+ <field name="field_name">line.move_id.name</field>
<field name="export_id" ref="lefilament_export_journal_tool.ibiza_export_ventes"/>
</record>
<record id="ibiza_vt_8" model="export.journal.field">
@@ -101,7 +101,7 @@
<record id="ibiza_vt_9" model="export.journal.field">
<field name="name">ref_piece</field>
<field name="sequence">9</field>
- <field name="field_name">line.invoice_id.number</field>
+ <field name="field_name">line.move_id.name</field>
<field name="export_id" ref="lefilament_export_journal_tool.ibiza_export_ventes"/>
</record>
<!-- IBIZA ACHATS -->
@@ -138,13 +138,13 @@
<record id="ibiza_ha_6" model="export.journal.field">
<field name="name">libelle</field>
<field name="sequence">6</field>
- <field name="field_name">line.partner_id.name if not line.name else 'Facture ' + line.invoice_id.number + ' - ' + line.name</field>
+ <field name="field_name">line.partner_id.name if not line.name else 'Facture ' + line.move_id.name + ' - ' + line.name</field>
<field name="export_id" ref="lefilament_export_journal_tool.ibiza_export_achats"/>
</record>
<record id="ibiza_ha_7" model="export.journal.field">
<field name="name">piece</field>
<field name="sequence">7</field>
- <field name="field_name">line.invoice_id.number</field>
+ <field name="field_name">line.move_id.name</field>
<field name="export_id" ref="lefilament_export_journal_tool.ibiza_export_achats"/>
</record>
<record id="ibiza_ha_8" model="export.journal.field">
@@ -156,7 +156,7 @@
<record id="ibiza_ha_9" model="export.journal.field">
<field name="name">ref_piece</field>
<field name="sequence">9</field>
- <field name="field_name">line.invoice_id.number</field>
+ <field name="field_name">line.move_id.name</field>
<field name="export_id" ref="lefilament_export_journal_tool.ibiza_export_achats"/>
</record>
@@ -188,13 +188,13 @@
<record id="cegid_vt_5" model="export.journal.field">
<field name="name">Référence</field>
<field name="sequence">5</field>
- <field name="field_name">line.invoice_id.number</field>
+ <field name="field_name">line.move_id.name</field>
<field name="export_id" ref="lefilament_export_journal_tool.cegid_export_ventes"/>
</record>
<record id="cegid_vt_6" model="export.journal.field">
<field name="name">Libellé</field>
<field name="sequence">6</field>
- <field name="field_name">line.partner_id.name if not line.name else 'Facture ' + line.invoice_id.number + ' - ' + line.name</field>
+ <field name="field_name">line.partner_id.name if not line.name else 'Facture ' + line.move_id.name + ' - ' + line.name</field>
<field name="export_id" ref="lefilament_export_journal_tool.cegid_export_ventes"/>
</record>
<record id="cegid_vt_7" model="export.journal.field">
@@ -237,13 +237,13 @@
<record id="cegid_ha_5" model="export.journal.field">
<field name="name">Référence</field>
<field name="sequence">5</field>
- <field name="field_name">line.invoice_id.number</field>
+ <field name="field_name">line.move_id.name</field>
<field name="export_id" ref="lefilament_export_journal_tool.cegid_export_achats"/>
</record>
<record id="cegid_ha_6" model="export.journal.field">
<field name="name">Libellé</field>
<field name="sequence">6</field>
- <field name="field_name">line.partner_id.name if not line.name else 'Facture ' + line.invoice_id.number + ' - ' + line.name</field>
+ <field name="field_name">line.partner_id.name if not line.name else 'Facture ' + line.move_id.name + ' - ' + line.name</field>
<field name="export_id" ref="lefilament_export_journal_tool.cegid_export_achats"/>
</record>
<record id="cegid_ha_7" model="export.journal.field">
diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv
index 190b08f47e563d08a390c745532ece681f6165f0..1596a2ce47f84e57fde338b9c65d0b88b79b9a9e 100755
--- a/security/ir.model.access.csv
+++ b/security/ir.model.access.csv
@@ -3,3 +3,4 @@ access_export_journal_type_user,access_export_journal_type_user,model_export_jou
access_export_journal_type,access_export_journal_type,model_export_journal_type,base.group_erp_manager,1,1,1,1
access_export_journal_field_user,access_export_journal_field_user,model_export_journal_field,account.group_account_invoice,1,0,0,0
access_export_journal_fields,access_export_journal_fields,model_export_journal_field,base.group_erp_manager,1,1,1,1
+access_export_journal_wizard,access_export_journal_wizard,model_export_journal_wizard,account.group_account_invoice,1,1,1,1
diff --git a/views/export_journal_type.xml b/views/export_journal_type.xml
index 4dd816db1a1f2fc2cacd8b45a231061d3f3e39f8..65440c26a5171d4d0ee414e5dbad9e64edfd95e4 100755
--- a/views/export_journal_type.xml
+++ b/views/export_journal_type.xml
@@ -10,10 +10,11 @@
<form string="Export Journaux">
<sheet>
<div class="oe_button_box" name="button_box">
- <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
- <field name="active" widget="boolean_button" options="{"terminology": "archive"}"/>
- </button>
- </div>
+ <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
+ <field name="active" string="Archiver" widget="statinfo"/>
+ </button>
+ </div>
+ <widget name="web_ribbon" title="Archivé" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
<h2><field name="name"/></h2>
<group>
<group>
@@ -74,7 +75,6 @@
<field name="name">Export Journaux</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">export.journal.type</field>
- <field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
diff --git a/wizard/export_journal_wizard_view.xml b/wizard/export_journal_wizard_view.xml
index 4f7ae84b5888ef05a9c7cd8f88b1876f0f38cf60..c54434fdbf6d2b1516019d3742ec380a8987660f 100755
--- a/wizard/export_journal_wizard_view.xml
+++ b/wizard/export_journal_wizard_view.xml
@@ -37,10 +37,13 @@
<field name="name">Export Journal</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">export.journal.wizard</field>
- <field name="view_mode">form</field>
<field name="view_id" ref="data_export_view_form"/>
<field name="target">new</field>
</record>
- <menuitem action="data_export_action" id="menu_data_export" name="Export Journal" parent="account.menu_finance_entries" sequence="0" />
+ <menuitem id="menu_data_export"
+ action="data_export_action"
+ name="Export Journal"
+ parent="account.menu_finance_entries_accounting_journals"
+ sequence="90" />
</odoo>