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

Proposed by jftempo
Status: Merged
Merged at revision: 4153
Proposed branch: lp:~unifield-team/unifield-server/us-1075
Merge into: lp:unifield-server
Diff against target: 41 lines (+8/-4)
2 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+7/-3)
bin/addons/stock_schedule/scheduler_view.xml (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1075
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+314817@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:10:15 +0000
@@ -10543,8 +10543,12 @@
1054310543
10544#. module: procurement10544#. module: procurement
10545#: model:ir.actions.act_window,name:procurement.action_compute_schedulers10545#: model:ir.actions.act_window,name:procurement.action_compute_schedulers
10546msgid "POs Creation"
10547msgstr "Création BCs"
10548
10549#. module: procurement
10546#: model:ir.ui.menu,name:procurement.menu_stock_sched10550#: model:ir.ui.menu,name:procurement.menu_stock_sched
10547msgid "POs Creation"10551msgid "PO Creation"
10548msgstr "Création BCs"10552msgstr "Création BCs"
1054910553
10550#. module: base10554#. module: base
@@ -28080,8 +28084,8 @@
28080#. modules: procurement, procurement_report28084#. modules: procurement, procurement_report
28081#: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers28085#: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
28082#: model:ir.actions.act_window,name:procurement_report.action_compute_schedulers_purchase28086#: model:ir.actions.act_window,name:procurement_report.action_compute_schedulers_purchase
28083msgid "POs Creation"28087msgid "Auto PO Creation"
28084msgstr "Création BCs"28088msgstr "Création Auto BCs"
2808528089
28086#. module: stock_forecast28090#. module: stock_forecast
28087#: model:ir.actions.server,name:stock_forecast.action_stock_forecast28091#: model:ir.actions.server,name:stock_forecast.action_stock_forecast
2808828092
=== modified file 'bin/addons/stock_schedule/scheduler_view.xml'
--- bin/addons/stock_schedule/scheduler_view.xml 2012-11-06 14:18:56 +0000
+++ bin/addons/stock_schedule/scheduler_view.xml 2017-01-16 10:10:15 +0000
@@ -175,7 +175,7 @@
175 <!-- REWORKING OF WAREHOUSE MENU ACCORDING TO UF-657 ERGONOMIC IMPROVEMENTS -->175 <!-- REWORKING OF WAREHOUSE MENU ACCORDING TO UF-657 ERGONOMIC IMPROVEMENTS -->
176 <menuitem id="stock.menu_traceability" name="Traceability" parent="stock.menu_stock_root" sequence="5"/>176 <menuitem id="stock.menu_traceability" name="Traceability" parent="stock.menu_stock_root" sequence="5"/>
177 <menuitem id="stock.menu_stock_inventory_control" name="Inventory Control" parent="stock.menu_stock_root" sequence="6"/>177 <menuitem id="stock.menu_stock_inventory_control" name="Inventory Control" parent="stock.menu_stock_root" sequence="6"/>
178 <menuitem id="procurement.menu_stock_sched" name="POs Creation" parent="stock.menu_stock_root" sequence="10"/>178 <menuitem id="procurement.menu_stock_sched" name="PO Creation" parent="stock.menu_stock_root" sequence="10"/>
179 <menuitem id="stock.next_id_61" name="Reporting" parent="stock.menu_stock_root" sequence="8" />179 <menuitem id="stock.next_id_61" name="Reporting" parent="stock.menu_stock_root" sequence="8" />
180180
181 <!-- REWORKING OF TRACEABILITY MENU -->181 <!-- REWORKING OF TRACEABILITY MENU -->

Subscribers

People subscribed via source and target branches

to all changes: