Merge lp:~fabien-morin/unifield-server/fm-us-2339-new into lp:unifield-server

[jftempo]

[lp:~fabien-morin/unifield-server/fm-us-2339-new]

4206. By Fabien MORIN on 2017-02-21

US-2339 [FIX] no need to parse two times the same xml document

4207. By Fabien MORIN on 2017-02-21

US-2339 [MERGE] with latest trunk

4208. By Fabien MORIN on 2017-02-21

US-2339 [FIX] revert us-2374 as it breaks the AIO generation

4209. By Fabien MORIN on 2017-02-21

US-2339 [IMP] avoid crashing by ensuring name and sheet_name cannot be None

4210. By Fabien MORIN on 2017-02-21

US-2339 [ADD] translation for the Sheet name

4211. By Fabien MORIN on 2017-02-21

US-2339 [FIX] if xml is modified in any of this two check :
- worksheet name
- malformed data
the modified xml should be returned.
If not modified, return the original xml

4212. By Fabien MORIN on 2017-02-21

US-2339 [FIX] getiterator is depreciated since long time, use iter instead
[FIX] iter (and getiterator now) cannot be restricted by
receiving a QName object but only (from
http://lxml.de/api/lxml.etree._Element-class.html#iter)
"Can be restricted to find only elements with a specific tag: pass
"{ns}localname" as tag. Either or both of ns and localname can be * for a
wildcard; ns can be empty for no namespace. "localname" is equivalent to
"{}localname" (i.e. no namespace) but "*" is "{*}*" (any or no namespace), not
"{}*".

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2017-02-20 16:10:18 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2017-02-21 15:07:51 +0000
@@ -76441,3 +76441,10 @@
 #, python-format
 msgid "No journal found to book the reversal FX entry."
 msgstr "Pas de journal trouvé pour enregistrer l'annulation de l'écriture de différence de change."
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:435
+#: code:addons/report_webkit/webkit_report.py:466
+#, python-format
+msgid "Sheet 1"
+msgstr "Feuille 1"
 
=== modified file 'bin/addons/report_webkit/webkit_report.py'
--- bin/addons/report_webkit/webkit_report.py	2017-02-09 13:41:23 +0000
+++ bin/addons/report_webkit/webkit_report.py	2017-02-21 15:07:51 +0000
@@ -423,6 +423,26 @@
 
         return result
 
+    def sanitizeWorksheetName(self, name):
+        '''
+        according to microsoft documentation :
+        https://msdn.microsoft.com/en-us/library/office/aa140066(v=office.10).aspx#odc_xmlss_ss:worksheet
+        The following caracters are not allowed : /, \, ?, *, [, ]
+        It also seems that microsoft excel do not accept Worksheet name longer
+        than 31 characters.
+        '''
+        if not name:
+            return _('Sheet 1')
+        replacement_char = '-'
+        not_allowed_char_list = ['/', '\\', '?', '*', '[', ']']
+        new_name = name
+        if set(new_name).intersection(not_allowed_char_list):
+            for char in not_allowed_char_list:
+                if char in new_name:
+                    new_name = new_name.replace(char, replacement_char)
+
+        return new_name[:31]
+
     def check_malformed_xml_spreadsheet(self, xml_string, report_name):
         '''Check that the xml spreadsheet doesn't contain
         node <Date ss:Type="DateTime"> with 'False' in the values
@@ -431,10 +451,37 @@
         logger = logging.getLogger('mako_spreadsheet')
         file_dom = etree.fromstring(xml_string)
         namespaces = {
+            'o': 'urn:schemas-microsoft-com:office:office',
+            'x': 'urn:schemas-microsoft-com:office:excel',
             'ss': 'urn:schemas-microsoft-com:office:spreadsheet',
-            'spreadsheet': 'urn:schemas-microsoft-com:office:spreadsheet'
+            'html': 'http://www.w3.org/TR/REC-html40'
         }
-        data_time_elements = file_dom.xpath('//spreadsheet:Data[@ss:Type="DateTime"]',
+
+        spreadsheet_elements = file_dom.xpath('//ss:Worksheet',
+                                            namespaces=namespaces)
+
+        xml_modified = False
+        sheet_name_dict = {}
+        count = 0
+        for sheet in spreadsheet_elements:
+            sheet_name = sheet.get('{%(ss)s}Name' % namespaces, _('Sheet 1'))
+            new_name = self.sanitizeWorksheetName(sheet_name)
+            if new_name != sheet_name:
+                # if the sheet name already exists, modify it to add
+                # a counter to the name
+                if new_name in sheet_name_dict:
+                    sheet_name_dict[new_name] += 1
+                    count = sheet_name_dict[new_name]
+                    new_name = '%s_%s' % (new_name[:28], count)
+                else:
+                    sheet_name_dict[new_name] = 1
+                sheet.attrib['{urn:schemas-microsoft-com:office:spreadsheet}Name'] = new_name
+                xml_modified = True
+            else:
+                if new_name not in sheet_name_dict:
+                    sheet_name_dict[new_name] = 1
+
+        data_time_elements = file_dom.xpath('//ss:Data[@ss:Type="DateTime"]',
                                             namespaces=namespaces)
         element_to_remove = []
         for element in data_time_elements:
@@ -446,7 +493,8 @@
             # if a malformed node exists, replace it with an empty String cell
             element.attrib['{urn:schemas-microsoft-com:office:spreadsheet}Type'] = 'String'
             element.text = ''
-        if element_to_remove:
+            xml_modified = True
+        if xml_modified:
             # return modified xml
             return etree.tostring(file_dom, xml_declaration=True, encoding="utf-8")
         return xml_string
 
=== modified file 'bin/addons/spreadsheet_xml/spreadsheet_xml.py'
--- bin/addons/spreadsheet_xml/spreadsheet_xml.py	2016-08-26 10:10:58 +0000
+++ bin/addons/spreadsheet_xml/spreadsheet_xml.py	2017-02-21 15:07:51 +0000
@@ -137,7 +137,7 @@
 
     def getRows(self,worksheet=1):
         table = self.xmlobj.xpath('//ss:Worksheet[%d]/ss:Table[1]'%(worksheet, ), **self.xa)
-        return SpreadsheetRow(table[0].getiterator(etree.QName(self.defaultns, 'Row')))
+        return SpreadsheetRow(table[0].iter('{%s}Row' % self.defaultns))
 
     def enc(self, s):
         if isinstance(s, unicode):
 
=== modified file 'bin/addons/sync_client/backup.py'
--- bin/addons/sync_client/backup.py	2017-02-16 15:52:37 +0000
+++ bin/addons/sync_client/backup.py	2017-02-21 15:07:51 +0000
@@ -76,12 +76,12 @@
         return 'UNKNOWN_VERSION'
 
     def _set_pg_psw_env_var(self):
-        if tools.config['db_password'] and not os.environ.get('PGPASSWORD', ''):
+        if os.name == 'nt' and not os.environ.get('PGPASSWORD', ''):
             os.environ['PGPASSWORD'] = tools.config['db_password']
             self._pg_psw_env_var_is_set = True
 
     def _unset_pg_psw_env_var(self):
-        if self._pg_psw_env_var_is_set:
+        if os.name == 'nt' and self._pg_psw_env_var_is_set:
             os.environ['PGPASSWORD'] = ''
 
     def exp_dump_for_state(self, cr, uid, state, context=None, force=False):
 
=== modified file 'bin/tools/misc.py'
--- bin/tools/misc.py	2017-02-17 15:44:19 +0000
+++ bin/tools/misc.py	2017-02-21 15:07:51 +0000
@@ -142,7 +142,7 @@
         return None
 
 def _set_env_pg(remove=False):
-    if config['db_password']:
+    if os.name == 'nt':
         if not remove and not os.environ.get('PGPASSWORD', ''):
             os.environ['PGPASSWORD'] = config['db_password']
         if remove and os.environ.get('PGPASSWORD'):
 
=== modified file 'setup.py'
--- setup.py	2017-02-16 15:52:37 +0000
+++ setup.py	2017-02-21 15:07:51 +0000
@@ -58,7 +58,7 @@
             "packages": [
                 "lxml", "lxml.builder", "lxml._elementpath", "lxml.etree",
                 "lxml.objectify", "decimal", "xml", "xml", "xml.dom",
-                "encodings", "dateutil", "wizard", "PIL", "pyparsing",
+                "encodings", "dateutil", "wizard", "pychart", "PIL", "pyparsing",
                 "pydot", "asyncore","asynchat", "reportlab", "vobject",
                 "HTMLParser", "select", "mako", "poplib",
                 "imaplib", "smtplib", "email", "yaml", "DAV",
@@ -240,18 +240,18 @@
       },
       package_dir      = find_package_dirs(),
       install_requires = [
-          'lxml==2.2.4',
-          'mako==0.2.5',
-          'python-dateutil==2.5.3',
-          'psycopg2==2.0.13',
-          'pydot==1.0.2',
-          'pytz==2010b0',
-          'reportlab==2.4',
-          'pyyaml==3.12',
-          'egenix-mx-base==3.2.9',
-          'passlib==1.6.5',
-          'bcrypt==3.1.1',
-          'xlwt==1.1.2',
+          'lxml',
+          'mako',
+          'python-dateutil',
+          'psycopg2',
+          'pychart',
+          'pydot',
+          'pytz',
+          'reportlab',
+          'caldav',
+          'pyyaml',
+          'pywebdav',
+          'feedparser',
       ],
       extras_require={
           'SSL' : ['pyopenssl'],
 
=== modified file 'setup_py2exe_custom.py'
--- setup_py2exe_custom.py	2017-02-16 15:52:37 +0000
+++ setup_py2exe_custom.py	2017-02-21 15:07:51 +0000
@@ -24,25 +24,7 @@
 
 import os
 import tempfile
-import sys
-
-if sys.platform == 'nt':
-    from py2exe.build_exe import py2exe as build_exe, fancy_split
-else:
-    # fake it for non-Windows, so that setup.py can be run for
-    # installing dependencies.
-    class _be(dict):
-        def __init__(self, arg1,arg2,arg3):
-            pass
-        def __dir__(self):
-            return tuple(self)
-        def __getattribute__(self, name):
-            if name == 'user_options':
-                return []
-            else:
-                raise AttributeError(name)
-    build_exe = _be(1, 2, 3)
-    fancy_split = None
+from py2exe.build_exe import py2exe as build_exe, fancy_split
 
 def fixup_data_pytz_zoneinfo():
     r = {}
@@ -54,8 +36,8 @@
     return r.items()
 
 def byte_compile_noop(py_files, optimize=0, force=0,
-                      target_dir=None, verbose=1, dry_run=0,
-                      direct=None):
+                 target_dir=None, verbose=1, dry_run=0,
+                 direct=None):
 
     compiled_files = []
     from distutils.dir_util import mkpath
@@ -177,11 +159,11 @@
         # Run fake compilation - just copy raw .py file into their
         # destination directory
         self.no_compiled_files = byte_compile_noop(py_files,
-                                                   target_dir=self.collect_dir,
-                                                   optimize=self.optimize,
-                                                   force=0,
-                                                   verbose=self.verbose,
-                                                   dry_run=self.dry_run)
+                                           target_dir=self.collect_dir,
+                                           optimize=self.optimize,
+                                           force=0,
+                                           verbose=self.verbose,
+                                           dry_run=self.dry_run)
 
         # Force relocate of specific packages data within collected libs dir
         def fixup_location(l):