Unifield Server

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

  1. US-6429
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5754
Proposed branch: lp:~dorian-kemps/unifield-server/US-6429
Merge into: lp:unifield-server
Diff against target: 47 lines (+13/-2)
2 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+12/-2)
bin/addons/stock_override/stock_view.xml (+1/-0)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-6429
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+385470@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 2020-06-02 14:41:41 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2020-06-10 07:55:39 +0000
4@@ -92458,7 +92458,8 @@
5 msgid "Show all"
6 msgstr "Tout afficher"
7
8-#. module: msf_outgoing
9+#. module: msf_outgoing, stock
10+#: view:stock.picking:0
11 #: view:stock.picking:0
12 msgid "Show all lines"
13 msgstr "Toutes les lignes"
14@@ -106511,6 +106512,16 @@
15 msgid "Functional total cost :"
16 msgstr "Total Coût Fonctionnel :"
17
18+#. module: stock
19+#: view:stock.picking:0
20+msgid "Show available lines"
21+msgstr "Afficher les lignes disponibles"
22+
23+#. module: stock
24+#: view:stock.picking:0
25+msgid "Show cancelled lines"
26+msgstr "Afficher les lignes annulées"
27+
28 #. module: msf_outgoing
29 #: code:addons/msf_outgoing/msf_outgoing.py:2629
30 #, python-format
31@@ -110324,4 +110335,3 @@
32 #: view:replenishment.segment:0
33 msgid "Handling Lead Time (days) :"
34 msgstr "Délai de traitement (jours) :"
35-
36
37=== modified file 'bin/addons/stock_override/stock_view.xml'
38--- bin/addons/stock_override/stock_view.xml 2020-03-20 14:08:02 +0000
39+++ bin/addons/stock_override/stock_view.xml 2020-06-10 07:55:39 +0000
40@@ -481,6 +481,7 @@
41 default_get="{'purchase_id': purchase_id, 'reason_type_id': reason_type_id, 'warehouse_id': warehouse_id, 'from_wkf': from_wkf}"
42 context="{'subtype': subtype, 'type': 'out', 'reason_type_id': reason_type_id, 'move_line':move_lines and [move_lines[-1]] or [], 'address_in_id': address_id, 'warehouse_id': warehouse_id, 'from_wkf': from_wkf}"
43 on_change="onchange_move()"
44+ filter_selector="[('Show available lines', [('state', 'not in', ['cancel', 'cancel_r'])]), ('Show all lines', []), ('Show cancelled lines', [('state', 'in', ['cancel', 'cancel_r'])])]"
45 >
46 <tree
47 colors="grey:scrapped==True; red: inactive_product == True or to_correct_ok == True"

Subscribers

People subscribed via source and target branches