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
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po 2017-01-02 08:52:42 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po 2017-01-16 10:09:49 +0000
@@ -28080,8 +28080,9 @@
28080#. modules: procurement, procurement_report28080#. modules: procurement, procurement_report
28081#: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers28081#: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
28082#: model:ir.actions.act_window,name:procurement_report.action_compute_schedulers_purchase28082#: model:ir.actions.act_window,name:procurement_report.action_compute_schedulers_purchase
28083msgid "POs Creation"28083#: model:ir.actions.act_window,name:procurement.action_compute_schedulers
28084msgstr "Création BCs"28084msgid "Auto POs Creation"
28085msgstr "Création Auto. BCs"
2808528086
28086#. module: stock_forecast28087#. module: stock_forecast
28087#: model:ir.actions.server,name:stock_forecast.action_stock_forecast28088#: model:ir.actions.server,name:stock_forecast.action_stock_forecast
2808828089
=== modified file 'bin/addons/procurement_report/wizard/schedulers_all_view.xml'
--- bin/addons/procurement_report/wizard/schedulers_all_view.xml 2012-12-05 10:06:57 +0000
+++ bin/addons/procurement_report/wizard/schedulers_all_view.xml 2017-01-16 10:09:49 +0000
@@ -46,15 +46,15 @@
46 </field>46 </field>
47 </record>47 </record>
4848
49 <act_window name="POs Creation"49 <act_window name="Auto POs Creation"
50 res_model="procurement.purchase.compute.all"50 res_model="procurement.purchase.compute.all"
51 src_model="procurement.order"51 src_model="procurement.order"
52 view_mode="form"52 view_mode="form"
53 target="new"53 target="new"
54 key2="client_action_multi"54 key2="client_action_multi"
55 id="action_compute_schedulers_purchase" />55 id="procurement.action_compute_schedulers" />
5656
57 <menuitem action="action_compute_schedulers_purchase" id="procurement.menu_stock_proc_schedulers" parent="procurement.menu_stock_sched" sequence="19" />57 <menuitem action="procurement.action_compute_schedulers" id="procurement.menu_stock_proc_schedulers" parent="procurement.menu_stock_sched" sequence="19" />
58 58
5959
60 </data>60 </data>

Subscribers

People subscribed via source and target branches

to all changes: