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

[jftempo]

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2016-08-23 12:54:03 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2016-11-10 16:13:50 +0000
@@ -25,14 +25,19 @@
 import base64
 import time
 import xml.etree.ElementTree as ET
+from lxml import etree
+from lxml.etree import XMLSyntaxError
 import logging
+import os
 
 from mx import DateTime
 
+
 # Server imports
 from osv import osv
 from osv import fields
 from tools.translate import _
+import tools
 
 # Addons imports
 from msf_order_date import TRANSPORT_TYPE
@@ -343,10 +348,27 @@
                 if not excel_file.getWorksheets():
                     raise osv.except_osv(_('Error'), _('The given file is not a valid Excel 2003 Spreadsheet file !'))
             else:
-                xml_file = base64.decodestring(wiz.file_to_import)
-                root = ET.fromstring(xml_file)
-                if root.tag != 'data':
-                    raise osv.except_osv(_('Error'), _('The given file is not a valid XML file !'))
+                try:
+                    xml_file = base64.decodestring(wiz.file_to_import)
+                    dtd_path = os.path.join(tools.config['root_path'], 'tools/import_po.dtd')
+                    dtd = etree.DTD(dtd_path)
+                    tree = etree.fromstring(xml_file)
+                except XMLSyntaxError as ex:
+                    raise osv.except_osv(_('Error'), _('The given file is not a valid XML file !\nTechnical details:\n%s') % str(ex))
+
+                if not dtd.validate(tree):
+                    # build error message:
+                    error_msg = ""
+                    for line_obj in dtd.error_log.filter_from_errors():
+                        line = str(line_obj)
+                        err_line = line.split(':')[1]
+                        err_str = line.split(':')[-1]
+                        err_type = line.split(':')[5]
+                        if err_type != 'DTD_UNKNOWN_ELEM':
+                            continue
+                        error_msg += "Line %s: The tag '%s' is not supported\n" % (err_line, err_str.split()[-1])
+
+                    raise osv.except_osv(_('Error'), _("The given XML file is not structured as expected in the DTD:\n %s") % error_msg)
 
         self.write(cr, uid, ids, {'state': 'simu_progress'}, context=context)
         cr.commit()

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2016-10-25 09:13:52 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2016-11-10 16:13:50 +0000
@@ -74689,3 +74689,20 @@
 msgid "You can't search on this object without using at least one exact search term (precede your search with the character '=')."
 msgstr "Vous ne pouvez pas exécuter de recherche sur cet objet sans utiliser au moins une recherche exacte (ajoutez le caractère = devant votre filtre)."
 
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:357
+#, python-format
+msgid "The given file is not a valid XML file !\n"
+"Technical details:\n"
+"%s"
+msgstr "Le fichier XML n'est pas valide.\n"
+"Détails techniques:\n"
+"%s"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:371
+#, python-format
+msgid "The given XML file is not structured as expected in the DTD:\n"
+" %s"
+msgstr "La structure du fichier XML ne respecte pas la déclaration DTD:\n"
+" %s"
\ No newline at end of file

=== added file 'bin/tools/import_po.dtd'
--- bin/tools/import_po.dtd	1970-01-01 00:00:00 +0000
+++ bin/tools/import_po.dtd	2016-11-10 16:13:50 +0000
@@ -0,0 +1,7 @@
+<!ELEMENT data (record+)>
+<!ELEMENT record (field+)>
+<!ELEMENT field ANY>
+<!ATTLIST record key CDATA #IMPLIED>
+<!ATTLIST record model CDATA #IMPLIED>
+<!ATTLIST field name CDATA #REQUIRED>
+<!ATTLIST field key CDATA #IMPLIED>