Merge lp:~dorian-kemps/unifield-server/US-2909 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 5328
Proposed branch: lp:~dorian-kemps/unifield-server/US-2909
Merge into: lp:unifield-server
Diff against target: 40 lines (+3/-7)
2 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+2/-6)
bin/addons/supplier_catalogue/wizard/catalogue_export_lines_view.xml (+1/-1)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-2909
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+366473@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po 2019-04-08 09:30:07 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po 2019-04-24 15:18:01 +0000
@@ -50697,9 +50697,10 @@
50697msgid "Production Lot Revisions"50697msgid "Production Lot Revisions"
50698msgstr "RĂ©visions du Lot de Production"50698msgstr "RĂ©visions du Lot de Production"
5069950699
50700#. module: consumption_calculation50700#. modules: consumption_calculation, supplier_catalogue
50701#: view:monthly.review.consumption:050701#: view:monthly.review.consumption:0
50702#: view:real.average.consumption:050702#: view:real.average.consumption:0
50703#: model:ir.actions.server,name:supplier_catalogue.action_server_export_catalogue_lines
50703msgid "Export lines"50704msgid "Export lines"
50704msgstr "Exporter des lignes"50705msgstr "Exporter des lignes"
5070550706
@@ -80916,11 +80917,6 @@
80916msgid "Has a Third Party"80917msgid "Has a Third Party"
80917msgstr "A un Tiers"80918msgstr "A un Tiers"
8091880919
80919#. module: supplier_catalogue
80920#: model:ir.actions.server,name:supplier_catalogue.action_server_export_catalogue_lines
80921msgid "Export lines (csv)"
80922msgstr "Export lines (csv)"
80923
80924#. module: base80920#. module: base
80925#: selection:ir.property,value_reference:080921#: selection:ir.property,value_reference:0
80926msgid "account.journal"80922msgid "account.journal"
8092780923
=== modified file 'bin/addons/supplier_catalogue/wizard/catalogue_export_lines_view.xml'
--- bin/addons/supplier_catalogue/wizard/catalogue_export_lines_view.xml 2016-07-04 13:53:17 +0000
+++ bin/addons/supplier_catalogue/wizard/catalogue_export_lines_view.xml 2019-04-24 15:18:01 +0000
@@ -19,7 +19,7 @@
19 </record>19 </record>
2020
21 <record id="action_server_export_catalogue_lines" model="ir.actions.server">21 <record id="action_server_export_catalogue_lines" model="ir.actions.server">
22 <field name="name">Export lines (csv)</field>22 <field name="name">Export lines</field>
23 <field name="model_id" ref="model_catalogue_export_lines" />23 <field name="model_id" ref="model_catalogue_export_lines" />
24 <field name="state">code</field>24 <field name="state">code</field>
25 <field name="code">action = obj.export_file(context=context)</field>25 <field name="code">action = obj.export_file(context=context)</field>

Subscribers

People subscribed via source and target branches