Unifield Server

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

  1. us-1659
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 3962
Proposed branch: lp:~unifield-team/unifield-server/us-1659
Merge into: lp:unifield-server
Diff against target: 30 lines (+12/-0)
2 files modified
bin/addons/msf_doc_import/wizard/wizard_import_batch.py (+6/-0)
bin/addons/msf_profile/i18n/fr_MF.po (+6/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1659
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+304984@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_batch.py'
2--- bin/addons/msf_doc_import/wizard/wizard_import_batch.py 2016-08-15 11:49:05 +0000
3+++ bin/addons/msf_doc_import/wizard/wizard_import_batch.py 2016-09-06 09:22:09 +0000
4@@ -161,6 +161,12 @@
5 save_error(errors)
6 continue
7
8+ if all(not x for x in line_data):
9+ save_warnings(
10+ _('Line seemed empty, so this line was ignored')
11+ )
12+ continue
13+
14 # Product
15 product_id = None
16 try:
17
18=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
19--- bin/addons/msf_profile/i18n/fr_MF.po 2016-08-18 14:36:26 +0000
20+++ bin/addons/msf_profile/i18n/fr_MF.po 2016-09-06 09:22:09 +0000
21@@ -74416,3 +74416,9 @@
22 #, python-format
23 msgid "The column '%s' is not present in the file."
24 msgstr "La colonne '%s' n'est pas présente dans le fichier."
25+
26+#. module: msf_doc_import
27+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:166
28+#, python-format
29+msgid "Line seemed empty, so this line was ignored"
30+msgstr "La ligne semblait vide, donc cette ligne a été ignorée"

Subscribers

People subscribed via source and target branches

to all changes: