*: support Py3 in delivery printouts WIP 🚧

bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_getDataDict.py

+import six
 translateString = context.Base_translateString
 portal = context.getPortalObject()
 portal_preferences = portal.portal_preferences
@@ -61,9 +62,11 @@ def getPrototype():
   return None
 
 def unicodeDict(d):
-  for k, v in d.items():
+  if six.PY3:
+    return d
+  for k, v in six.iteritems(d):
     if isinstance(v, str):
-      d.update({k:unicode(v, 'utf8')})
+      d.update({k: unicode(v, 'utf8')})
   return d
 
 data_dict = {

bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.py

 # coding: utf-8
+import six
 portal = context.getPortalObject()
 translateString = portal.Base_translateString
 request = context.REQUEST
@@ -110,9 +111,11 @@ total_tax_price = 0.0
 number_line_not_tax = 0
 
 def unicodeDict(d):
-  for k, v in d.items():
+  if six.PY3:
+    return d
+  for k, v in six.iteritems(d):
     if isinstance(v, str):
-      d.update({k:unicode(v, 'utf8')})
+      d.update({k: unicode(v, 'utf8')})
   return d
 
 

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.py

+import six
 translateString = context.Base_translateString
 
 
@@ -110,9 +111,11 @@ line_list = []
 total_price = 0.0
 
 def unicodeDict(d):
-  for k, v in d.items():
+  if six.PY3:
+    return d
+  for k, v in six.iteritems(d):
     if isinstance(v, str):
-      d.update({k:unicode(v, 'utf8')})
+      d.update({k: unicode(v, 'utf8')})
   return d
 
 line_list = context.PaySheetTransaction_getLineListAsDict()

bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.py

+import six
 portal = context.getPortalObject()
 translateString = portal.Base_translateString
 request = context.REQUEST
@@ -166,9 +167,11 @@ year_to_date_taxable_net_salary = paysheet.PaySheetTransaction_getYearToDateSlic
     'base_contribution/base_amount/payroll/base/income_tax')
 
 def unicodeDict(d):
-  for k, v in d.items():
+  if six.PY3:
+    return d
+  for k, v in six.iteritems(d):
     if isinstance(v, str):
-      d.update({k:unicode(v, 'utf8')})
+      d.update({k: unicode(v, 'utf8')})
   return d
 
 source_section = paysheet.getSourceSectionValue()