Unifield Server

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

  1. us-1668
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 3966
Proposed branch: lp:~unifield-team/unifield-server/us-1668
Merge into: lp:unifield-server
Diff against target: 250 lines (+180/-10) (has conflicts)
2 files modified
bin/addons/msf_doc_import/wizard/wizard_import_fo_line.py (+10/-7)
bin/addons/msf_profile/i18n/fr_MF.po (+170/-3)
Text conflict in bin/addons/msf_profile/i18n/fr_MF.po
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1668
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+305126@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_doc_import/wizard/wizard_import_fo_line.py'
2--- bin/addons/msf_doc_import/wizard/wizard_import_fo_line.py 2016-08-18 14:36:26 +0000
3+++ bin/addons/msf_doc_import/wizard/wizard_import_fo_line.py 2016-09-07 16:39:15 +0000
4@@ -25,6 +25,7 @@
5 import base64
6 from spreadsheet_xml.spreadsheet_xml import SpreadsheetXML
7 import time
8+import tools
9 from msf_doc_import import check_line
10 from msf_doc_import.wizard import FO_LINE_COLUMNS_FOR_IMPORT as columns_for_fo_line_import
11
12@@ -113,10 +114,12 @@
13 header_error = False
14 if header_row:
15 for i, h_name in enumerate(columns_for_fo_line_import):
16- if len(header_row) > i and str(header_row[i]) != h_name:
17+ tr_header_row = _(tools.ustr(header_row[i]))
18+ tr_h_name = _(h_name)
19+ if len(header_row) > i and tr_header_row != tr_h_name:
20 header_error = True
21- if str(header_row[i]).upper() == h_name.upper():
22- error_list.append(_("\n\tPlease check spelling on column '%s'.") % header_row[i])
23+ if tr_header_row.upper() == tr_h_name.upper():
24+ error_list.append(_("\n\tPlease check spelling on column '%s'.") % tr_header_row)
25
26 if header_error:
27 msg = _("\n\tYou can not import this file because the header of columns doesn't match with the expected headers: %s") % ','.join(columns_for_fo_line_import)
28@@ -127,8 +130,8 @@
29 lines_to_correct = check_line.check_lines_currency(rows,
30 currency_index, order_currency_code)
31 if lines_to_correct > 0:
32- msg = "You can not import this file because it contains" \
33- " line(s) with currency (Column G) not of the order currency (%s)" % (
34+ msg = _("You can not import this file because it contains" \
35+ " line(s) with currency (Column G) not of the order currency (%s)") % (
36 order_currency_code, )
37 error_list.append(msg)
38
39@@ -288,7 +291,7 @@
40 if error_log:
41 error_log = _("Reported errors for ignored lines : \n") + error_log
42 end_time = time.time()
43- total_time = str(round(end_time-start_time)) + _(' second(s)')
44+ total_time = tools.ustr(round(end_time-start_time)) + _(' second(s)')
45 final_message = _('''
46 %s
47 Importation completed in %s!
48@@ -307,7 +310,7 @@
49 # we reset the state of the FO to draft (initial state)
50 except Exception as e:
51 self.write(cr, uid, ids, {
52- 'message': _('An unknow error occured, please contact the support team. Error message: %s') % str(e),
53+ 'message': _('An unknow error occured, please contact the support team. Error message: %s') % tools.ustr(e),
54 'state': 'done',
55 }, context=context)
56 finally:
57
58=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
59--- bin/addons/msf_profile/i18n/fr_MF.po 2016-09-06 14:18:54 +0000
60+++ bin/addons/msf_profile/i18n/fr_MF.po 2016-09-07 16:39:15 +0000
61@@ -60404,9 +60404,9 @@
62 msgstr "La Commande doit être unique ou plus grande que 1!"
63
64 #. module: msf_doc_import
65-#: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:240
66-#: code:addons/msf_doc_import/wizard/wizard_import_ir_line.py:228
67-#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:246
68+#: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:294
69+#: code:addons/msf_doc_import/wizard/wizard_import_ir_line.py:267
70+#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:326
71 #: code:addons/msf_doc_import/wizard/wizard_import_tender_line.py:191
72 #, python-format
73 msgid " second(s)"
74@@ -74416,9 +74416,176 @@
75 #, python-format
76 msgid "The column '%s' is not present in the file."
77 msgstr "La colonne '%s' n'est pas présente dans le fichier."
78+<<<<<<< TREE
79
80 #. module: msf_doc_import
81 #: code:addons/msf_doc_import/wizard/wizard_import_batch.py:166
82 #, python-format
83 msgid "Line seemed empty, so this line was ignored"
84 msgstr "La ligne semblait vide, donc cette ligne a été ignorée"
85+=======
86+
87+#. module: msf_doc_import
88+#: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:90
89+#: code:addons/msf_doc_import/wizard/wizard_import_ir_line.py:87
90+#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:97
91+#, python-format
92+msgid "Order currency not found!"
93+msgstr "Devise de la commande non trouvée !"
94+
95+#. module: msf_doc_import
96+#: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:122
97+#, python-format
98+msgid "\n"
99+" Please check spelling on column '%s'."
100+msgstr "\n"
101+" Veuillez vérifier le nom de la colonne '%s'."
102+
103+#. module: msf_doc_import
104+#: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:125
105+#, python-format
106+msgid "\n"
107+" You can not import this file because the header of columns doesn't match with the expected headers: %s"
108+msgstr "\n"
109+" Vous ne pouvez pas importer ce fichier car les entêtes de colonnes ne correspondent aux entêtes attendues : %s"
110+
111+#. module: msf_doc_import
112+#: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:127
113+#, python-format
114+msgid "\n"
115+" Please ensure that all these columns are present and in this exact order."
116+msgstr "\n"
117+" Veuillez vous assurer que toutes ces colonnes sont présentes exactement dans cet ordre."
118+
119+#. module: msf_doc_import
120+#: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:133
121+#, python-format
122+msgid "You can not import this file because it contains line(s) with currency (Column G) not of the order currency (%s)"
123+msgstr "Vous ne pouvez pas importer ce fichier car il contient des lignes avec une devise (colonne G) qui n'est pas la devise de la commande (%s)"
124+
125+#. module: msf_doc_import
126+#: code:addons/msf_doc_import/wizard/wizard_import_auto_supply_line.py:119
127+#: code:addons/msf_doc_import/wizard/wizard_import_order_cycle_line.py:120
128+#: code:addons/msf_doc_import/wizard/wizard_import_picking_line.py:138
129+#: code:addons/msf_doc_import/wizard/wizard_import_product_list.py:127
130+#: code:addons/msf_doc_import/wizard/wizard_import_stock_warehouse_order_point_line.py:141
131+#: code:addons/msf_doc_import/wizard/wizard_import_threshold_value_line.py:124
132+#, python-format
133+msgid "Line %s in the Excel file: You should have exactly %s columns in this order: %s \n"
134+""
135+msgstr "Ligne %s du fichier Excel : Vous devez avoir exactement %s colonnes dans cet order : %s \n"
136+""
137+
138+#. module: msf_doc_import
139+#: code:addons/msf_doc_import/wizard/wizard_import_auto_supply_line.py:175
140+#: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:210
141+#: code:addons/msf_doc_import/wizard/wizard_import_ir_line.py:201
142+#: code:addons/msf_doc_import/wizard/wizard_import_order_cycle_line.py:172
143+#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:214
144+#: code:addons/msf_doc_import/wizard/wizard_import_stock_warehouse_order_point_line.py:204
145+#: code:addons/msf_doc_import/wizard/wizard_import_tender_line.py:155
146+#: code:addons/msf_doc_import/wizard/wizard_import_threshold_value_line.py:183
147+#: code:addons/msf_doc_import/wizard/wizard_import_threshold_value_line.py:190
148+#, python-format
149+msgid "Line %s in the Excel file: %s\n"
150+""
151+msgstr "Ligne %s du fichier Excel : %s\n"
152+
153+#. module: msf_doc_import
154+#: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:244
155+#: code:addons/msf_doc_import/wizard/wizard_import_ir_line.py:223
156+#: code:addons/msf_doc_import/wizard/wizard_import_picking_line.py:261
157+#, python-format
158+msgid "Line %s in the Excel file was ignored. Details: %s"
159+msgstr "Ligne %s du fichier Excel a été ignorée. Détails : %s"
160+
161+#. module: msf_doc_import
162+#: code:addons/msf_doc_import/wizard/wizard_import_auto_supply_line.py:178
163+#: code:addons/msf_doc_import/wizard/wizard_import_stock_warehouse_order_point_line.py:206
164+#, python-format
165+msgid "Product Qty should be greater than 0.00"
166+msgstr "Quantité de produit doit être supérieure à 0,00"
167+
168+#. module: msf_doc_import
169+#: code:addons/msf_doc_import/wizard/wizard_import_auto_supply_line.py:223
170+#: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:292
171+#: code:addons/msf_doc_import/wizard/wizard_import_ir_line.py:265
172+#: code:addons/msf_doc_import/wizard/wizard_import_order_cycle_line.py:212
173+#: code:addons/msf_doc_import/wizard/wizard_import_picking_line.py:314
174+#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:323
175+#: code:addons/msf_doc_import/wizard/wizard_import_product_list.py:217
176+#: code:addons/msf_doc_import/wizard/wizard_import_stock_warehouse_order_point_line.py:268
177+#: code:addons/msf_doc_import/wizard/wizard_import_supplier_catalogue.py:407
178+#: code:addons/msf_doc_import/wizard/wizard_import_tender_line.py:213
179+#: code:addons/msf_doc_import/wizard/wizard_import_threshold_value_line.py:233
180+#, python-format
181+msgid "Reported errors for ignored lines : \n"
182+""
183+msgstr "Erreurs reportées pour les lignes ignorées : \n"
184+""
185+
186+#. module: msf_doc_import
187+#: code:addons/msf_doc_import/wizard/wizard_import_auto_supply_line.py:225
188+#: code:addons/msf_doc_import/wizard/wizard_import_order_cycle_line.py:214
189+#: code:addons/msf_doc_import/wizard/wizard_import_picking_line.py:316
190+#: code:addons/msf_doc_import/wizard/wizard_import_product_list.py:219
191+#: code:addons/msf_doc_import/wizard/wizard_import_stock_warehouse_order_point_line.py:270
192+#: code:addons/msf_doc_import/wizard/wizard_import_supplier_catalogue.py:408
193+#: code:addons/msf_doc_import/wizard/wizard_import_threshold_value_line.py:235
194+#, python-format
195+msgid " second(s)"
196+msgstr " seconde(s)"
197+
198+#. module: msf_doc_import
199+#: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:295
200+#, python-format
201+msgid "\n"
202+" %s\n"
203+" Importation completed in %s!\n"
204+"# of imported lines : %s on %s lines\n"
205+"# of ignored lines: %s\n"
206+"# of lines to correct: %s\n"
207+" %s\n"
208+"\n"
209+" %s\n"
210+" "
211+msgstr "\n"
212+" %s\n"
213+" Importation terminée en %s!\n"
214+"# de lignes importées : %s sur %s lignes\n"
215+"# de lignes ignorées : %s\n"
216+"# de lignes à corriger : %s\n"
217+" %s\n"
218+"\n"
219+" %s\n"
220+" "
221+
222+#. module: msf_doc_import
223+#: code:addons/msf_doc_import/wizard/wizard_import_picking_line.py:317
224+#, python-format
225+msgid " \n"
226+" Importation completed in %s!\n"
227+" # of imported lines : %s on %s lines\n"
228+" # of ignored lines: %s\n"
229+" # of lines to correct: %s\n"
230+" %s\n"
231+"\n"
232+" %s\n"
233+" "
234+msgstr " \n"
235+" Importation terminée en %s!\n"
236+" # de lignes importées : %s sur %s lignes\n"
237+" # de lignes ignorées : %s\n"
238+" # de lignes à corriger : %s\n"
239+" %s\n"
240+"\n"
241+" %s\n"
242+" "
243+""
244+
245+#. module: msf_doc_import
246+#: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:313
247+#, python-format
248+msgid "An unknow error occured, please contact the support team. Error message: %s"
249+msgstr "Une erreur inconnue est survenue, veuillez contacter votre équipe support. Message d'erreur : %s"
250+>>>>>>> MERGE-SOURCE

Subscribers

People subscribed via source and target branches

to all changes: