Unifield Server

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

  1. US-2909
  2. Merge into trunk
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
1=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
2--- bin/addons/msf_profile/i18n/fr_MF.po 2019-04-08 09:30:07 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2019-04-24 15:18:01 +0000
4@@ -50697,9 +50697,10 @@
5 msgid "Production Lot Revisions"
6 msgstr "Révisions du Lot de Production"
7
8-#. module: consumption_calculation
9+#. modules: consumption_calculation, supplier_catalogue
10 #: view:monthly.review.consumption:0
11 #: view:real.average.consumption:0
12+#: model:ir.actions.server,name:supplier_catalogue.action_server_export_catalogue_lines
13 msgid "Export lines"
14 msgstr "Exporter des lignes"
15
16@@ -80916,11 +80917,6 @@
17 msgid "Has a Third Party"
18 msgstr "A un Tiers"
19
20-#. module: supplier_catalogue
21-#: model:ir.actions.server,name:supplier_catalogue.action_server_export_catalogue_lines
22-msgid "Export lines (csv)"
23-msgstr "Export lines (csv)"
24-
25 #. module: base
26 #: selection:ir.property,value_reference:0
27 msgid "account.journal"
28
29=== modified file 'bin/addons/supplier_catalogue/wizard/catalogue_export_lines_view.xml'
30--- bin/addons/supplier_catalogue/wizard/catalogue_export_lines_view.xml 2016-07-04 13:53:17 +0000
31+++ bin/addons/supplier_catalogue/wizard/catalogue_export_lines_view.xml 2019-04-24 15:18:01 +0000
32@@ -19,7 +19,7 @@
33 </record>
34
35 <record id="action_server_export_catalogue_lines" model="ir.actions.server">
36- <field name="name">Export lines (csv)</field>
37+ <field name="name">Export lines</field>
38 <field name="model_id" ref="model_catalogue_export_lines" />
39 <field name="state">code</field>
40 <field name="code">action = obj.export_file(context=context)</field>

Subscribers

People subscribed via source and target branches