Merge lp:~unifield-team/unifield-server/us-2128 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 4142
Proposed branch: lp:~unifield-team/unifield-server/us-2128
Merge into: lp:unifield-server
Diff against target: 38 lines (+6/-5)
2 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+3/-2)
bin/addons/procurement_report/wizard/schedulers_all_view.xml (+3/-3)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-2128
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+314815@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 2017-01-02 08:52:42 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2017-01-16 10:09:49 +0000
4@@ -28080,8 +28080,9 @@
5 #. modules: procurement, procurement_report
6 #: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
7 #: model:ir.actions.act_window,name:procurement_report.action_compute_schedulers_purchase
8-msgid "POs Creation"
9-msgstr "Création BCs"
10+#: model:ir.actions.act_window,name:procurement.action_compute_schedulers
11+msgid "Auto POs Creation"
12+msgstr "Création Auto. BCs"
13
14 #. module: stock_forecast
15 #: model:ir.actions.server,name:stock_forecast.action_stock_forecast
16
17=== modified file 'bin/addons/procurement_report/wizard/schedulers_all_view.xml'
18--- bin/addons/procurement_report/wizard/schedulers_all_view.xml 2012-12-05 10:06:57 +0000
19+++ bin/addons/procurement_report/wizard/schedulers_all_view.xml 2017-01-16 10:09:49 +0000
20@@ -46,15 +46,15 @@
21 </field>
22 </record>
23
24- <act_window name="POs Creation"
25+ <act_window name="Auto POs Creation"
26 res_model="procurement.purchase.compute.all"
27 src_model="procurement.order"
28 view_mode="form"
29 target="new"
30 key2="client_action_multi"
31- id="action_compute_schedulers_purchase" />
32+ id="procurement.action_compute_schedulers" />
33
34- <menuitem action="action_compute_schedulers_purchase" id="procurement.menu_stock_proc_schedulers" parent="procurement.menu_stock_sched" sequence="19" />
35+ <menuitem action="procurement.action_compute_schedulers" id="procurement.menu_stock_proc_schedulers" parent="procurement.menu_stock_sched" sequence="19" />
36
37
38 </data>

Subscribers

People subscribed via source and target branches

to all changes: