Unifield Server

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

  1. US-8867
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 6159
Proposed branch: lp:~dorian-kemps/unifield-server/US-8867
Merge into: lp:unifield-server
Diff against target: 107 lines (+18/-22)
2 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+12/-4)
bin/addons/procurement_request/report/procurement_request_report.rml (+6/-18)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-8867
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+412845@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 2021-11-18 11:18:31 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2021-12-07 10:10:08 +0000
4@@ -14834,10 +14834,9 @@
5 msgid "Not implemented"
6 msgstr "Non mis en œuvre"
7
8-#. modules: stock_override, procurement_request, msf_outgoing, kit
9+#. modules: stock_override, msf_outgoing, kit
10 #: report:delivery.order:0
11 #: report:internal.move:0
12-#: report:procurement.request.report:0
13 #: report:empty.picking.ticket:0
14 #: report:picking.ticket:0
15 #: report:kitting.order.report:0
16@@ -33023,9 +33022,8 @@
17 msgid "The certificate ID of the module must be unique !"
18 msgstr "L'Identité du certificat du module doit être unique !"
19
20-#. modules: stock_override, procurement_request, kit
21+#. modules: stock_override, kit
22 #: report:delivery.order:0
23-#: report:procurement.request.report:0
24 #: report:internal.move:0
25 #: report:kitting.order.report:0
26 msgid "Logistics / Supply :"
27@@ -113251,3 +113249,13 @@
28 #, python-format
29 msgid "You must select an old version of the Kit to be able to import from it"
30 msgstr "Vous devez sélectionner une ancienne version de ce Kit pour pouvoir importer depuis ce Kit"
31+
32+#. module: procurement_request
33+#: report:procurement.request.report:0
34+msgid "Technical Responsible :"
35+msgstr "Responsable Technique :"
36+
37+#. module: procurement_request
38+#: report:procurement.request.report:0
39+msgid "Supply Responsible :"
40+msgstr "Responsable Approvisionnement :"
41
42=== modified file 'bin/addons/procurement_request/report/procurement_request_report.rml'
43--- bin/addons/procurement_request/report/procurement_request_report.rml 2020-06-18 15:56:24 +0000
44+++ bin/addons/procurement_request/report/procurement_request_report.rml 2021-12-07 10:10:08 +0000
45@@ -302,7 +302,7 @@
46 </para>
47
48
49- <blockTable colWidths="663.0" style="RemarkTable" keepWithNext="1">
50+ <blockTable colWidths="662.0" style="RemarkTable" keepWithNext="1">
51 <tr>
52 <td>
53 <para style="TextNotes">Notes : [[ objects[0].notes ]]</para>
54@@ -310,19 +310,16 @@
55 </tr>
56 <tr></tr>
57 </blockTable>
58- <blockTable colWidths="44.0,169.0,225.0,225.0" style="FooterInfo" keepWithNext="1">
59+ <blockTable colWidths="44.0,281.0,337.0" style="FooterInfo" keepWithNext="1">
60 <tr>
61 <td>
62 <para style="LFooter"> </para>
63 </td>
64 <td>
65- <para style="LFooter">Approved by :</para>
66- </td>
67- <td>
68- <para style="LFooter">Logistics / Supply :</para>
69- </td>
70- <td>
71- <para style="LFooter">Storekeeper :</para>
72+ <para style="LFooter">Technical Responsible :</para>
73+ </td>
74+ <td>
75+ <para style="LFooter">Supply Responsible :</para>
76 </td>
77 </tr>
78 <tr>
79@@ -335,9 +332,6 @@
80 <td>
81 <para style="Line"> </para>
82 </td>
83- <td>
84- <para style="Line"> </para>
85- </td>
86 </tr>
87 <tr>
88 <td>
89@@ -349,9 +343,6 @@
90 <td>
91 <para style="Line"> </para>
92 </td>
93- <td>
94- <para style="Line"> </para>
95- </td>
96 </tr>
97 <tr>
98 <td>
99@@ -363,9 +354,6 @@
100 <td>
101 <para style="LFooterEnd"> </para>
102 </td>
103- <td>
104- <para style="LFooterEnd"> </para>
105- </td>
106 </tr>
107 </blockTable>
108

Subscribers

People subscribed via source and target branches