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
=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_fo_line.py'
--- bin/addons/msf_doc_import/wizard/wizard_import_fo_line.py 2016-08-18 14:36:26 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_fo_line.py 2016-09-07 16:39:15 +0000
@@ -25,6 +25,7 @@
25import base6425import base64
26from spreadsheet_xml.spreadsheet_xml import SpreadsheetXML26from spreadsheet_xml.spreadsheet_xml import SpreadsheetXML
27import time27import time
28import tools
28from msf_doc_import import check_line29from msf_doc_import import check_line
29from msf_doc_import.wizard import FO_LINE_COLUMNS_FOR_IMPORT as columns_for_fo_line_import30from msf_doc_import.wizard import FO_LINE_COLUMNS_FOR_IMPORT as columns_for_fo_line_import
3031
@@ -113,10 +114,12 @@
113 header_error = False114 header_error = False
114 if header_row:115 if header_row:
115 for i, h_name in enumerate(columns_for_fo_line_import):116 for i, h_name in enumerate(columns_for_fo_line_import):
116 if len(header_row) > i and str(header_row[i]) != h_name:117 tr_header_row = _(tools.ustr(header_row[i]))
118 tr_h_name = _(h_name)
119 if len(header_row) > i and tr_header_row != tr_h_name:
117 header_error = True120 header_error = True
118 if str(header_row[i]).upper() == h_name.upper():121 if tr_header_row.upper() == tr_h_name.upper():
119 error_list.append(_("\n\tPlease check spelling on column '%s'.") % header_row[i])122 error_list.append(_("\n\tPlease check spelling on column '%s'.") % tr_header_row)
120123
121 if header_error:124 if header_error:
122 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)125 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)
@@ -127,8 +130,8 @@
127 lines_to_correct = check_line.check_lines_currency(rows,130 lines_to_correct = check_line.check_lines_currency(rows,
128 currency_index, order_currency_code)131 currency_index, order_currency_code)
129 if lines_to_correct > 0:132 if lines_to_correct > 0:
130 msg = "You can not import this file because it contains" \133 msg = _("You can not import this file because it contains" \
131 " line(s) with currency (Column G) not of the order currency (%s)" % (134 " line(s) with currency (Column G) not of the order currency (%s)") % (
132 order_currency_code, )135 order_currency_code, )
133 error_list.append(msg)136 error_list.append(msg)
134137
@@ -288,7 +291,7 @@
288 if error_log:291 if error_log:
289 error_log = _("Reported errors for ignored lines : \n") + error_log292 error_log = _("Reported errors for ignored lines : \n") + error_log
290 end_time = time.time()293 end_time = time.time()
291 total_time = str(round(end_time-start_time)) + _(' second(s)')294 total_time = tools.ustr(round(end_time-start_time)) + _(' second(s)')
292 final_message = _('''295 final_message = _('''
293 %s296 %s
294 Importation completed in %s!297 Importation completed in %s!
@@ -307,7 +310,7 @@
307 # we reset the state of the FO to draft (initial state)310 # we reset the state of the FO to draft (initial state)
308 except Exception as e:311 except Exception as e:
309 self.write(cr, uid, ids, {312 self.write(cr, uid, ids, {
310 'message': _('An unknow error occured, please contact the support team. Error message: %s') % str(e),313 'message': _('An unknow error occured, please contact the support team. Error message: %s') % tools.ustr(e),
311 'state': 'done',314 'state': 'done',
312 }, context=context)315 }, context=context)
313 finally:316 finally:
314317
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po 2016-09-06 14:18:54 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po 2016-09-07 16:39:15 +0000
@@ -60404,9 +60404,9 @@
60404msgstr "La Commande doit être unique ou plus grande que 1!"60404msgstr "La Commande doit être unique ou plus grande que 1!"
6040560405
60406#. module: msf_doc_import60406#. module: msf_doc_import
60407#: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:24060407#: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:294
60408#: code:addons/msf_doc_import/wizard/wizard_import_ir_line.py:22860408#: code:addons/msf_doc_import/wizard/wizard_import_ir_line.py:267
60409#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:24660409#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:326
60410#: code:addons/msf_doc_import/wizard/wizard_import_tender_line.py:19160410#: code:addons/msf_doc_import/wizard/wizard_import_tender_line.py:191
60411#, python-format60411#, python-format
60412msgid " second(s)"60412msgid " second(s)"
@@ -74416,9 +74416,176 @@
74416#, python-format74416#, python-format
74417msgid "The column '%s' is not present in the file."74417msgid "The column '%s' is not present in the file."
74418msgstr "La colonne '%s' n'est pas présente dans le fichier."74418msgstr "La colonne '%s' n'est pas présente dans le fichier."
74419<<<<<<< TREE
7441974420
74420#. module: msf_doc_import74421#. module: msf_doc_import
74421#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:16674422#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:166
74422#, python-format74423#, python-format
74423msgid "Line seemed empty, so this line was ignored"74424msgid "Line seemed empty, so this line was ignored"
74424msgstr "La ligne semblait vide, donc cette ligne a été ignorée"74425msgstr "La ligne semblait vide, donc cette ligne a été ignorée"
74426=======
74427
74428#. module: msf_doc_import
74429#: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:90
74430#: code:addons/msf_doc_import/wizard/wizard_import_ir_line.py:87
74431#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:97
74432#, python-format
74433msgid "Order currency not found!"
74434msgstr "Devise de la commande non trouvée !"
74435
74436#. module: msf_doc_import
74437#: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:122
74438#, python-format
74439msgid "\n"
74440" Please check spelling on column '%s'."
74441msgstr "\n"
74442" Veuillez vérifier le nom de la colonne '%s'."
74443
74444#. module: msf_doc_import
74445#: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:125
74446#, python-format
74447msgid "\n"
74448" You can not import this file because the header of columns doesn't match with the expected headers: %s"
74449msgstr "\n"
74450" Vous ne pouvez pas importer ce fichier car les entêtes de colonnes ne correspondent aux entêtes attendues : %s"
74451
74452#. module: msf_doc_import
74453#: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:127
74454#, python-format
74455msgid "\n"
74456" Please ensure that all these columns are present and in this exact order."
74457msgstr "\n"
74458" Veuillez vous assurer que toutes ces colonnes sont présentes exactement dans cet ordre."
74459
74460#. module: msf_doc_import
74461#: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:133
74462#, python-format
74463msgid "You can not import this file because it contains line(s) with currency (Column G) not of the order currency (%s)"
74464msgstr "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)"
74465
74466#. module: msf_doc_import
74467#: code:addons/msf_doc_import/wizard/wizard_import_auto_supply_line.py:119
74468#: code:addons/msf_doc_import/wizard/wizard_import_order_cycle_line.py:120
74469#: code:addons/msf_doc_import/wizard/wizard_import_picking_line.py:138
74470#: code:addons/msf_doc_import/wizard/wizard_import_product_list.py:127
74471#: code:addons/msf_doc_import/wizard/wizard_import_stock_warehouse_order_point_line.py:141
74472#: code:addons/msf_doc_import/wizard/wizard_import_threshold_value_line.py:124
74473#, python-format
74474msgid "Line %s in the Excel file: You should have exactly %s columns in this order: %s \n"
74475""
74476msgstr "Ligne %s du fichier Excel : Vous devez avoir exactement %s colonnes dans cet order : %s \n"
74477""
74478
74479#. module: msf_doc_import
74480#: code:addons/msf_doc_import/wizard/wizard_import_auto_supply_line.py:175
74481#: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:210
74482#: code:addons/msf_doc_import/wizard/wizard_import_ir_line.py:201
74483#: code:addons/msf_doc_import/wizard/wizard_import_order_cycle_line.py:172
74484#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:214
74485#: code:addons/msf_doc_import/wizard/wizard_import_stock_warehouse_order_point_line.py:204
74486#: code:addons/msf_doc_import/wizard/wizard_import_tender_line.py:155
74487#: code:addons/msf_doc_import/wizard/wizard_import_threshold_value_line.py:183
74488#: code:addons/msf_doc_import/wizard/wizard_import_threshold_value_line.py:190
74489#, python-format
74490msgid "Line %s in the Excel file: %s\n"
74491""
74492msgstr "Ligne %s du fichier Excel : %s\n"
74493
74494#. module: msf_doc_import
74495#: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:244
74496#: code:addons/msf_doc_import/wizard/wizard_import_ir_line.py:223
74497#: code:addons/msf_doc_import/wizard/wizard_import_picking_line.py:261
74498#, python-format
74499msgid "Line %s in the Excel file was ignored. Details: %s"
74500msgstr "Ligne %s du fichier Excel a été ignorée. Détails : %s"
74501
74502#. module: msf_doc_import
74503#: code:addons/msf_doc_import/wizard/wizard_import_auto_supply_line.py:178
74504#: code:addons/msf_doc_import/wizard/wizard_import_stock_warehouse_order_point_line.py:206
74505#, python-format
74506msgid "Product Qty should be greater than 0.00"
74507msgstr "Quantité de produit doit être supérieure à 0,00"
74508
74509#. module: msf_doc_import
74510#: code:addons/msf_doc_import/wizard/wizard_import_auto_supply_line.py:223
74511#: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:292
74512#: code:addons/msf_doc_import/wizard/wizard_import_ir_line.py:265
74513#: code:addons/msf_doc_import/wizard/wizard_import_order_cycle_line.py:212
74514#: code:addons/msf_doc_import/wizard/wizard_import_picking_line.py:314
74515#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:323
74516#: code:addons/msf_doc_import/wizard/wizard_import_product_list.py:217
74517#: code:addons/msf_doc_import/wizard/wizard_import_stock_warehouse_order_point_line.py:268
74518#: code:addons/msf_doc_import/wizard/wizard_import_supplier_catalogue.py:407
74519#: code:addons/msf_doc_import/wizard/wizard_import_tender_line.py:213
74520#: code:addons/msf_doc_import/wizard/wizard_import_threshold_value_line.py:233
74521#, python-format
74522msgid "Reported errors for ignored lines : \n"
74523""
74524msgstr "Erreurs reportées pour les lignes ignorées : \n"
74525""
74526
74527#. module: msf_doc_import
74528#: code:addons/msf_doc_import/wizard/wizard_import_auto_supply_line.py:225
74529#: code:addons/msf_doc_import/wizard/wizard_import_order_cycle_line.py:214
74530#: code:addons/msf_doc_import/wizard/wizard_import_picking_line.py:316
74531#: code:addons/msf_doc_import/wizard/wizard_import_product_list.py:219
74532#: code:addons/msf_doc_import/wizard/wizard_import_stock_warehouse_order_point_line.py:270
74533#: code:addons/msf_doc_import/wizard/wizard_import_supplier_catalogue.py:408
74534#: code:addons/msf_doc_import/wizard/wizard_import_threshold_value_line.py:235
74535#, python-format
74536msgid " second(s)"
74537msgstr " seconde(s)"
74538
74539#. module: msf_doc_import
74540#: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:295
74541#, python-format
74542msgid "\n"
74543" %s\n"
74544" Importation completed in %s!\n"
74545"# of imported lines : %s on %s lines\n"
74546"# of ignored lines: %s\n"
74547"# of lines to correct: %s\n"
74548" %s\n"
74549"\n"
74550" %s\n"
74551" "
74552msgstr "\n"
74553" %s\n"
74554" Importation terminée en %s!\n"
74555"# de lignes importées : %s sur %s lignes\n"
74556"# de lignes ignorées : %s\n"
74557"# de lignes à corriger : %s\n"
74558" %s\n"
74559"\n"
74560" %s\n"
74561" "
74562
74563#. module: msf_doc_import
74564#: code:addons/msf_doc_import/wizard/wizard_import_picking_line.py:317
74565#, python-format
74566msgid " \n"
74567" Importation completed in %s!\n"
74568" # of imported lines : %s on %s lines\n"
74569" # of ignored lines: %s\n"
74570" # of lines to correct: %s\n"
74571" %s\n"
74572"\n"
74573" %s\n"
74574" "
74575msgstr " \n"
74576" Importation terminée en %s!\n"
74577" # de lignes importées : %s sur %s lignes\n"
74578" # de lignes ignorées : %s\n"
74579" # de lignes à corriger : %s\n"
74580" %s\n"
74581"\n"
74582" %s\n"
74583" "
74584""
74585
74586#. module: msf_doc_import
74587#: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:313
74588#, python-format
74589msgid "An unknow error occured, please contact the support team. Error message: %s"
74590msgstr "Une erreur inconnue est survenue, veuillez contacter votre équipe support. Message d'erreur : %s"
74591>>>>>>> MERGE-SOURCE

Subscribers

People subscribed via source and target branches

to all changes: