*: don't use `unicode` in page templates

page templates unicode resolver already takes care of coercing when
needed and this is directly compatible with python2 and python3
Co-authored-by: Kazuhiko SHIOZAKI <kazuhiko@nexedi.com>

bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewAsODT.oot

@@ -352,7 +352,7 @@
                         <table:table-column table:style-name="Table2.E1.1"/>
                         <table:table-column table:style-name="Table2.E1.2"/>
                         <table:table-row table:style-name="Table2.E1.1">
-                          <table:table-cell table:style-name='Table2.A1' office:value-type='string' tal:define='orig_string string:Invoice Number; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                          <table:table-cell table:style-name='Table2.A1' office:value-type='string' tal:define='orig_string string:Invoice Number; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                             <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                             <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                           </table:table-cell>
@@ -363,7 +363,7 @@
                         <table:table-row table:style-name="Table2.E1.1">
                           <table:table-cell table:style-name='Table2.E1.1.2'
                                             office:value-type='string'
-                                            tal:define='orig_string string:Document Date; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                                            tal:define='orig_string string:Document Date; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                             <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                             <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                           </table:table-cell>
@@ -372,7 +372,7 @@
                           </table:table-cell>
                         </table:table-row>
                         <table:table-row table:style-name='Table2.E1.1'>
-                          <table:table-cell table:style-name='Table2.E1.1.2' office:value-type='string' tal:define='orig_string string:Currency; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                          <table:table-cell table:style-name='Table2.E1.1.2' office:value-type='string' tal:define='orig_string string:Currency; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                             <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                             <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                           </table:table-cell>
@@ -385,7 +385,7 @@
                   </table:table-row>
                 </table:table-header-rows>               
                 <table:table-row table:style-name='Table2'>
-                  <table:table-cell table:style-name='Table2.E1.1.2' office:value-type='string' tal:define='orig_string string:Ship From; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                  <table:table-cell table:style-name='Table2.E1.1.2' office:value-type='string' tal:define='orig_string string:Ship From; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                     <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                     <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                   </table:table-cell>
@@ -397,7 +397,7 @@
                             tal:condition="data_dict/source_vatid"
                             tal:content='python:data_dict["source_vatid"]'>vat id</text:p>
                   </table:table-cell>
-                  <table:table-cell table:style-name='Table2.E1.1.2' office:value-type='string' tal:define='orig_string string:Ship To; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                  <table:table-cell table:style-name='Table2.E1.1.2' office:value-type='string' tal:define='orig_string string:Ship To; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                     <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                     <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                   </table:table-cell>
@@ -414,7 +414,7 @@
                       <table:table-column table:style-name='Table2.E1.1'/>
                       <table:table-column table:style-name='Table2.E1.2'/>
                       <table:table-row table:style-name='Table2.E1.1'>
-                        <table:table-cell table:style-name='Table2.E1.1.2' office:value-type='string' tal:define='orig_string string:Payment; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                        <table:table-cell table:style-name='Table2.E1.1.2' office:value-type='string' tal:define='orig_string string:Payment; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                           <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                           <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                         </table:table-cell>
@@ -423,7 +423,7 @@
                         </table:table-cell>
                       </table:table-row>
                       <table:table-row table:style-name='Table2.E1.1'>
-                        <table:table-cell table:style-name='Table2.E1.1.2' office:value-type='string' tal:define='orig_string string:Delivery Mode; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                        <table:table-cell table:style-name='Table2.E1.1.2' office:value-type='string' tal:define='orig_string string:Delivery Mode; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                           <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                           <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                         </table:table-cell>
@@ -432,7 +432,7 @@
                         </table:table-cell>
                       </table:table-row>
                       <table:table-row table:style-name='Table2.E1.1'>
-                        <table:table-cell table:style-name='Table2.E1.1.2' office:value-type='string' tal:define='orig_string string:Incoterm; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                        <table:table-cell table:style-name='Table2.E1.1.2' office:value-type='string' tal:define='orig_string string:Incoterm; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                           <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                           <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                         </table:table-cell>
@@ -457,39 +457,39 @@
             <table:covered-table-cell/>
           </table:table-row>
           <table:table-row>
-            <table:table-cell table:style-name='Table1.A2' office:value-type='string' tal:define='orig_string string:Line; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Table1.A2' office:value-type='string' tal:define='orig_string string:Line; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Table1.A2' office:value-type='string' tal:define='orig_string string:Your Item No.; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Table1.A2' office:value-type='string' tal:define='orig_string string:Your Item No.; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Table1.A2' office:value-type='string' tal:define='orig_string string:Our Item No.; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Table1.A2' office:value-type='string' tal:define='orig_string string:Our Item No.; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Table1.A2' office:value-type='string' tal:define='orig_string string:Description; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Table1.A2' office:value-type='string' tal:define='orig_string string:Description; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Table1.A2' office:value-type='string' tal:define='orig_string string:Quantity; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Table1.A2' office:value-type='string' tal:define='orig_string string:Quantity; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Table1.A2' office:value-type='string' tal:define='orig_string string:Unit; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Table1.A2' office:value-type='string' tal:define='orig_string string:Unit; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Table1.A2' office:value-type='string' tal:define='orig_string string:Tax Code; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Table1.A2' office:value-type='string' tal:define='orig_string string:Tax Code; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Table1.A2' office:value-type='string' tal:define='orig_string string:Unit Price; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Table1.A2' office:value-type='string' tal:define='orig_string string:Unit Price; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Table1.A2' office:value-type='string' tal:define='orig_string string:Total Price; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Table1.A2' office:value-type='string' tal:define='orig_string string:Total Price; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
@@ -611,7 +611,7 @@
                 <table:table-cell table:style-name="Table3.A1" office:value-type="string">
                   <text:p text:style-name="Table_20_Contents"/>
                 </table:table-cell>
-                <table:table-cell table:style-name="Table3.D2" table:number-columns-spanned="3" office:value-type='string' tal:define='orig_string string:Total Excluding Tax; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                <table:table-cell table:style-name="Table3.D2" table:number-columns-spanned="3" office:value-type='string' tal:define='orig_string string:Total Excluding Tax; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                   <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                   <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>  
                 </table:table-cell>
@@ -650,19 +650,19 @@
                 <table:table-cell table:style-name="Table3.A1" office:value-type="string">
                   <text:p text:style-name="Table_20_Contents"/>
                 </table:table-cell>
-                <table:table-cell table:style-name='Table3.D4' office:value-type='string' tal:define='orig_string string:Tax Code; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                <table:table-cell table:style-name='Table3.D4' office:value-type='string' tal:define='orig_string string:Tax Code; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                   <text:p text:style-name='P9'><span tal:replace='orig_message'/></text:p>
                   <text:p text:style-name='P9' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
                 </table:table-cell>
-                <table:table-cell table:style-name='Table3.D4' office:value-type='string' tal:define='orig_string string:Amount; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                <table:table-cell table:style-name='Table3.D4' office:value-type='string' tal:define='orig_string string:Amount; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                   <text:p text:style-name='P8'><span tal:replace='orig_message'/></text:p>
                   <text:p text:style-name='P8' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
                 </table:table-cell>
-                <table:table-cell table:style-name='Table3.D4' office:value-type='string' tal:define='orig_string string:Rate; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                <table:table-cell table:style-name='Table3.D4' office:value-type='string' tal:define='orig_string string:Rate; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                   <text:p text:style-name='P8'><span tal:replace='orig_message'/></text:p>
                   <text:p text:style-name='P8' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
                 </table:table-cell>
-                <table:table-cell table:style-name='Table3.D4' office:value-type='string' tal:define='orig_string string:Tax Price; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                <table:table-cell table:style-name='Table3.D4' office:value-type='string' tal:define='orig_string string:Tax Price; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                   <text:p text:style-name='P8'><span tal:replace='orig_message'/></text:p>
                   <text:p text:style-name='P8' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
                 </table:table-cell>
@@ -748,7 +748,7 @@
                 <table:table-cell table:style-name="Table3.G8">
                   <text:p text:style-name="Table_20_Contents_20_Right"/>
                 </table:table-cell>
-                <table:table-cell table:style-name="Table3.D2" table:number-columns-spanned="3" office:value-type='string' tal:define='orig_string string:Total Including VAT; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                <table:table-cell table:style-name="Table3.D2" table:number-columns-spanned="3" office:value-type='string' tal:define='orig_string string:Total Including VAT; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                   <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/> :</text:p>
                   <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>  
                 </table:table-cell>
@@ -776,7 +776,7 @@
                 <table:table-cell table:style-name="Table3.A1" office:value-type="string">
                   <text:p text:style-name="Table_20_Contents"/>
                 </table:table-cell>
-                <table:table-cell table:style-name="Table3.D2" table:number-columns-spanned="3" office:value-type='string' tal:define='orig_string string:Total Including Tax; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                <table:table-cell table:style-name="Table3.D2" table:number-columns-spanned="3" office:value-type='string' tal:define='orig_string string:Total Including Tax; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                   <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/> :</text:p>
                   <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>  
                 </table:table-cell>
@@ -839,7 +839,7 @@
                 </table:table-cell>
               </table:table-row>
               <table:table-row table:style-name="Table3.11">
-                <table:table-cell table:style-name="Table3.A11" office:value-type='string' tal:define='orig_string string:Notes; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                <table:table-cell table:style-name="Table3.A11" office:value-type='string' tal:define='orig_string string:Notes; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                   <text:p text:style-name='P2'><span tal:replace='orig_message'/><span tal:omit-tag='' tal:condition='python:translated_message != orig_message'> / <span tal:replace='translated_message'/></span>:</text:p>
                 </table:table-cell>
                 <table:table-cell table:style-name="Table3.B11" office:value-type="string">

bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewAsODTStyles.oot

@@ -252,14 +252,14 @@
     <style:master-page style:name="Standard" style:page-layout-name="pm1">
       <style:header tal:define="default_language python:test(request.get('international_form'), 'en', here.Localizer.get_selected_language());
                     orig_title string:Invoice;
-                    en_title python: unicode(here.Base_translateString(orig_title, lang=default_language), 'utf-8');
-                    my_title python: unicode(here.Base_translateString(orig_title), 'utf-8');
+                    en_title python: here.Base_translateString(orig_title, lang=default_language);
+                    my_title python: here.Base_translateString(orig_title);
                     orig_page string:Page;
-                    en_page python: unicode(here.Base_translateString(orig_page, lang=default_language), 'utf-8');
-                    my_page python: unicode(here.Base_translateString(orig_page), 'utf-8');
+                    en_page python: here.Base_translateString(orig_page, lang=default_language);
+                    my_page python: here.Base_translateString(orig_page);
                     orig_of string:of;
-                    en_of python: unicode(here.Base_translateString(orig_of, lang=default_language), 'utf-8');
-                    my_of python: unicode(here.Base_translateString(orig_of), 'utf-8');
+                    en_of python: here.Base_translateString(orig_of, lang=default_language);
+                    my_of python: here.Base_translateString(orig_of);
                     image_path python: here.getPortalType().startswith('Purchase') and data_dict['destination_section_image_path'] or (data_dict['source_decision_image_path'] or data_dict['source_section_image_path']);
                     image_width python: here.getPortalType().startswith('Purchase') and data_dict['destination_section_image_width'] or (data_dict['source_decision_image_width'] or data_dict['source_section_image_width']);
                     image_height python: here.getPortalType().startswith('Purchase') and data_dict['destination_section_image_height'] or (data_dict['source_decision_image_height'] or data_dict['source_section_image_height'])">

bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewAsODTStyles_l10n_ja.oot

@@ -254,14 +254,14 @@
     <style:master-page style:name="Standard" style:page-layout-name="pm1">
       <style:header tal:define="default_language python:test(request.get('international_form'), 'en', here.Localizer.get_selected_language());
                     orig_title string:Invoice;
-                    en_title python: unicode(here.Base_translateString(orig_title, lang=default_language), 'utf-8');
-                    my_title python: unicode(here.Base_translateString(orig_title), 'utf-8');
+                    en_title python: here.Base_translateString(orig_title, lang=default_language);
+                    my_title python: here.Base_translateString(orig_title);
                     orig_page string:Page;
-                    en_page python: unicode(here.Base_translateString(orig_page, lang=default_language), 'utf-8');
-                    my_page python: unicode(here.Base_translateString(orig_page), 'utf-8');
+                    en_page python: here.Base_translateString(orig_page, lang=default_language);
+                    my_page python: here.Base_translateString(orig_page);
                     orig_of string:of;
-                    en_of python: unicode(here.Base_translateString(orig_of, lang=default_language), 'utf-8');
-                    my_of python: unicode(here.Base_translateString(orig_of), 'utf-8');
+                    en_of python: here.Base_translateString(orig_of, lang=default_language);
+                    my_of python: here.Base_translateString(orig_of);
                     image_path python: here.getPortalType().startswith('Purchase') and data_dict['destination_section_image_path'] or (data_dict['source_decision_image_path'] or data_dict['source_section_image_path']);
                     image_width python: here.getPortalType().startswith('Purchase') and data_dict['destination_section_image_width'] or (data_dict['source_decision_image_width'] or data_dict['source_section_image_width']);
                     image_height python: here.getPortalType().startswith('Purchase') and data_dict['destination_section_image_height'] or (data_dict['source_decision_image_height'] or data_dict['source_section_image_height'])">

bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SaleInvoiceTransaction_getPrintout.zpt

@@ -71,8 +71,8 @@
               <table class="inner-table">
                 <tr>
                   <td tal:define='orig_string        string: Invoice Number; 
-                                  orig_message       python: unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8");
-                                  translated_message python: unicode(here.Base_translateString(orig_string),"utf-8")'>
+                                  orig_message       python: here.Base_translateString(orig_string, lang=default_language);
+                                  translated_message python: here.Base_translateString(orig_string)'>
                     <span><span tal:replace='orig_message'/>:</span>
                     <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</span>
                   </td>
@@ -82,8 +82,8 @@
                 </tr>
                 <tr>
                   <td tal:define='orig_string        string: Document Date;
-                                  orig_message       python: unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8");
-                                  translated_message python: unicode(here.Base_translateString(orig_string),"utf-8")'>
+                                  orig_message       python: here.Base_translateString(orig_string, lang=default_language);
+                                  translated_message python: here.Base_translateString(orig_string)'>
                     <span><span tal:replace='orig_message'/>:</span>
                     <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</span>
                   </td>
@@ -93,8 +93,8 @@
                 </tr>
                 <tr>
                   <td tal:define='orig_string        string: Currency;
-                                  orig_message       python: unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8");
-                                  translated_message python: unicode(here.Base_translateString(orig_string),"utf-8")'>
+                                  orig_message       python: here.Base_translateString(orig_string, lang=default_language);
+                                  translated_message python: here.Base_translateString(orig_string)'>
                     <span><span tal:replace='orig_message'/>:</span>
                     <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</span>
                   </td>
@@ -136,7 +136,7 @@
             <td>
               <table class="inner-table">
                 <tr>
-                  <td tal:define='orig_string string:Payment; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                  <td tal:define='orig_string string:Payment; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                     <span><span tal:replace='orig_message'/>:</span>
                     <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</span>
                   </td>
@@ -145,7 +145,7 @@
                   </td>
                 </tr>
                 <tr>
-                  <td tal:define='orig_string string:Delivery Mode; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                  <td tal:define='orig_string string:Delivery Mode; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                     <span><span tal:replace='orig_message'/>:</span>
                     <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</span>
                   </td>
@@ -154,7 +154,7 @@
                   </td>
                 </tr>
                 <tr>
-                  <td tal:define='orig_string string:Incoterm; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                  <td tal:define='orig_string string:Incoterm; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                     <span><span tal:replace='orig_message'/>:</span>
                     <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</span>
                   </td>
@@ -171,39 +171,39 @@
       <table class="inventory">
         <thead>
           <tr>
-            <th tal:define='orig_string string:Line; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <th tal:define='orig_string string:Line; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <span><span tal:replace='orig_message'/></span>
               <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
             </th>
-            <th tal:define='orig_string string:Your Item No.; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <th tal:define='orig_string string:Your Item No.; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <span><span tal:replace='orig_message'/></span>
               <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
             </th>
-            <th tal:define='orig_string string:Our Item No.; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <th tal:define='orig_string string:Our Item No.; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <span><span tal:replace='orig_message'/></span>
               <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
             </th>
-            <th tal:define='orig_string string:Description; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <th tal:define='orig_string string:Description; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <span><span tal:replace='orig_message'/></span>
               <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
             </th>
-            <th tal:define='orig_string string:Quantity; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <th tal:define='orig_string string:Quantity; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <span><span tal:replace='orig_message'/></span>
               <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
             </th>
-            <th tal:define='orig_string string:Unit; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <th tal:define='orig_string string:Unit; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <span><span tal:replace='orig_message'/></span>
               <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
             </th>
-            <th tal:define='orig_string string:Tax Code; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <th tal:define='orig_string string:Tax Code; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <span><span tal:replace='orig_message'/></span>
               <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
             </th>
-            <th tal:define='orig_string string:Unit Price; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <th tal:define='orig_string string:Unit Price; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <span><span tal:replace='orig_message'/></span>
               <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
             </th>
-            <th tal:define='orig_string string:Total Price; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <th tal:define='orig_string string:Total Price; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <span><span tal:replace='orig_message'/></span>
               <span  tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
             </th>
@@ -234,7 +234,7 @@
       </table>
       <table class="balance">
         <tr>
-          <th tal:define='orig_string string:Total Excluding Tax; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+          <th tal:define='orig_string string:Total Excluding Tax; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
             <span><span tal:replace='orig_message'/>:</span>
             <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</span>  
           </th>
@@ -244,19 +244,19 @@
       <table class="tax">
         <thead>
           <tr>
-                <th tal:define='orig_string string:Tax Code; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                <th tal:define='orig_string string:Tax Code; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                   <span><span tal:replace='orig_message'/></span>
                   <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
                 </th>
-                <th tal:define='orig_string string:Amount; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                <th tal:define='orig_string string:Amount; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                   <span><span tal:replace='orig_message'/></span>
                   <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
                 </th>
-                <th tal:define='orig_string string:Rate; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                <th tal:define='orig_string string:Rate; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                   <span><span tal:replace='orig_message'/></span>
                   <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
                 </th>
-                <th tal:define='orig_string string:Tax Price; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                <th tal:define='orig_string string:Tax Price; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                   <span><span tal:replace='orig_message'/></span>
                   <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
                 </th>
@@ -283,7 +283,7 @@
       </table>
       <table class="balance">
         <tr>
-          <th tal:define='orig_string string:Total Including Tax; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+          <th tal:define='orig_string string:Total Including Tax; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
             <span><span tal:replace='orig_message'/> :</span>
             <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</span>  
           </th>
@@ -293,7 +293,7 @@
         </tr>
       </table>
       <table>
-        <td tal:define='orig_string string:Notes; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+        <td tal:define='orig_string string:Notes; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
           <p><span tal:replace='orig_message'/><span tal:omit-tag='' tal:condition='python:translated_message != orig_message'> / <span tal:replace='translated_message'/></span>:</p>
         </td>
       </table>

bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_viewAsODT.oot

@@ -259,7 +259,7 @@
                     </table:table-cell>
                     <table:table-cell table:style-name='Tableau2.A1'
                                       office:value-type='string'
-                                      tal:define='orig_string string:Recipient; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                                      tal:define='orig_string string:Recipient; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                       <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                       <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                     </table:table-cell>
@@ -274,7 +274,7 @@
                         <table:table-column table:style-name='Tableau2.E1.1'/>
                         <table:table-column table:style-name='Tableau2.E1.2'/>
                         <table:table-row table:style-name='Tableau2.E1.1'>
-                          <table:table-cell table:style-name='Tableau2.A1' office:value-type='string' tal:define='orig_string string:Reference; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                          <table:table-cell table:style-name='Tableau2.A1' office:value-type='string' tal:define='orig_string string:Reference; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                             <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                             <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                           </table:table-cell>
@@ -285,7 +285,7 @@
                         <table:table-row table:style-name='Tableau2.E1.1'>
                           <table:table-cell table:style-name='Tableau2.E1.1.2'
                                             office:value-type='string'
-                                            tal:define='orig_string string:Document Date; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                                            tal:define='orig_string string:Document Date; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                             <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                             <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                           </table:table-cell>
@@ -295,7 +295,7 @@
                           </table:table-cell>
                         </table:table-row>
                         <table:table-row table:style-name='Tableau2.E1.1'>
-                          <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Currency; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                          <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Currency; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                             <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                             <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                           </table:table-cell>
@@ -304,7 +304,7 @@
                           </table:table-cell>
                         </table:table-row>
                       <table:table-row table:style-name='Tableau2.E1.1'>
-                        <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Payment; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                        <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Payment; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                           <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                           <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                         </table:table-cell>
@@ -317,7 +317,7 @@
                   </table:table-row>
                 </table:table-header-rows>
                 <table:table-row table:style-name='Tableau2.1'>
-                  <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Seller; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                  <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Seller; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                     <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                     <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                   </table:table-cell>
@@ -326,7 +326,7 @@
                     <text:p text:style-name='Table_20_Contents' tal:content='python:data_dict["source_decision_telfax"]'>tel, fax</text:p>
                     <text:p text:style-name='Table_20_Contents' tal:content='python:data_dict["source_decision_email"]'>email</text:p>
                   </table:table-cell>
-                  <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Buyer; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                  <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Buyer; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                     <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                     <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                   </table:table-cell>
@@ -340,7 +340,7 @@
                       <table:table-column table:style-name='Tableau2.E1.1'/>
                       <table:table-column table:style-name='Tableau2.E1.2'/>
                       <table:table-row table:style-name='Tableau2.E1.1'>
-                        <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Delivery Mode; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                        <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Delivery Mode; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                           <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                           <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                         </table:table-cell>
@@ -349,7 +349,7 @@
                         </table:table-cell>
                       </table:table-row>
                       <table:table-row table:style-name='Tableau2.E1.1'>
-                        <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Incoterm; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                        <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Incoterm; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                           <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                           <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                         </table:table-cell>
@@ -358,7 +358,7 @@
                         </table:table-cell>
                       </table:table-row>
                       <table:table-row table:style-name='Tableau2.E1.1'>
-                        <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Supply Chain; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                        <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Supply Chain; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                           <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                           <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                         </table:table-cell>
@@ -382,39 +382,39 @@
             <table:covered-table-cell/>
           </table:table-row>
           <table:table-row>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Line; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Line; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Our Item no.; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Our Item no.; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Transformation; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Transformation; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Description; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Description; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Quantity; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Quantity; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Right'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Right' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Unit; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Unit; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Delivery Date; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Delivery Date; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Unit Price; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Unit Price; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Right'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Right' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Total Price; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Total Price; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Right'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Right' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
@@ -510,7 +510,7 @@
                 <table:table-cell table:style-name='Tableau3.A1' office:value-type='string'>
                   <text:p text:style-name='Table_20_Contents'/>
                 </table:table-cell>
-                <table:table-cell table:style-name='Tableau3.D2' office:value-type='string' tal:define='orig_string string:Total Excluding VAT; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                <table:table-cell table:style-name='Tableau3.D2' office:value-type='string' tal:define='orig_string string:Total Excluding VAT; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                   <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                   <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                 </table:table-cell>
@@ -538,7 +538,7 @@
                           tal:replace='vat/getResourceTitle'/>:</text:p>
                     </tal:block>
                     <text:p text:style-name='Table_20_Heading'
-                            tal:define='orig_string string:TAX; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'><span tal:replace="python: 'Total %s' % (translated_message)"/>:</text:p>
+                            tal:define='orig_string string:TAX; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'><span tal:replace="python: 'Total %s' % (translated_message)"/>:</text:p>
                   </table:table-cell>
                   <table:table-cell table:style-name='Tableau3.E3'
                                     office:value-type='float'
@@ -564,7 +564,7 @@
                 <table:table-cell table:style-name='Tableau3.A1' office:value-type='string'>
                   <text:p text:style-name='Table_20_Contents'/>
                 </table:table-cell>
-                <table:table-cell table:style-name='Tableau3.D3' office:value-type='string' tal:define='orig_string string:Total Including VAT; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                <table:table-cell table:style-name='Tableau3.D3' office:value-type='string' tal:define='orig_string string:Total Including VAT; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                   <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                   <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                 </table:table-cell>
@@ -592,7 +592,7 @@
                 </table:table-cell>
               </table:table-row>
               <table:table-row table:style-name='Tableau3.6'>
-                <table:table-cell table:style-name='Tableau3.A6' office:value-type='string' tal:define='orig_string string:Notes; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                <table:table-cell table:style-name='Tableau3.A6' office:value-type='string' tal:define='orig_string string:Notes; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                   <text:p text:style-name='P2'><span tal:replace='orig_message'/><span tal:omit-tag='' tal:condition='python:translated_message != orig_message'> / <span tal:replace='translated_message'/></span>:</text:p>
                 </table:table-cell>
                 <table:table-cell table:style-name='Tableau3.B6' office:value-type='string'>

bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_viewAsODTStyles.oot

@@ -249,14 +249,14 @@
     <style:master-page style:name="Standard" style:page-layout-name="pm1">
       <style:header tal:define="default_language python:test(request.get('international_form'), 'en', here.Localizer.get_selected_language());
                     orig_title string:Order;
-                    en_title python: unicode(here.Base_translateString(orig_title, lang=default_language), 'utf-8');
-                    my_title python: unicode(here.Base_translateString(orig_title), 'utf-8');
+                    en_title python: here.Base_translateString(orig_title, lang=default_language);
+                    my_title python: here.Base_translateString(orig_title);
                     orig_page string:Page;
-                    en_page python: unicode(here.Base_translateString(orig_page, lang=default_language), 'utf-8');
-                    my_page python: unicode(here.Base_translateString(orig_page), 'utf-8');
+                    en_page python: here.Base_translateString(orig_page, lang=default_language);
+                    my_page python: here.Base_translateString(orig_page);
                     orig_of string:of;
-                    en_of python: unicode(here.Base_translateString(orig_of, lang=default_language), 'utf-8');
-                    my_of python: unicode(here.Base_translateString(orig_of), 'utf-8');
+                    en_of python: here.Base_translateString(orig_of, lang=default_language);
+                    my_of python: here.Base_translateString(orig_of);
                     image_path python: here.getPortalType().startswith('Purchase') and data_dict['destination_section_image_path'] or data_dict['source_decision_image_path'];
                     image_width python: here.getPortalType().startswith('Purchase') and data_dict['destination_section_image_width'] or data_dict['source_decision_image_width'];
                     image_height python: here.getPortalType().startswith('Purchase') and data_dict['destination_section_image_height'] or data_dict['source_decision_image_height']">

bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionPackingList_viewAsODT.oot

@@ -254,7 +254,7 @@
                     </table:table-cell>
                     <table:table-cell table:style-name='Tableau2.A1'
                                       office:value-type='string'
-                                      tal:define='orig_string string:Recipient; en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8"); my_string python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                                      tal:define='orig_string string:Recipient; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)'>
                       <text:p text:style-name='Table_20_Heading'><span tal:replace='en_string'/>:</text:p>
                       <text:p text:style-name='Table_20_Heading' tal:condition='python:my_string!=en_string'><span tal:replace='my_string'/>:</text:p>
                     </table:table-cell>
@@ -269,7 +269,7 @@
                         <table:table-column table:style-name='Tableau2.E1.1'/>
                         <table:table-column table:style-name='Tableau2.E1.2'/>
                         <table:table-row table:style-name='Tableau2.E1.1'>
-                          <table:table-cell table:style-name='Tableau2.A1' office:value-type='string' tal:define='orig_string string:Reference; en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8"); my_string python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                          <table:table-cell table:style-name='Tableau2.A1' office:value-type='string' tal:define='orig_string string:Reference; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)'>
                             <text:p text:style-name='Table_20_Heading'><span tal:replace='en_string'/>:</text:p>
                             <text:p text:style-name='Table_20_Heading' tal:condition='python:my_string!=en_string'><span tal:replace='my_string'/>:</text:p>
                           </table:table-cell>
@@ -280,7 +280,7 @@
                         <table:table-row table:style-name='Tableau2.E1.1'>
                           <table:table-cell table:style-name='Tableau2.E1.1.2'
                                             office:value-type='string'
-                                            tal:define='orig_string string:Document Date; en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8"); my_string python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                                            tal:define='orig_string string:Document Date; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)'>
                             <text:p text:style-name='Table_20_Heading'><span tal:replace='en_string'/>:</text:p>
                             <text:p text:style-name='Table_20_Heading' tal:condition='python:my_string!=en_string'><span tal:replace='my_string'/>:</text:p>
                           </table:table-cell>
@@ -294,7 +294,7 @@
                   </table:table-row>
                 </table:table-header-rows>
                 <table:table-row table:style-name='Tableau2.1'>
-                  <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Seller; en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8"); my_string python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                  <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Seller; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)'>
                     <text:p text:style-name='Table_20_Heading'><span tal:replace='en_string'/>:</text:p>
                     <text:p text:style-name='Table_20_Heading' tal:condition='python:my_string!=en_string'><span tal:replace='my_string'/>:</text:p>
                   </table:table-cell>
@@ -303,7 +303,7 @@
                     <text:p text:style-name='Table_20_Contents' tal:content='python:data_dict["source_decision_telfax"]'>tel, fax</text:p>
                     <text:p text:style-name='Table_20_Contents' tal:content='python:data_dict["source_decision_email"]'>email</text:p>
                   </table:table-cell>
-                  <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Buyer; en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8"); my_string python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                  <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Buyer; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)'>
                     <text:p text:style-name='Table_20_Heading'><span tal:replace='en_string'/>:</text:p>
                     <text:p text:style-name='Table_20_Heading' tal:condition='python:my_string!=en_string'><span tal:replace='my_string'/>:</text:p>
                   </table:table-cell>
@@ -320,8 +320,8 @@
                         <table:table-cell table:style-name='Tableau2.E1.1.2'
                                           office:value-type='string'
                                           tal:define='orig_string string:Delivery Mode;
-                                          en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8");
-                                          my_string python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                                          en_string python:here.Base_translateString(orig_string, lang="en");
+                                          my_string python:here.Base_translateString(orig_string)'>
                           <text:p text:style-name='Table_20_Heading'><span tal:replace='en_string'/>:</text:p>
                           <text:p text:style-name='Table_20_Heading' tal:condition='python:my_string!=en_string'><span tal:replace='my_string'/>:</text:p>
                         </table:table-cell>
@@ -333,8 +333,8 @@
                         <table:table-cell table:style-name='Tableau2.E1.1.2'
                                           office:value-type='string'
                                           tal:define='orig_string string:Incoterm;
-                                          en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8");
-                                          my_string python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                                          en_string python:here.Base_translateString(orig_string, lang="en");
+                                          my_string python:here.Base_translateString(orig_string)'>
                           <text:p text:style-name='Table_20_Heading'><span tal:replace='en_string'/>:</text:p>
                           <text:p text:style-name='Table_20_Heading' tal:condition='python:my_string!=en_string'><span tal:replace='my_string'/>:</text:p>
                         </table:table-cell>
@@ -361,48 +361,48 @@
             <table:table-cell table:style-name='Tableau1.A2'
                               office:value-type='string'
                               tal:define='orig_string string:Line;
-                              en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8");
-                              my_string python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                              en_string python:here.Base_translateString(orig_string, lang="en");
+                              my_string python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='en_string'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:my_string!=en_string'><span tal:replace='my_string'/></text:p>
             </table:table-cell>
             <table:table-cell table:style-name='Tableau1.A2'
                               office:value-type='string'
                               tal:define='orig_string string:Your Item no.;
-                              en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8");
-                              my_string python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                              en_string python:here.Base_translateString(orig_string, lang="en");
+                              my_string python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title'><span tal:replace='en_string'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title' tal:condition='python:my_string!=en_string'><span tal:replace='my_string'/></text:p>
             </table:table-cell>
             <table:table-cell table:style-name='Tableau1.A2'
                               office:value-type='string'
                               tal:define='orig_string string:Our Item no.;
-                              en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8");
-                              my_string python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                              en_string python:here.Base_translateString(orig_string, lang="en");
+                              my_string python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title'><span tal:replace='en_string'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title' tal:condition='python:my_string!=en_string'><span tal:replace='my_string'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Description; en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8"); my_string python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Description; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='en_string'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:my_string!=en_string'><span tal:replace='my_string'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Quantity; en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8"); my_string python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Quantity; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Right'><span tal:replace='en_string'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Right' tal:condition='python:my_string!=en_string'><span tal:replace='my_string'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Unit; en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8"); my_string python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Unit; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title'><span tal:replace='en_string'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title' tal:condition='python:my_string!=en_string'><span tal:replace='my_string'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Delivery Date; en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8"); my_string python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Delivery Date; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title'><span tal:replace='en_string'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title' tal:condition='python:my_string!=en_string'><span tal:replace='my_string'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Unit Price; en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8"); my_string python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Unit Price; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Right'><span tal:replace='en_string'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Right' tal:condition='python:my_string!=en_string'><span tal:replace='my_string'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Total Price; en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8"); my_string python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Total Price; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Right'><span tal:replace='en_string'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Right' tal:condition='python:my_string!=en_string'><span tal:replace='my_string'/></text:p>
             </table:table-cell>
@@ -492,7 +492,7 @@
                 <table:table-cell table:style-name='Tableau3.A1' office:value-type='string'>
                   <text:p text:style-name='Table_20_Contents'/>
                 </table:table-cell>
-                <table:table-cell table:style-name='Tableau3.D2' office:value-type='string' tal:define='orig_string string:Total Excluding VAT; en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8"); my_string python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                <table:table-cell table:style-name='Tableau3.D2' office:value-type='string' tal:define='orig_string string:Total Excluding VAT; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)'>
                   <text:p text:style-name='Table_20_Heading'><span tal:replace='en_string'/>:</text:p>
                   <text:p text:style-name='Table_20_Heading' tal:condition='python:my_string!=en_string'><span tal:replace='my_string'/>:</text:p>
                 </table:table-cell>
@@ -514,14 +514,14 @@
                   <table:table-cell table:style-name='Tableau3.D3'
                                     office:value-type='string'>
                     <tal:block tal:repeat="vat python: data_dict['vat_list']">
-                      <tal:block tal:define='orig_string python:vat.getResourceTitle(); en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8"); my_string python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                      <tal:block tal:define='orig_string python:vat.getResourceTitle(); en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)'>
                         <text:p text:style-name='Table_20_Heading'><span tal:replace='en_string'/>:</text:p>
                         <text:p text:style-name='Table_20_Heading'
                                 tal:condition='python:my_string != en_string'><span tal:replace='my_string'/>:</text:p>
                       </tal:block>
                     </tal:block>
                     <text:p text:style-name='Table_20_Heading'
-                            tal:define='orig_string string:TAX; en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8"); my_string python:unicode(here.Base_translateString(orig_string),"utf-8")'><span tal:replace="python: 'Total %s' % (my_string)"/>:</text:p>
+                            tal:define='orig_string string:TAX; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)'><span tal:replace="python: 'Total %s' % (my_string)"/>:</text:p>
                   </table:table-cell>
                   <table:table-cell table:style-name='Tableau3.E3'
                                     office:value-type='float'
@@ -546,7 +546,7 @@
                 <table:table-cell table:style-name='Tableau3.A1' office:value-type='string'>
                   <text:p text:style-name='Table_20_Contents'/>
                 </table:table-cell>
-                <table:table-cell table:style-name='Tableau3.D3' office:value-type='string' tal:define='orig_string string:Total Including VAT; en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8"); my_string python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                <table:table-cell table:style-name='Tableau3.D3' office:value-type='string' tal:define='orig_string string:Total Including VAT; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)'>
                   <text:p text:style-name='Table_20_Heading'><span tal:replace='en_string'/>:</text:p>
                   <text:p text:style-name='Table_20_Heading' tal:condition='python:my_string!=en_string'><span tal:replace='my_string'/>:</text:p>
                 </table:table-cell>
@@ -573,7 +573,7 @@
                 </table:table-cell>
               </table:table-row>
               <table:table-row table:style-name='Tableau3.6'>
-                <table:table-cell table:style-name='Tableau3.A6' office:value-type='string' tal:define='orig_string string:Notes; en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8"); my_string python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                <table:table-cell table:style-name='Tableau3.A6' office:value-type='string' tal:define='orig_string string:Notes; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)'>
                   <text:p text:style-name='P2'><span tal:replace='en_string'/><span tal:omit-tag='' tal:condition='python:my_string!=en_string'> / <span tal:replace='my_string'/></span>:</text:p>
                 </table:table-cell>
                 <table:table-cell table:style-name='Tableau3.B6' office:value-type='string'>

bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionPackingList_viewAsODTStyles.oot

@@ -245,14 +245,14 @@
   <office:master-styles>
     <style:master-page style:name="Standard" style:page-layout-name="pm1">
       <style:header tal:define="orig_title string:Packing List;
-                    en_title python: unicode(here.Base_translateString(orig_title, lang='en'), 'utf-8');
-                    my_title python: unicode(here.Base_translateString(orig_title), 'utf-8');
+                    en_title python: here.Base_translateString(orig_title, lang='en');
+                    my_title python: here.Base_translateString(orig_title);
                     orig_page string:Page;
-                    en_page python: unicode(here.Base_translateString(orig_page, lang='en'), 'utf-8');
-                    my_page python: unicode(here.Base_translateString(orig_page), 'utf-8');
+                    en_page python: here.Base_translateString(orig_page, lang='en');
+                    my_page python: here.Base_translateString(orig_page);
                     orig_of string:of;
-                    en_of python: unicode(here.Base_translateString(orig_of, lang='en'), 'utf-8');
-                    my_of python: unicode(here.Base_translateString(orig_of), 'utf-8');
+                    en_of python: here.Base_translateString(orig_of, lang='en');
+                    my_of python: here.Base_translateString(orig_of);
                     image_path python: here.getPortalType().startswith('Purchase') and data_dict['destination_section_image_path'] or data_dict['source_section_image_path'];
                     image_width python: here.getPortalType().startswith('Purchase') and data_dict['destination_section_image_width'] or data_dict['source_section_image_width'];
                     image_height python: here.getPortalType().startswith('Purchase') and data_dict['destination_section_image_height'] or data_dict['source_section_image_height']">

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetTransactionListAsODT.oot

@@ -262,15 +262,15 @@
       <tal:block define="
                     date_renderer nocall:here/Base_viewFieldLibrary/my_date/render_pdf;
                     orig_title python: 'Payslip';
-                    en_title python: unicode(here.Base_translateString(orig_title, lang=default_language), 'utf-8');
-                    my_title python: unicode(here.Base_translateString(orig_title), 'utf-8');
+                    en_title python: here.Base_translateString(orig_title, lang=default_language);
+                    my_title python: here.Base_translateString(orig_title);
                     orig_period python: 'From ${start_date} to ${stop_date}';
-                    en_period python: unicode(here.Base_translateString(orig_period, lang=default_language,
+                    en_period python: here.Base_translateString(orig_period, lang=default_language,
                                                                 mapping = {'start_date': date_renderer(pay_sheet_transaction.getStartDate()),
-                                                                           'stop_date': date_renderer(pay_sheet_transaction.getStopDate())}), 'utf-8');
-                    my_period  python: unicode(here.Base_translateString(orig_period,
+                                                                           'stop_date': date_renderer(pay_sheet_transaction.getStopDate())});
+                    my_period  python: here.Base_translateString(orig_period,
                                                                 mapping = {'start_date': date_renderer(pay_sheet_transaction.getStartDate()),
-                                                                           'stop_date': date_renderer(pay_sheet_transaction.getStopDate())}), 'utf-8');
+                                                                           'stop_date': date_renderer(pay_sheet_transaction.getStopDate())});
                     image_path python: data_dict['destination_section_image_path'];
                     image_width python: data_dict['destination_section_image_width'];
                     image_height python: data_dict['destination_section_image_height']">
@@ -404,27 +404,27 @@
             <table:covered-table-cell/>
           </table:table-row>
           <table:table-row>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Designation; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Designation; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Base; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Base; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Employee Share Rate; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Employee Share Rate; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Employee Share; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Employee Share; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Employer Share Rate; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Employer Share Rate; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Employer Share; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Employer Share; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
@@ -631,7 +631,7 @@
                 <table:table-cell table:style-name='Tableau3.A1' office:value-type='string'>
                   <text:p text:style-name='Table_20_Contents'/>
                 </table:table-cell>
-                <table:table-cell table:style-name='Tableau3.D2' office:value-type='string' tal:define='orig_string string:Net payable; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                <table:table-cell table:style-name='Tableau3.D2' office:value-type='string' tal:define='orig_string string:Net payable; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                   <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                   <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                 </table:table-cell>

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODT.oot

@@ -329,27 +329,27 @@
             <table:covered-table-cell/>
           </table:table-row>
           <table:table-row>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Designation; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Designation; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Base; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Base; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Employee Share Rate; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Employee Share Rate; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Employee Share; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Employee Share; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Employer Share Rate; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Employer Share Rate; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Employer Share; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Employer Share; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
@@ -556,7 +556,7 @@
                 <table:table-cell table:style-name='Tableau3.A1' office:value-type='string'>
                   <text:p text:style-name='Table_20_Contents'/>
                 </table:table-cell>
-                <table:table-cell table:style-name='Tableau3.D2' office:value-type='string' tal:define='orig_string string:Net payable; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                <table:table-cell table:style-name='Tableau3.D2' office:value-type='string' tal:define='orig_string string:Net payable; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                   <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                   <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                 </table:table-cell>

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODTStyles.oot

@@ -260,15 +260,15 @@
       <style:header tal:define="default_language python:test(request.get('international_form'), 'en', here.Localizer.get_selected_language());
                     date_renderer nocall:here/Base_viewFieldLibrary/my_date_time_field/render_pdf;
                     orig_title python: 'Payslip';
-                    en_title python: unicode(here.Base_translateString(orig_title, lang=default_language), 'utf-8');
-                    my_title python: unicode(here.Base_translateString(orig_title), 'utf-8');
+                    en_title python: here.Base_translateString(orig_title, lang=default_language);
+                    my_title python: here.Base_translateString(orig_title);
                     orig_period python: 'From ${start_date} to ${stop_date}';
-                    en_period python: unicode(here.Base_translateString(orig_period, lang=default_language,
+                    en_period python: here.Base_translateString(orig_period, lang=default_language,
                                                                 mapping = {'start_date': date_renderer(here.getStartDate()),
-                                                                           'stop_date': date_renderer(here.getStopDate())}), 'utf-8');
-                    my_period  python: unicode(here.Base_translateString(orig_period,
+                                                                           'stop_date': date_renderer(here.getStopDate())});
+                    my_period  python: here.Base_translateString(orig_period,
                                                                 mapping = {'start_date': date_renderer(here.getStartDate()),
-                                                                           'stop_date': date_renderer(here.getStopDate())}), 'utf-8');
+                                                                           'stop_date': date_renderer(here.getStopDate())});
                     image_path python: here.getPortalType().startswith('Pay Sheet Transaction') and data_dict['destination_section_image_path'] or data_dict['destination_section_image_path'];
                     image_width python: here.getPortalType().startswith('Pay Sheet Transaction') and data_dict['destination_section_image_width'] or data_dict['destination_section_image_width'];
                     image_height python: here.getPortalType().startswith('Pay Sheet Transaction') and data_dict['destination_section_image_height'] or data_dict['destination_section_image_height']">

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/payroll_odt_macro.zpt

@@ -30,7 +30,7 @@ macro is found. It's used to display description field -->
   xmlns:metal='http://xml.zope.org/namespaces/metal'>
   <tal:block metal:define-macro="other_informations">
     <table:table-row table:style-name='Tableau3.6'>
-      <table:table-cell table:style-name='Tableau3.A6' office:value-type='string' tal:define='orig_string string:Notes; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+      <table:table-cell table:style-name='Tableau3.A6' office:value-type='string' tal:define='orig_string string:Notes; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python: here.Base_translateString(orig_string)'>
         <text:p text:style-name='P2'><span tal:replace='orig_message'/>
           <span tal:omit-tag='' tal:condition='python:translated_message != orig_message'> / <span tal:replace='translated_message'/></span>:</text:p>
       </table:table-cell>

bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/payroll_odt_macro.zpt

@@ -27,9 +27,9 @@
   xmlns:metal='http://xml.zope.org/namespaces/metal'>
   <tal:block metal:define-macro="other_informations" 
              tal:define="data_dict here/PaySheetTransaction_getOtherInformationsDataDict;
- quantity_renderer nocall:here/Base_viewFieldLibrary/my_view_mode_money_quantity/render_pdf;
-               default_language python:test(request.get('international_form'), 'en', here.Localizer.get_selected_language());
-             hour_renderer nocall:here/AnnotationLine_viewFieldLibrary/my_work_time_annotation_line_quantity/render_pdf;">
+                         quantity_renderer nocall:here/Base_viewFieldLibrary/my_view_mode_money_quantity/render_pdf;
+                         default_language python:test(request.get('international_form'), 'en', here.Localizer.get_selected_language());
+                         hour_renderer nocall:here/AnnotationLine_viewFieldLibrary/my_work_time_annotation_line_quantity/render_pdf;">
     <table:table-row table:style-name='Tableau3.8'>
       <table:table-cell table:style-name='Tableau3.A8' office:value-type='string'>
         <text:p text:style-name='Table_20_Contents' />
@@ -142,27 +142,27 @@
             <table:covered-table-cell/>
           </table:table-row>
           <table:table-row>
-            <table:table-cell table:style-name='Tableau1.A6' office:value-type='string' tal:define='orig_string string:Gross Salary; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A6' office:value-type='string' tal:define='orig_string string:Gross Salary; orig_message python: here.Base_translateString(orig_string, lang=default_language); translated_message python: here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A6' office:value-type='string' tal:define='orig_string string:Tranche A; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A6' office:value-type='string' tal:define='orig_string string:Tranche A; orig_message python: here.Base_translateString(orig_string, lang=default_language); translated_message python: here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A6' office:value-type='string' tal:define='orig_string string:Heures Normales; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A6' office:value-type='string' tal:define='orig_string string:Heures Normales; orig_message python: here.Base_translateString(orig_string, lang=default_language); translated_message python: here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A6' office:value-type='string' tal:define='orig_string string:Heures supp.; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A6' office:value-type='string' tal:define='orig_string string:Heures supp.; orig_message python: here.Base_translateString(orig_string, lang=default_language); translated_message python: here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A6' office:value-type='string' tal:define='orig_string string:Cotisations patronales; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A6' office:value-type='string' tal:define='orig_string string:Cotisations patronales; orig_message python: here.Base_translateString(orig_string, lang=default_language); translated_message python: here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A6' office:value-type='string' tal:define='orig_string string:Net Imposable.; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A6' office:value-type='string' tal:define='orig_string string:Net Imposable.; orig_message python: here.Base_translateString(orig_string, lang=default_language); translated_message python: here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
@@ -266,7 +266,7 @@
       <table:covered-table-cell/>
     </table:table-row>
     <table:table-row table:style-name='Tableau3.6' tal:condition="data_dict/description">
-      <table:table-cell table:style-name='Tableau3.A6' office:value-type='string' tal:define='orig_string string:Notes; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+      <table:table-cell table:style-name='Tableau3.A6' office:value-type='string' tal:define='orig_string string:Notes; orig_message python: here.Base_translateString(orig_string, lang=default_language); translated_message python: here.Base_translateString(orig_string)'>
         <text:p text:style-name='P2'><span tal:replace='orig_message'/>
           <span tal:omit-tag='' tal:condition='python:translated_message != orig_message'> / <span tal:replace='translated_message'/></span>:</text:p>
       </table:table-cell>

bt5/erp5_printer/SkinTemplateItem/portal_skins/erp5_printer/SaleInvoiceTransaction_getEpsonPrintout.zpt

@@ -14,7 +14,7 @@
   </head>
   <body>
     <header>
-      <h2 id="invoice_title" tal:define='orig_string string:Invoice; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+      <h2 id="invoice_title" tal:define='orig_string string:Invoice; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                     <span><span tal:content='orig_message'/></span>
                     <span tal:condition='python:translated_message != orig_message'><span tal:content='translated_message'/></span>
       </h2>
@@ -108,8 +108,8 @@
         <div id="invoice_information">
           <div id="invoice_information_title">
             <tal:block tal:define='orig_string        string: Invoice; 
-                              orig_message       python: unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8");
-                              translated_message python: unicode(here.Base_translateString(orig_string),"utf-8")'>
+                              orig_message       python: here.Base_translateString(orig_string, lang=default_language);
+                              translated_message python: here.Base_translateString(orig_string)'>
               <span style="font-weight:bold"><span tal:replace='orig_message'/></span>
               <span style="font-weight:bold" tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
             </tal:block>
@@ -117,8 +117,8 @@
           <div id="invoice_information_detail">
             <div>
               <tal:block tal:define='orig_string        string: Invoice Number; 
-                                orig_message       python: unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8");
-                                translated_message python: unicode(here.Base_translateString(orig_string),"utf-8")'>
+                                orig_message       python: here.Base_translateString(orig_string, lang=default_language);
+                                translated_message python: here.Base_translateString(orig_string)'>
                 <span><span tal:replace='orig_message'/>:</span>
                 <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</span>
               </tal:block>
@@ -126,8 +126,8 @@
             </div>
             <div>
               <tal:block tal:define='orig_string        string: Document Date;
-                                orig_message       python: unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8");
-                                translated_message python: unicode(here.Base_translateString(orig_string),"utf-8")'>
+                                orig_message       python: here.Base_translateString(orig_string, lang=default_language);
+                                translated_message python: here.Base_translateString(orig_string)'>
                 <span><span tal:replace='orig_message'/>:</span>
                 <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</span>
               </tal:block>
@@ -135,29 +135,29 @@
             </div>
             <div>
               <tal:block tal:define='orig_string        string: Currency;
-                                orig_message       python: unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8");
-                                translated_message python: unicode(here.Base_translateString(orig_string),"utf-8")'>
+                                orig_message       python: here.Base_translateString(orig_string, lang=default_language);
+                                translated_message python: here.Base_translateString(orig_string)'>
                 <span><span tal:replace='orig_message'/>:</span>
                 <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</span>
               </tal:block>
               <span tal:content='python:data_dict["currency"]'>EUR</span>
             </div>
             <div>
-              <tal:block tal:define='orig_string string:Payment; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+              <tal:block tal:define='orig_string string:Payment; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                 <span><span tal:replace='orig_message'/>:</span>
                 <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</span>
               </tal:block>
               <span tal:content='python:data_dict["payment_condition"]'>60 days</span>
             </div>
             <div>
-              <tal:block tal:define='orig_string string:Delivery Mode; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+              <tal:block tal:define='orig_string string:Delivery Mode; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                 <span><span tal:replace='orig_message'/>:</span>
                 <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</span>
               </tal:block>
               <span tal:content='python:data_dict["delivery_mode"]'>del mode</span>
             </div>
             <div>
-              <tal:block tal:define='orig_string string:Incoterm; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+              <tal:block tal:define='orig_string string:Incoterm; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                 <span><span tal:replace='orig_message'/>:</span>
                 <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</span>
               </tal:block>
@@ -169,8 +169,8 @@
       <br>
       <div id="product_detail_title">
         <span tal:define='orig_string        string: Products details; 
-                          orig_message       python: unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8");
-                          translated_message python: unicode(here.Base_translateString(orig_string),"utf-8")'>
+                          orig_message       python: here.Base_translateString(orig_string, lang=default_language);
+                          translated_message python: here.Base_translateString(orig_string)'>
           <span style="font-weight:bold"><span tal:replace='orig_message'/></span>
           <span style="font-weight:bold" tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
         </span>
@@ -179,23 +179,23 @@
       <table id="invoice_line">
         <thead>
             <tr>
-              <th tal:define='orig_string string:PROD; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+              <th tal:define='orig_string string:PROD; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                 <span><span tal:replace='orig_message'/></span>
                 <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
               </th>
-              <th tal:define='orig_string string:QTY; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+              <th tal:define='orig_string string:QTY; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                 <span><span tal:replace='orig_message'/></span>
                 <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
               </th>
-              <th tal:define='orig_string string:U/P; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+              <th tal:define='orig_string string:U/P; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                 <span><span tal:replace='orig_message'/></span>
                 <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
               </th>
-              <th tal:define='orig_string string:TAX; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+              <th tal:define='orig_string string:TAX; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                 <span><span tal:replace='orig_message'/></span>
                 <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
               </th>
-              <th tal:define='orig_string string:PRICE; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+              <th tal:define='orig_string string:PRICE; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                 <span><span tal:replace='orig_message'/></span>
                 <span  tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
               </th>
@@ -224,7 +224,7 @@
       <br>
       <table id="total_without_tax">
         <tr>
-          <th tal:define='orig_string string:Total Excluding Tax; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+          <th tal:define='orig_string string:Total Excluding Tax; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
             <span><span tal:replace='orig_message'/>:</span>
             <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</span>  
           </th>
@@ -234,8 +234,8 @@
 
       <div id="tax_detail_title">
         <span tal:define='orig_string        string: Tax details; 
-                          orig_message       python: unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8");
-                          translated_message python: unicode(here.Base_translateString(orig_string),"utf-8")'>
+                          orig_message       python: here.Base_translateString(orig_string, lang=default_language);
+                          translated_message python: here.Base_translateString(orig_string)'>
           <span style="font-weight:bold"><span tal:replace='orig_message'/></span>
           <span style="font-weight:bold" tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
         </span>
@@ -244,19 +244,19 @@
       <table id="tax">
         <thead>
           <tr>
-              <th tal:define='orig_string string:TAX; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+              <th tal:define='orig_string string:TAX; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                 <span><span tal:replace='orig_message'/></span>
                 <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
               </th>  
-              <th tal:define='orig_string string:AMT; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+              <th tal:define='orig_string string:AMT; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                 <span><span tal:replace='orig_message'/></span>
                 <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
               </th>    
-              <th tal:define='orig_string string:RATE; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+              <th tal:define='orig_string string:RATE; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                 <span><span tal:replace='orig_message'/></span>
                 <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
               </th>   
-              <th tal:define='orig_string string:PRICE; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+              <th tal:define='orig_string string:PRICE; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                 <span><span tal:replace='orig_message'/></span>
                 <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></span>
               </th>  
@@ -283,7 +283,7 @@
       </table>
       <table id="total_price">
         <tr>
-          <th tal:define='orig_string string:Total Including Tax; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+          <th tal:define='orig_string string:Total Including Tax; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
             <span><span tal:replace='orig_message'/> :</span>
             <span tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</span>  
           </th>
@@ -293,7 +293,7 @@
         </tr>
       </table>
       <table>
-        <td tal:define='orig_string string:Notes; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+        <td tal:define='orig_string string:Notes; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
           <p><span tal:replace='orig_message'/><span tal:omit-tag='' tal:condition='python:translated_message != orig_message'> / <span tal:replace='translated_message'/></span>:</p>
         </td>
       </table>

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.oot

@@ -263,7 +263,7 @@
                     </table:table-cell>
                     <table:table-cell table:style-name='Tableau2.A1'
                                       office:value-type='string'
-                                      tal:define='orig_string string:Client; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                                      tal:define='orig_string string:Client; orig_message python: here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                       <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                       <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                     </table:table-cell>
@@ -280,7 +280,7 @@
                         <table:table-column table:style-name='Tableau2.E1.1'/>
                         <table:table-column table:style-name='Tableau2.E1.2'/>
                         <table:table-row table:style-name='Tableau2.E1.1'>
-                          <table:table-cell table:style-name='Tableau2.A1' office:value-type='string' tal:define='orig_string string:Reference; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                          <table:table-cell table:style-name='Tableau2.A1' office:value-type='string' tal:define='orig_string string:Reference; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                             <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                             <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                           </table:table-cell>
@@ -291,7 +291,7 @@
                         <table:table-row table:style-name='Tableau2.E1.1'>
                           <table:table-cell table:style-name='Tableau2.E1.1.2'
                                             office:value-type='string'
-                                            tal:define='orig_string string:Document Date; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                                            tal:define='orig_string string:Document Date; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                             <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                             <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                           </table:table-cell>
@@ -301,7 +301,7 @@
                           </table:table-cell>
                         </table:table-row>
                         <table:table-row table:style-name='Tableau2.E1.1'>
-                          <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Currency; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                          <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Currency; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                             <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                             <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                           </table:table-cell>
@@ -314,7 +314,7 @@
                   </table:table-row>
                 </table:table-header-rows>
                 <table:table-row table:style-name='Tableau2.1'>
-                  <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Ship From; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                  <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Ship From; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                     <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                     <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                   </table:table-cell>
@@ -326,7 +326,7 @@
                             tal:condition="data_dict/source_vatid"
                             tal:content='python:data_dict["source_vatid"]'>vat id</text:p>
                   </table:table-cell>
-                  <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Ship To; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                  <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Ship To; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                     <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                     <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                   </table:table-cell>
@@ -343,7 +343,7 @@
                       <table:table-column table:style-name='Tableau2.E1.1'/>
                       <table:table-column table:style-name='Tableau2.E1.2'/>
                       <table:table-row table:style-name='Tableau2.E1.1'>
-                        <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Payment; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                        <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Payment; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                           <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                           <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                         </table:table-cell>
@@ -352,7 +352,7 @@
                         </table:table-cell>
                       </table:table-row>
                       <table:table-row table:style-name='Tableau2.E1.1'>
-                        <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Delivery Mode; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                        <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Delivery Mode; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                           <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                           <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                         </table:table-cell>
@@ -361,7 +361,7 @@
                         </table:table-cell>
                       </table:table-row>
                       <table:table-row table:style-name='Tableau2.E1.1'>
-                        <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Incoterm; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                        <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Incoterm; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                           <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                           <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                         </table:table-cell>
@@ -385,39 +385,39 @@
             <table:covered-table-cell/>
           </table:table-row>
           <table:table-row>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Line; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Line; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Your Item No.; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Your Item No.; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Our Item No.; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Our Item No.; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Description; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Description; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Quantity; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Quantity; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Unit; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Unit; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Delivery Date; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Delivery Date; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Unit Price; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Unit Price; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Total Price; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Total Price; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
@@ -531,7 +531,7 @@
                 <table:table-cell table:style-name='Tableau3.A1' office:value-type='string'>
                   <text:p text:style-name='Table_20_Contents'/>
                 </table:table-cell>
-                <table:table-cell table:style-name='Tableau3.D2' office:value-type='string' tal:define='orig_string string:Total Excluding VAT; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                <table:table-cell table:style-name='Tableau3.D2' office:value-type='string' tal:define='orig_string string:Total Excluding VAT; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                   <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                   <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                 </table:table-cell>
@@ -559,7 +559,7 @@
                           tal:replace='vat/getResourceTitle'/>:</text:p>
                     </tal:block>
                     <text:p text:style-name='Table_20_Heading'
-                            tal:define='orig_string string:TAX; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'><span tal:replace="python: 'Total %s' % (translated_message)"/>:</text:p>
+                            tal:define='orig_string string:TAX; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'><span tal:replace="python: 'Total %s' % (translated_message)"/>:</text:p>
                   </table:table-cell>
                   <table:table-cell table:style-name='Tableau3.E3'
                                     office:value-type='float'
@@ -585,7 +585,7 @@
                 <table:table-cell table:style-name='Tableau3.A1' office:value-type='string'>
                   <text:p text:style-name='Table_20_Contents'/>
                 </table:table-cell>
-                <table:table-cell table:style-name='Tableau3.D3' office:value-type='string' tal:define='orig_string string:Total Including VAT; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                <table:table-cell table:style-name='Tableau3.D3' office:value-type='string' tal:define='orig_string string:Total Including VAT; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                   <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                   <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                 </table:table-cell>
@@ -613,7 +613,7 @@
                 </table:table-cell>
               </table:table-row>
               <table:table-row table:style-name='Tableau3.6'>
-                <table:table-cell table:style-name='Tableau3.A6' office:value-type='string' tal:define='orig_string string:Notes; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                <table:table-cell table:style-name='Tableau3.A6' office:value-type='string' tal:define='orig_string string:Notes; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                   <text:p text:style-name='P2'><span tal:replace='orig_message'/><span tal:omit-tag='' tal:condition='python:translated_message != orig_message'> / <span tal:replace='translated_message'/></span>:</text:p>
                 </table:table-cell>
                 <table:table-cell table:style-name='Tableau3.B6' office:value-type='string'>

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.oot

@@ -248,14 +248,14 @@
     <style:master-page style:name="Standard" style:page-layout-name="pm1">
       <style:header tal:define="default_language python:test(request.get('international_form'), 'en', here.Localizer.get_selected_language());
                     orig_title python: data_dict['report_title'];
-                    en_title python: unicode(here.Base_translateString(orig_title, lang=default_language), 'utf-8');
-                    my_title python: unicode(here.Base_translateString(orig_title), 'utf-8');
+                    en_title python: here.Base_translateString(orig_title, lang=default_language);
+                    my_title python: here.Base_translateString(orig_title);
                     orig_page string:Page;
-                    en_page python: unicode(here.Base_translateString(orig_page, lang=default_language), 'utf-8');
-                    my_page python: unicode(here.Base_translateString(orig_page), 'utf-8');
+                    en_page python: here.Base_translateString(orig_page, lang=default_language);
+                    my_page python: here.Base_translateString(orig_page);
                     orig_of string:of;
-                    en_of python: unicode(here.Base_translateString(orig_of, lang=default_language), 'utf-8');
-                    my_of python: unicode(here.Base_translateString(orig_of), 'utf-8');
+                    en_of python: here.Base_translateString(orig_of, lang=default_language);
+                    my_of python: here.Base_translateString(orig_of);
                     image_path python: here.getPortalType().startswith('Purchase') and data_dict['destination_section_image_path'] or (data_dict['source_decision_image_path'] or data_dict['source_section_image_path']);
                     image_width python: here.getPortalType().startswith('Purchase') and data_dict['destination_section_image_width'] or (data_dict['source_decision_image_width'] or data_dict['source_section_image_width']);
                     image_height python: here.getPortalType().startswith('Purchase') and data_dict['destination_section_image_height'] or (data_dict['source_decision_image_height'] or data_dict['source_section_image_height'])">

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODT.oot

@@ -261,7 +261,7 @@
                     </table:table-cell>
                     <table:table-cell table:style-name='Tableau2.A1'
                                       office:value-type='string'
-                                      tal:define='orig_string string:Client; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                                      tal:define='orig_string string:Client; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                       <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                       <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                     </table:table-cell>
@@ -278,7 +278,7 @@
                         <table:table-column table:style-name='Tableau2.E1.1'/>
                         <table:table-column table:style-name='Tableau2.E1.2'/>
                         <table:table-row table:style-name='Tableau2.E1.1'>
-                          <table:table-cell table:style-name='Tableau2.A1' office:value-type='string' tal:define='orig_string string:Reference; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                          <table:table-cell table:style-name='Tableau2.A1' office:value-type='string' tal:define='orig_string string:Reference; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                             <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                             <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                           </table:table-cell>
@@ -289,7 +289,7 @@
                         <table:table-row table:style-name='Tableau2.E1.1'>
                           <table:table-cell table:style-name='Tableau2.E1.1.2'
                                             office:value-type='string'
-                                            tal:define='orig_string string:Document Date; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                                            tal:define='orig_string string:Document Date; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                             <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                             <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                           </table:table-cell>
@@ -299,7 +299,7 @@
                           </table:table-cell>
                         </table:table-row>
                         <table:table-row table:style-name='Tableau2.E1.1'>
-                          <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Order Reference; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                          <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Order Reference; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                             <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                             <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                           </table:table-cell>
@@ -312,7 +312,7 @@
                   </table:table-row>
                 </table:table-header-rows>
                 <table:table-row table:style-name='Tableau2.1'>
-                  <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Ship From; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                  <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Ship From; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                     <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                     <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                   </table:table-cell>
@@ -324,7 +324,7 @@
                             tal:condition="data_dict/source_vatid"
                             tal:content='python:data_dict["source_vatid"]'>vat id</text:p>
                   </table:table-cell>
-                  <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Ship To; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                  <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Ship To; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                     <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                     <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                   </table:table-cell>
@@ -341,7 +341,7 @@
                       <table:table-column table:style-name='Tableau2.E1.1'/>
                       <table:table-column table:style-name='Tableau2.E1.2'/>
                       <table:table-row table:style-name='Tableau2.E1.1'>
-                        <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Order Date; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                        <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Order Date; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                           <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                           <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                         </table:table-cell>
@@ -353,7 +353,7 @@
                         </table:table-cell>
                       </table:table-row>
                       <table:table-row table:style-name='Tableau2.E1.1'>
-                        <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Delivery Mode; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                        <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Delivery Mode; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                           <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                           <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                         </table:table-cell>
@@ -362,7 +362,7 @@
                         </table:table-cell>
                       </table:table-row>
                       <table:table-row table:style-name='Tableau2.E1.1'>
-                        <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Incoterm; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                        <table:table-cell table:style-name='Tableau2.E1.1.2' office:value-type='string' tal:define='orig_string string:Incoterm; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                           <text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
                           <text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
                         </table:table-cell>
@@ -386,28 +386,28 @@
             <table:covered-table-cell/>
           </table:table-row>
           <table:table-row>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Line; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Line; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Your Item No.; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Your Item No.; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Our Item No.; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Our Item No.; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Description; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Description; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
             
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Quantity; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Quantity; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
-            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Unit; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+            <table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Unit; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
               <text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
             </table:table-cell>
@@ -531,7 +531,7 @@
                 </table:table-cell>
               </table:table-row>
               <table:table-row table:style-name='Tableau3.6'>
-                <table:table-cell table:style-name='Tableau3.A6' office:value-type='string' tal:define='orig_string string:Notes; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
+                <table:table-cell table:style-name='Tableau3.A6' office:value-type='string' tal:define='orig_string string:Notes; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
                   <text:p text:style-name='P2'><span tal:replace='orig_message'/><span tal:omit-tag='' tal:condition='python:translated_message != orig_message'> / <span tal:replace='translated_message'/></span>:</text:p>
                 </table:table-cell>
                 <table:table-cell table:style-name='Tableau3.B6' office:value-type='string'>

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.oot

@@ -252,14 +252,14 @@
     <style:master-page style:name="Standard" style:page-layout-name="pm1">
       <style:header tal:define="default_language python:test(request.get('international_form'), 'en', here.Localizer.get_selected_language());
                     orig_title python: data_dict['report_title'];
-                    en_title python: unicode(here.Base_translateString(orig_title, lang=default_language), 'utf-8');
-                    my_title python: unicode(here.Base_translateString(orig_title), 'utf-8');
+                    en_title python: here.Base_translateString(orig_title, lang=default_language);
+                    my_title python: here.Base_translateString(orig_title);
                     orig_page string:Page;
-                    en_page python: unicode(here.Base_translateString(orig_page, lang=default_language), 'utf-8');
-                    my_page python: unicode(here.Base_translateString(orig_page), 'utf-8');
+                    en_page python: here.Base_translateString(orig_page, lang=default_language);
+                    my_page python: here.Base_translateString(orig_page);
                     orig_of string:of;
-                    en_of python: unicode(here.Base_translateString(orig_of, lang=default_language), 'utf-8');
-                    my_of python: unicode(here.Base_translateString(orig_of), 'utf-8');
+                    en_of python: here.Base_translateString(orig_of, lang=default_language);
+                    my_of python: here.Base_translateString(orig_of);
                     image_path python: here.getPortalType().startswith('Purchase') and data_dict['destination_section_image_path'] or (data_dict['source_decision_image_path'] or data_dict['source_section_image_path']);
                     image_width python: here.getPortalType().startswith('Purchase') and data_dict['destination_section_image_width'] or (data_dict['source_decision_image_width'] or data_dict['source_section_image_width']);
                     image_height python: here.getPortalType().startswith('Purchase') and data_dict['destination_section_image_height'] or (data_dict['source_decision_image_height'] or data_dict['source_section_image_height'])">