diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_printAsODT.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_printAsODT.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bab72256c1d7a392b991a1fd9dedace357fa8747
--- /dev/null
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_printAsODT.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Python_magic</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>if target_language:\n
+ container.REQUEST[\'AcceptLanguage\'].set(target_language, 10)\n
+\n
+return context.Order_viewAsODT(format=format)\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_filepath</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>target_language=\'\', format=\'pdf\'</string> </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>2</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>target_language</string>
+ <string>format</string>
+ <string>_getattr_</string>
+ <string>_getitem_</string>
+<string>container</string>
+<string>context</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <tuple>
+ <string></string>
+ <string>pdf</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>Order_printAsODT</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.xml
index 3b9341aae9adcf5252dd5946ed1215e18d4102a5..ec550fabdd64cba05c0c447f8659cae291983e2d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.xml
@@ -64,7 +64,7 @@ AAA=</string> </value>
<value> <string encoding="cdata"><![CDATA[
<office:document-content xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:metal=\'http://xml.zope.org/namespaces/metal\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\' office:version=\'1.0\'\n
- tal:define=\'data_dict here/Order_getODTDataDict\'>\n
+ tal:define=\'data_dict here/Order_getODTDataDict\'>\n
<office:scripts/>\n
<office:font-face-decls>\n
<style:font-face svg:font-family=\'StarSymbol\' style:name=\'StarSymbol\' style:font-charset=\'x-symbol\'/>\n
@@ -307,66 +307,66 @@ AAA=</string> </value>
ds_email python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_email\'] or data_dict[\'source_decision_email\'];\n
ds_vatid python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_vatid\'] or data_dict[\'source_decision_vatid\'];\n
orig_title python: here.getPortalType();\n
- en_title python:here.Base_translateString(orig_title, lang=\'en\');\n
- my_title python:here.Base_translateString(orig_title);\n
- orig_page string:Page; en_page python:here.Base_translateString(orig_page, lang=\'en\');\n
- my_page python:here.Base_translateString(orig_page);\n
+ en_title python: unicode(here.Base_translateString(orig_title, lang=\'en\'), \'utf-8\');\n
+ my_title python: unicode(here.Base_translateString(orig_title), \'utf-8\');\n
+ orig_page string:Page; en_page python: unicode(here.Base_translateString(orig_page, lang=\'en\'), \'utf-8\');\n
+ my_page python: unicode(here.Base_translateString(orig_page), \'utf-8\');\n
orig_of string:of;\n
- en_of python:here.Base_translateString(orig_of, lang=\'en\');\n
- my_of python:here.Base_translateString(orig_of)">\n
+ en_of python: unicode(here.Base_translateString(orig_of, lang=\'en\'), \'utf-8\');\n
+ my_of python: unicode(here.Base_translateString(orig_of), \'utf-8\')">\n
<text:p text:style-name=\'Table_20_Heading\'>\n
<text:variable-set text:formula=\'ooow:title\'\n
- text:name=\'ds_title\'\n
- text:display=\'none\'\n
- office:value-type=\'string\'\n
- tal:attributes=\'office:string-value ds_title\'/>\n
+ text:name=\'ds_title\'\n
+ text:display=\'none\'\n
+ office:value-type=\'string\'\n
+ tal:attributes=\'office:string-value ds_title\'/>\n
<text:variable-set text:formula=\'ooow:address\'\n
- text:name=\'ds_address\'\n
- text:display=\'none\'\n
- office:string-value=\'address\'\n
- office:value-type=\'string\'\n
- tal:attributes=\'office:string-value ds_address\'/>\n
+ text:name=\'ds_address\'\n
+ text:display=\'none\'\n
+ office:string-value=\'address\'\n
+ office:value-type=\'string\'\n
+ tal:attributes=\'office:string-value ds_address\'/>\n
<text:variable-set text:formula=\'ooow:telfax\'\n
- text:name=\'ds_telfax\'\n
- text:display=\'none\'\n
- office:string-value=\'telfax\'\n
- office:value-type=\'string\'\n
- tal:attributes=\'office:string-value ds_telfax\'/>\n
+ text:name=\'ds_telfax\'\n
+ text:display=\'none\'\n
+ office:string-value=\'telfax\'\n
+ office:value-type=\'string\'\n
+ tal:attributes=\'office:string-value ds_telfax\'/>\n
<text:variable-set text:formula=\'ooow:email\'\n
- text:name=\'ds_email\'\n
- text:display=\'none\'\n
- office:string-value=\'email\'\n
- office:value-type=\'string\'\n
- tal:attributes=\'office:string-value ds_email\'/>\n
+ text:name=\'ds_email\'\n
+ text:display=\'none\'\n
+ office:string-value=\'email\'\n
+ office:value-type=\'string\'\n
+ tal:attributes=\'office:string-value ds_email\'/>\n
<text:variable-set text:formula=\'ooow:vatid\'\n
- text:name=\'ds_vatid\'\n
- text:display=\'none\'\n
- office:string-value=\'vatid\'\n
- office:value-type=\'string\'\n
- tal:attributes=\'office:string-value ds_vatid\'/>\n
+ text:name=\'ds_vatid\'\n
+ text:display=\'none\'\n
+ office:string-value=\'vatid\'\n
+ office:value-type=\'string\'\n
+ tal:attributes=\'office:string-value ds_vatid\'/>\n
<text:variable-set text:formula=\'ooow:purchase_order\'\n
- text:name=\'purchase_order\'\n
- text:display=\'none\'\n
- office:string-value=\'purchase_order\'\n
- office:value-type=\'string\'\n
- tal:attributes=\'office:string-value en_title\'/>\n
+ text:name=\'purchase_order\'\n
+ text:display=\'none\'\n
+ office:string-value=\'purchase_order\'\n
+ office:value-type=\'string\'\n
+ tal:attributes=\'office:string-value en_title\'/>\n
<text:variable-set text:formula=\'ooow:purchase_order_tr\'\n
- text:name=\'purchase_order_tr\'\n
- text:display=\'none\'\n
- office:string-value=\'purchase_order_tr\'\n
- office:value-type=\'string\'\n
- tal:condition=\'python:my_title != en_title\'\n
- tal:attributes=\'office:string-value my_title\'/>\n
+ text:name=\'purchase_order_tr\'\n
+ text:display=\'none\'\n
+ office:string-value=\'purchase_order_tr\'\n
+ office:value-type=\'string\'\n
+ tal:condition=\'python:my_title != en_title\'\n
+ tal:attributes=\'office:string-value my_title\'/>\n
<text:variable-set text:formula=\'ooow:page\'\n
- text:name=\'page\' text:display=\'none\'\n
- office:string-value=\'page\'\n
- office:value-type=\'string\'\n
- tal:attributes=\'office:string-value my_page\'/>\n
+ text:name=\'page\' text:display=\'none\'\n
+ office:string-value=\'page\'\n
+ office:value-type=\'string\'\n
+ tal:attributes=\'office:string-value my_page\'/>\n
<text:variable-set text:formula=\'ooow:of\'\n
- text:name=\'of\' text:display=\'none\'\n
- office:string-value=\'of\'\n
- office:value-type=\'string\'\n
- tal:attributes=\'office:string-value my_of\'/>\n
+ text:name=\'of\' text:display=\'none\'\n
+ office:string-value=\'of\'\n
+ office:value-type=\'string\'\n
+ tal:attributes=\'office:string-value my_of\'/>\n
<tal:block tal:replace=\'en_string\'/>:</text:p>\n
<text:p text:style-name=\'Table_20_Heading\'\n
tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
@@ -385,7 +385,7 @@ AAA=</string> </value>
</table:table-cell>\n
<table:table-cell table:style-name=\'Tableau2.A1\'\n
office:value-type=\'string\'\n
- tal:define=\'orig_string string:Recipient; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)\'>\n
+ 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")\'>\n
<text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
<text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
</table:table-cell>\n
@@ -400,7 +400,7 @@ AAA=</string> </value>
<table:table-column table:style-name=\'Tableau2.E1.1\'/>\n
<table:table-column table:style-name=\'Tableau2.E1.2\'/>\n
<table:table-row table:style-name=\'Tableau2.E1.1\'>\n
- <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)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
<text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
</table:table-cell>\n
@@ -411,7 +411,7 @@ AAA=</string> </value>
<table:table-row table:style-name=\'Tableau2.E1.1\'>\n
<table:table-cell table:style-name=\'Tableau2.E1.1.2\'\n
office:value-type=\'string\'\n
- 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)\'>\n
+ 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")\'>\n
<text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
<text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
</table:table-cell>\n
@@ -421,7 +421,7 @@ AAA=</string> </value>
</table:table-cell>\n
</table:table-row>\n
<table:table-row table:style-name=\'Tableau2.E1.1\'>\n
- <table:table-cell table:style-name=\'Tableau2.E1.1.2\' office:value-type=\'string\' tal:define=\'orig_string string:Currency; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)\'>\n
+ <table:table-cell table:style-name=\'Tableau2.E1.1.2\' office:value-type=\'string\' tal:define=\'orig_string string:Currency; en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8"); my_string python:unicode(here.Base_translateString(orig_string),"utf-8")\'>\n
<text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
<text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
</table:table-cell>\n
@@ -434,7 +434,7 @@ AAA=</string> </value>
</table:table-row>\n
</table:table-header-rows>\n
<table:table-row table:style-name=\'Tableau2.1\'>\n
- <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)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
<text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
</table:table-cell>\n
@@ -443,7 +443,7 @@ AAA=</string> </value>
<text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:data_dict["source_decision_telfax"]\'>tel, fax</text:p>\n
<text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:data_dict["source_decision_email"]\'>email</text:p>\n
</table:table-cell>\n
- <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)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
<text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
</table:table-cell>\n
@@ -457,7 +457,7 @@ AAA=</string> </value>
<table:table-column table:style-name=\'Tableau2.E1.1\'/>\n
<table:table-column table:style-name=\'Tableau2.E1.2\'/>\n
<table:table-row table:style-name=\'Tableau2.E1.1\'>\n
- <table:table-cell table:style-name=\'Tableau2.E1.1.2\' office:value-type=\'string\' tal:define=\'orig_string string:Payment; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)\'>\n
+ <table:table-cell table:style-name=\'Tableau2.E1.1.2\' office:value-type=\'string\' tal:define=\'orig_string string:Payment; en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8"); my_string python:unicode(here.Base_translateString(orig_string),"utf-8")\'>\n
<text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
<text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
</table:table-cell>\n
@@ -466,7 +466,7 @@ AAA=</string> </value>
</table:table-cell>\n
</table:table-row>\n
<table:table-row table:style-name=\'Tableau2.E1.1\'>\n
- <table:table-cell table:style-name=\'Tableau2.E1.1.2\' office:value-type=\'string\' tal:define=\'orig_string string:Delivery Mode; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
<text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
</table:table-cell>\n
@@ -475,7 +475,7 @@ AAA=</string> </value>
</table:table-cell>\n
</table:table-row>\n
<table:table-row table:style-name=\'Tableau2.E1.1\'>\n
- <table:table-cell table:style-name=\'Tableau2.E1.1.2\' office:value-type=\'string\' tal:define=\'orig_string string:Incoterm; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
<text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
</table:table-cell>\n
@@ -499,91 +499,91 @@ AAA=</string> </value>
<table:covered-table-cell/>\n
</table:table-row>\n
<table:table-row>\n
- <table:table-cell table:style-name=\'Tableau1.A2\' office:value-type=\'string\' tal:define=\'orig_string string:Line; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Item_20_Table_20_Title_20_Left\'><span tal:replace=\'en_string\'/></text:p>\n
<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>\n
</table:table-cell>\n
- <table:table-cell table:style-name=\'Tableau1.A2\' office:value-type=\'string\' tal:define=\'orig_string string:Your Item no.; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Item_20_Table_20_Title\'><span tal:replace=\'en_string\'/></text:p>\n
<text:p text:style-name=\'Item_20_Table_20_Title\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/></text:p>\n
</table:table-cell>\n
- <table:table-cell table:style-name=\'Tableau1.A2\' office:value-type=\'string\' tal:define=\'orig_string string:Our Item no.; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Item_20_Table_20_Title\'><span tal:replace=\'en_string\'/></text:p>\n
<text:p text:style-name=\'Item_20_Table_20_Title\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/></text:p>\n
</table:table-cell>\n
- <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)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Item_20_Table_20_Title_20_Left\'><span tal:replace=\'en_string\'/></text:p>\n
<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>\n
</table:table-cell>\n
- <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)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Item_20_Table_20_Title_20_Right\'><span tal:replace=\'en_string\'/></text:p>\n
<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>\n
</table:table-cell>\n
- <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)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Item_20_Table_20_Title\'><span tal:replace=\'en_string\'/></text:p>\n
<text:p text:style-name=\'Item_20_Table_20_Title\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/></text:p>\n
</table:table-cell>\n
- <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)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Item_20_Table_20_Title\'><span tal:replace=\'en_string\'/></text:p>\n
<text:p text:style-name=\'Item_20_Table_20_Title\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/></text:p>\n
</table:table-cell>\n
- <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)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Item_20_Table_20_Title_20_Right\'><span tal:replace=\'en_string\'/></text:p>\n
<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>\n
</table:table-cell>\n
- <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)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Item_20_Table_20_Title_20_Right\'><span tal:replace=\'en_string\'/></text:p>\n
<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>\n
</table:table-cell>\n
</table:table-row>\n
</table:table-header-rows>\n
<table:table-row table:style-name=\'Tableau1.3\' tal:repeat=\'line_dict python:data_dict["line_list"]\'>\n
- <div tal:omit-tag=\'\' tal:define=\'style_name python:line_dict["style_name"];\n
- left_style_name python:line_dict["left_style_name"];\n
- right_style_name python:line_dict["right_style_name"]\'>\n
- <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
- <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:line_dict["index"]\' tal:attributes=\'text:style-name left_style_name\'>1</text:p>\n
- </table:table-cell>\n
- <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
- <text:p text:style-name=\'Table_20_Contents\'\n
- tal:content=\'python:line_dict["source_reference"]\'\n
- tal:attributes=\'text:style-name style_name\'>source_ref</text:p>\n
- </table:table-cell>\n
- <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
- <text:p text:style-name=\'Table_20_Contents\'\n
- tal:content=\'python:line_dict["reference"]\'\n
- tal:attributes=\'text:style-name style_name\'>ref</text:p>\n
- </table:table-cell>\n
- <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
- <text:p text:style-name=\'Table_20_Contents\'\n
- tal:content=\'python:line_dict["description"]\'\n
- tal:attributes=\'text:style-name left_style_name\'>desc</text:p>\n
- </table:table-cell>\n
- <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'float\'>\n
- <text:p text:style-name=\'Table_20_Contents\'\n
- tal:content=\'python:line_dict["total_quantity"]\'\n
- tal:attributes=\'text:style-name right_style_name\'>qty</text:p>\n
- </table:table-cell>\n
- <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
- <text:p text:style-name=\'Table_20_Contents\'\n
- tal:content=\'python:line_dict["quantity_unit"]\'\n
- tal:attributes=\'text:style-name style_name\'>qty_u</text:p>\n
- </table:table-cell>\n
- <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
- <text:p text:style-name=\'Table_20_Contents\'\n
- tal:content=\'python:line_dict["stop_date"]\'\n
- tal:attributes=\'text:style-name style_name\'>stop_date</text:p>\n
- </table:table-cell>\n
- <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'float\'>\n
- <text:p text:style-name=\'Table_20_Contents\'\n
- tal:content=\'python:line_dict["base_price"]\'\n
- tal:attributes=\'text:style-name right_style_name\'>base_price</text:p>\n
- </table:table-cell>\n
- <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'float\'>\n
- <text:p text:style-name=\'Table_20_Contents\'\n
- tal:content=\'python:line_dict["total_price"]\'\n
- tal:attributes=\'text:style-name right_style_name\'>total_price</text:p>\n
- </table:table-cell>\n
+ <div tal:omit-tag=\'\' tal:define=\'style_name python:line_dict["style_name"];\n
+ left_style_name python:line_dict["left_style_name"];\n
+ right_style_name python:line_dict["right_style_name"]\'>\n
+ <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:line_dict["index"]\' tal:attributes=\'text:style-name left_style_name\'>1</text:p>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'\n
+ tal:content=\'python:line_dict["source_reference"]\'\n
+ tal:attributes=\'text:style-name style_name\'>source_ref</text:p>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'\n
+ tal:content=\'python:line_dict["reference"]\'\n
+ tal:attributes=\'text:style-name style_name\'>ref</text:p>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'\n
+ tal:content=\'python:line_dict["description"]\'\n
+ tal:attributes=\'text:style-name left_style_name\'>desc</text:p>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'float\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'\n
+ tal:content=\'python:line_dict["total_quantity"]\'\n
+ tal:attributes=\'text:style-name right_style_name\'>qty</text:p>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'\n
+ tal:content=\'python:line_dict["quantity_unit"]\'\n
+ tal:attributes=\'text:style-name style_name\'>qty_u</text:p>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'\n
+ tal:content=\'python:line_dict["stop_date"]\'\n
+ tal:attributes=\'text:style-name style_name\'>stop_date</text:p>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'float\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'\n
+ tal:content=\'python:line_dict["base_price"]\'\n
+ tal:attributes=\'text:style-name right_style_name\'>base_price</text:p>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'float\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'\n
+ tal:content=\'python:line_dict["total_price"]\'\n
+ tal:attributes=\'text:style-name right_style_name\'>total_price</text:p>\n
+ </table:table-cell>\n
</div>\n
</table:table-row>\n
<table:table-row table:style-name=\'Tableau1.5\'>\n
@@ -622,7 +622,7 @@ AAA=</string> </value>
<table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
<text:p text:style-name=\'Table_20_Contents\'/>\n
</table:table-cell>\n
- <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)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
<text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
</table:table-cell>\n
@@ -644,14 +644,14 @@ AAA=</string> </value>
<table:table-cell table:style-name=\'Tableau3.D3\'\n
office:value-type=\'string\'>\n
<tal:block tal:repeat="vat python: data_dict[\'vat_list\']">\n
- <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)">\n
+ <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")\'>\n
<text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
<text:p text:style-name=\'Table_20_Heading\'\n
tal:condition=\'python:my_string != en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
</tal:block>\n
</tal:block>\n
<text:p text:style-name=\'Table_20_Heading\'\n
- 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>\n
+ 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>\n
</table:table-cell>\n
<table:table-cell table:style-name=\'Tableau3.E3\'\n
office:value-type=\'float\'\n
@@ -661,8 +661,8 @@ AAA=</string> </value>
text:style-name=\'Table_20_Contents_20_Right\'\n
tal:content="vat_price">2000</text:p>\n
</tal:block>\n
- <text:p text:style-name=\'Table_20_Contents_20_Right\'\n
- tal:content="python: sum(total_vat_list)">2000</text:p>\n
+ <text:p text:style-name=\'Table_20_Contents_20_Right\'\n
+ tal:content="python: sum(total_vat_list)">2000</text:p>\n
</table:table-cell>\n
</tal:block>\n
</table:table-row>\n
@@ -676,7 +676,7 @@ AAA=</string> </value>
<table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
<text:p text:style-name=\'Table_20_Contents\'/>\n
</table:table-cell>\n
- <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)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
<text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
</table:table-cell>\n
@@ -703,7 +703,7 @@ AAA=</string> </value>
</table:table-cell>\n
</table:table-row>\n
<table:table-row table:style-name=\'Tableau3.6\'>\n
- <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)\'>\n
+ <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")\'>\n
<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>\n
</table:table-cell>\n
<table:table-cell table:style-name=\'Tableau3.B6\' office:value-type=\'string\'>\n
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODT.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODT.xml
index ca6440a194ce36ca206e0c96c0d0224a92056095..2ed55ba0e92202f5aa96f425b0af3a3295ed386d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODT.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODT.xml
@@ -64,7 +64,7 @@ AAA=</string> </value>
<value> <string encoding="cdata"><![CDATA[
<office:document-content xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:metal=\'http://xml.zope.org/namespaces/metal\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\' office:version=\'1.0\'\n
- tal:define=\'data_dict here/PackingList_getODTDataDict\'>\n
+ tal:define=\'data_dict here/Order_getODTDataDict\'>\n
<office:scripts/>\n
<office:font-face-decls>\n
<style:font-face svg:font-family=\'StarSymbol\' style:name=\'StarSymbol\' style:font-charset=\'x-symbol\'/>\n
@@ -280,6 +280,8 @@ AAA=</string> </value>
<table:table-column table:style-name=\'Tableau1.E\'/>\n
<table:table-column table:style-name=\'Tableau1.F\'/>\n
<table:table-column table:style-name=\'Tableau1.G\'/>\n
+ <table:table-column table:style-name=\'Tableau1.H\'/>\n
+ <table:table-column table:style-name=\'Tableau1.I\'/>\n
<table:table-header-rows>\n
<table:table-row table:style-name=\'Tableau1.1\'>\n
<table:table-cell table:style-name=\'Tableau1.A1\'\n
@@ -295,75 +297,76 @@ AAA=</string> </value>
<table:table-row table:style-name=\'Tableau2.1\'>\n
<table:table-cell table:style-name=\'Tableau2.A1\'\n
office:value-type=\'string\'>\n
+ <!--This PageTemplate is Used For Sale Order and Purchase Order-->\n
<tal:block tal:define="orig_string string:Supplier;\n
en_string python:here.Base_translateString(orig_string, lang=\'en\');\n
my_string python:here.Base_translateString(orig_string);\n
- ds_title python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_title\'] or data_dict[\'source_section_title\'];\n
- ds_address python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_address\'] or data_dict[\'source_section_address\'];\n
- ds_telfax python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_telfax\'] or data_dict[\'source_section_telfax\'];\n
- ds_email python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_email\'] or data_dict[\'source_section_email\'];\n
- ds_vatid python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_vatid\'] or data_dict[\'source_section_vatid\'];\n
+ ds_title python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_title\'] or data_dict[\'source_decision_title\'];\n
+ ds_address python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_address\'] or data_dict[\'source_decision_address\'];\n
+ ds_telfax python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_telfax\'] or data_dict[\'source_decision_telfax\'];\n
+ ds_email python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_email\'] or data_dict[\'source_decision_email\'];\n
+ ds_vatid python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_vatid\'] or data_dict[\'source_decision_vatid\'];\n
orig_title python: here.getPortalType();\n
- en_title python:here.Base_translateString(orig_title, lang=\'en\');\n
- my_title python:unicode(here.Base_translateString(orig_title), \'utf-8\');\n
- orig_page string:Page; en_page python:here.Base_translateString(orig_page, lang=\'en\');\n
- my_page python:here.Base_translateString(orig_page);\n
+ en_title python: unicode(here.Base_translateString(orig_title, lang=\'en\'), \'utf-8\');\n
+ my_title python: unicode(here.Base_translateString(orig_title), \'utf-8\');\n
+ orig_page string:Page; en_page python: unicode(here.Base_translateString(orig_page, lang=\'en\'), \'utf-8\');\n
+ my_page python: unicode(here.Base_translateString(orig_page), \'utf-8\');\n
orig_of string:of;\n
- en_of python:here.Base_translateString(orig_of, lang=\'en\');\n
- my_of python:here.Base_translateString(orig_of)">\n
+ en_of python: unicode(here.Base_translateString(orig_of, lang=\'en\'), \'utf-8\');\n
+ my_of python: unicode(here.Base_translateString(orig_of), \'utf-8\')">\n
<text:p text:style-name=\'Table_20_Heading\'>\n
<text:variable-set text:formula=\'ooow:title\'\n
- text:name=\'ds_title\'\n
- text:display=\'none\'\n
- office:value-type=\'string\'\n
- tal:attributes=\'office:string-value ds_title\'/>\n
+ text:name=\'ds_title\'\n
+ text:display=\'none\'\n
+ office:value-type=\'string\'\n
+ tal:attributes=\'office:string-value ds_title\'/>\n
<text:variable-set text:formula=\'ooow:address\'\n
- text:name=\'ds_address\'\n
- text:display=\'none\'\n
- office:string-value=\'address\'\n
- office:value-type=\'string\'\n
- tal:attributes=\'office:string-value ds_address\'/>\n
+ text:name=\'ds_address\'\n
+ text:display=\'none\'\n
+ office:string-value=\'address\'\n
+ office:value-type=\'string\'\n
+ tal:attributes=\'office:string-value ds_address\'/>\n
<text:variable-set text:formula=\'ooow:telfax\'\n
- text:name=\'ds_telfax\'\n
- text:display=\'none\'\n
- office:string-value=\'telfax\'\n
- office:value-type=\'string\'\n
- tal:attributes=\'office:string-value ds_telfax\'/>\n
+ text:name=\'ds_telfax\'\n
+ text:display=\'none\'\n
+ office:string-value=\'telfax\'\n
+ office:value-type=\'string\'\n
+ tal:attributes=\'office:string-value ds_telfax\'/>\n
<text:variable-set text:formula=\'ooow:email\'\n
- text:name=\'ds_email\'\n
- text:display=\'none\'\n
- office:string-value=\'email\'\n
- office:value-type=\'string\'\n
- tal:attributes=\'office:string-value ds_email\'/>\n
+ text:name=\'ds_email\'\n
+ text:display=\'none\'\n
+ office:string-value=\'email\'\n
+ office:value-type=\'string\'\n
+ tal:attributes=\'office:string-value ds_email\'/>\n
<text:variable-set text:formula=\'ooow:vatid\'\n
- text:name=\'ds_vatid\'\n
- text:display=\'none\'\n
- office:string-value=\'vatid\'\n
- office:value-type=\'string\'\n
- tal:attributes=\'office:string-value ds_vatid\'/>\n
+ text:name=\'ds_vatid\'\n
+ text:display=\'none\'\n
+ office:string-value=\'vatid\'\n
+ office:value-type=\'string\'\n
+ tal:attributes=\'office:string-value ds_vatid\'/>\n
<text:variable-set text:formula=\'ooow:purchase_order\'\n
- text:name=\'purchase_order\'\n
- text:display=\'none\'\n
- office:string-value=\'purchase_order\'\n
- office:value-type=\'string\'\n
- tal:attributes=\'office:string-value en_title\'/>\n
+ text:name=\'purchase_order\'\n
+ text:display=\'none\'\n
+ office:string-value=\'purchase_order\'\n
+ office:value-type=\'string\'\n
+ tal:attributes=\'office:string-value en_title\'/>\n
<text:variable-set text:formula=\'ooow:purchase_order_tr\'\n
- text:name=\'purchase_order_tr\'\n
- text:display=\'none\'\n
- office:string-value=\'purchase_order_tr\'\n
- office:value-type=\'string\'\n
- tal:condition=\'python:my_title != en_title\'\n
- tal:attributes=\'office:string-value my_title\'/>\n
+ text:name=\'purchase_order_tr\'\n
+ text:display=\'none\'\n
+ office:string-value=\'purchase_order_tr\'\n
+ office:value-type=\'string\'\n
+ tal:condition=\'python:my_title != en_title\'\n
+ tal:attributes=\'office:string-value my_title\'/>\n
<text:variable-set text:formula=\'ooow:page\'\n
- text:name=\'page\' text:display=\'none\'\n
- office:string-value=\'page\'\n
- office:value-type=\'string\'\n
- tal:attributes=\'office:string-value my_page\'/>\n
+ text:name=\'page\' text:display=\'none\'\n
+ office:string-value=\'page\'\n
+ office:value-type=\'string\'\n
+ tal:attributes=\'office:string-value my_page\'/>\n
<text:variable-set text:formula=\'ooow:of\'\n
- text:name=\'of\' text:display=\'none\'\n
- office:string-value=\'of\'\n
- office:value-type=\'string\'\n
- tal:attributes=\'office:string-value my_of\'/>\n
+ text:name=\'of\' text:display=\'none\'\n
+ office:string-value=\'of\'\n
+ office:value-type=\'string\'\n
+ tal:attributes=\'office:string-value my_of\'/>\n
<tal:block tal:replace=\'en_string\'/>:</text:p>\n
<text:p text:style-name=\'Table_20_Heading\'\n
tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
@@ -382,7 +385,7 @@ AAA=</string> </value>
</table:table-cell>\n
<table:table-cell table:style-name=\'Tableau2.A1\'\n
office:value-type=\'string\'\n
- tal:define=\'orig_string string:Recipient; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)\'>\n
+ 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")\'>\n
<text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
<text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
</table:table-cell>\n
@@ -397,7 +400,7 @@ AAA=</string> </value>
<table:table-column table:style-name=\'Tableau2.E1.1\'/>\n
<table:table-column table:style-name=\'Tableau2.E1.2\'/>\n
<table:table-row table:style-name=\'Tableau2.E1.1\'>\n
- <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)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
<text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
</table:table-cell>\n
@@ -408,7 +411,7 @@ AAA=</string> </value>
<table:table-row table:style-name=\'Tableau2.E1.1\'>\n
<table:table-cell table:style-name=\'Tableau2.E1.1.2\'\n
office:value-type=\'string\'\n
- 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)\'>\n
+ 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")\'>\n
<text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
<text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
</table:table-cell>\n
@@ -418,7 +421,7 @@ AAA=</string> </value>
</table:table-cell>\n
</table:table-row>\n
<table:table-row table:style-name=\'Tableau2.E1.1\'>\n
- <table:table-cell table:style-name=\'Tableau2.E1.1.2\' office:value-type=\'string\' tal:define=\'orig_string string:Currency; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)\'>\n
+ <table:table-cell table:style-name=\'Tableau2.E1.1.2\' office:value-type=\'string\' tal:define=\'orig_string string:Currency; en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8"); my_string python:unicode(here.Base_translateString(orig_string),"utf-8")\'>\n
<text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
<text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
</table:table-cell>\n
@@ -431,31 +434,18 @@ AAA=</string> </value>
</table:table-row>\n
</table:table-header-rows>\n
<table:table-row table:style-name=\'Tableau2.1\'>\n
- <table:table-cell table:style-name=\'Tableau2.E1.1.2\'\n
- office:value-type=\'string\'\n
- tal:define=\'orig_string string:Seller;\n
- en_string python:here.Base_translateString(orig_string, lang="en");\n
- my_string python:here.Base_translateString(orig_string)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
<text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
</table:table-cell>\n
- <table:table-cell table:style-name=\'Tableau2.E1.1.2\'\n
- office:value-type=\'string\'>\n
- <text:p text:style-name=\'Table_20_Contents\'\n
- tal:content=\'python:data_dict["source_decision_title"]\'>name</text:p>\n
- <text:p text:style-name=\'Table_20_Contents\'\n
- tal:content=\'python:data_dict["source_decision_telfax"]\'>tel, fax</text:p>\n
- <text:p text:style-name=\'Table_20_Contents\'\n
- tal:content=\'python:data_dict["source_decision_email"]\'>email</text:p>\n
+ <table:table-cell table:style-name=\'Tableau2.E1.1.2\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:data_dict["source_decision_title"]\'>name</text:p>\n
+ <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:data_dict["source_decision_telfax"]\'>tel, fax</text:p>\n
+ <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:data_dict["source_decision_email"]\'>email</text:p>\n
</table:table-cell>\n
- <table:table-cell table:style-name=\'Tableau2.E1.1.2\'\n
- office:value-type=\'string\'\n
- tal:define=\'orig_string string:Buyer;\n
- en_string python:here.Base_translateString(orig_string, lang="en");\n
- my_string python:here.Base_translateString(orig_string)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
- <text:p text:style-name=\'Table_20_Heading\'\n
- tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
+ <text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
</table:table-cell>\n
<table:table-cell table:style-name=\'Tableau2.E1.1.2\' office:value-type=\'string\'>\n
<text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:data_dict["destination_decision_title"]\'>name</text:p>\n
@@ -467,35 +457,30 @@ AAA=</string> </value>
<table:table-column table:style-name=\'Tableau2.E1.1\'/>\n
<table:table-column table:style-name=\'Tableau2.E1.2\'/>\n
<table:table-row table:style-name=\'Tableau2.E1.1\'>\n
- <table:table-cell table:style-name=\'Tableau2.E1.1.2\'\n
- office:value-type=\'string\'\n
- tal:define=\'orig_string string:Delivery Mode;\n
- en_string python:here.Base_translateString(orig_string, lang="en");\n
- my_string python:here.Base_translateString(orig_string)\'>\n
+ <table:table-cell table:style-name=\'Tableau2.E1.1.2\' office:value-type=\'string\' tal:define=\'orig_string string:Payment; en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8"); my_string python:unicode(here.Base_translateString(orig_string),"utf-8")\'>\n
<text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
- <text:p text:style-name=\'Table_20_Heading\'\n
- tal:condition=\'python:my_string != en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
+ <text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
</table:table-cell>\n
- <table:table-cell table:style-name=\'Tableau2.E1.2.2\'\n
- office:value-type=\'string\'>\n
- <text:p text:style-name=\'Table_20_Contents\'\n
- tal:content=\'python:data_dict["delivery_mode"]\'>del mode</text:p>\n
+ <table:table-cell table:style-name=\'Tableau2.E1.2.2\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:data_dict["payment_condition"]\'>60 days</text:p>\n
</table:table-cell>\n
</table:table-row>\n
<table:table-row table:style-name=\'Tableau2.E1.1\'>\n
- <table:table-cell table:style-name=\'Tableau2.E1.1.2\'\n
- office:value-type=\'string\'\n
- tal:define=\'orig_string string:Incoterm;\n
- en_string python:here.Base_translateString(orig_string, lang="en");\n
- my_string python:here.Base_translateString(orig_string)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
- <text:p text:style-name=\'Table_20_Heading\'\n
- tal:condition=\'python:my_string != en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
+ <text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
</table:table-cell>\n
- <table:table-cell table:style-name=\'Tableau2.E1.2.2\'\n
- office:value-type=\'string\'>\n
- <text:p text:style-name=\'Table_20_Contents\'\n
- tal:content=\'python:data_dict["incoterm"]\'>incoterm</text:p>\n
+ <table:table-cell table:style-name=\'Tableau2.E1.2.2\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:data_dict["delivery_mode"]\'>del mode</text:p>\n
+ </table:table-cell>\n
+ </table:table-row>\n
+ <table:table-row table:style-name=\'Tableau2.E1.1\'>\n
+ <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")\'>\n
+ <text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
+ <text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau2.E1.2.2\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:data_dict["incoterm"]\'>incoterm</text:p>\n
</table:table-cell>\n
</table:table-row>\n
</table:table>\n
@@ -510,78 +495,54 @@ AAA=</string> </value>
<table:covered-table-cell/>\n
<table:covered-table-cell/>\n
<table:covered-table-cell/>\n
+ <table:covered-table-cell/>\n
+ <table:covered-table-cell/>\n
</table:table-row>\n
<table:table-row>\n
- <table:table-cell table:style-name=\'Tableau1.A2\'\n
- office:value-type=\'string\'\n
- tal:define=\'orig_string string:Line;\n
- en_string python:here.Base_translateString(orig_string, lang="en");\n
- my_string python:here.Base_translateString(orig_string)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Item_20_Table_20_Title_20_Left\'><span tal:replace=\'en_string\'/></text:p>\n
- <text:p text:style-name=\'Item_20_Table_20_Title_20_Left\'\n
- tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/></text:p>\n
+ <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>\n
</table:table-cell>\n
- <table:table-cell table:style-name=\'Tableau1.A2\'\n
- office:value-type=\'string\'\n
- tal:define=\'orig_string string:Your Item no.;\n
- en_string python:here.Base_translateString(orig_string, lang="en");\n
- my_string python:here.Base_translateString(orig_string)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Item_20_Table_20_Title\'><span tal:replace=\'en_string\'/></text:p>\n
- <text:p text:style-name=\'Item_20_Table_20_Title\'\n
- tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/></text:p>\n
+ <text:p text:style-name=\'Item_20_Table_20_Title\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/></text:p>\n
</table:table-cell>\n
- <table:table-cell table:style-name=\'Tableau1.A2\'\n
- office:value-type=\'string\'\n
- tal:define=\'orig_string string:Our Item no.;\n
- en_string python:here.Base_translateString(orig_string, lang="en");\n
- my_string python:here.Base_translateString(orig_string)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Item_20_Table_20_Title\'><span tal:replace=\'en_string\'/></text:p>\n
- <text:p text:style-name=\'Item_20_Table_20_Title\'\n
- tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/></text:p>\n
+ <text:p text:style-name=\'Item_20_Table_20_Title\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/></text:p>\n
</table:table-cell>\n
- <table:table-cell table:style-name=\'Tableau1.A2\'\n
- office:value-type=\'string\'\n
- tal:define=\'orig_string string:Description;\n
- en_string python:here.Base_translateString(orig_string, lang="en");\n
- my_string python:here.Base_translateString(orig_string)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Item_20_Table_20_Title_20_Left\'><span tal:replace=\'en_string\'/></text:p>\n
- <text:p text:style-name=\'Item_20_Table_20_Title_20_Left\'\n
- tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/></text:p>\n
+ <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>\n
</table:table-cell>\n
- <table:table-cell table:style-name=\'Tableau1.A2\'\n
- office:value-type=\'string\'\n
- tal:define=\'orig_string string:Quantity;\n
- en_string python:here.Base_translateString(orig_string, lang="en");\n
- my_string python:here.Base_translateString(orig_string)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Item_20_Table_20_Title_20_Right\'><span tal:replace=\'en_string\'/></text:p>\n
- <text:p text:style-name=\'Item_20_Table_20_Title_20_Right\'\n
- tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/></text:p>\n
+ <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>\n
</table:table-cell>\n
- <table:table-cell table:style-name=\'Tableau1.A2\' office:value-type=\'string\'\n
- tal:define=\'orig_string string:Unit;\n
- en_string python:here.Base_translateString(orig_string, lang="en");\n
- my_string python:here.Base_translateString(orig_string)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Item_20_Table_20_Title\'><span tal:replace=\'en_string\'/></text:p>\n
- <text:p text:style-name=\'Item_20_Table_20_Title\'\n
- tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/></text:p>\n
+ <text:p text:style-name=\'Item_20_Table_20_Title\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/></text:p>\n
</table:table-cell>\n
- <table:table-cell table:style-name=\'Tableau1.A2\' office:value-type=\'string\'\n
- tal:define=\'orig_string string:Delivery Date;\n
- en_string python:here.Base_translateString(orig_string, lang="en");\n
- my_string python:here.Base_translateString(orig_string)\'>\n
+ <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")\'>\n
<text:p text:style-name=\'Item_20_Table_20_Title\'><span tal:replace=\'en_string\'/></text:p>\n
<text:p text:style-name=\'Item_20_Table_20_Title\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/></text:p>\n
</table:table-cell>\n
+ <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")\'>\n
+ <text:p text:style-name=\'Item_20_Table_20_Title_20_Right\'><span tal:replace=\'en_string\'/></text:p>\n
+ <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>\n
+ </table:table-cell>\n
+ <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")\'>\n
+ <text:p text:style-name=\'Item_20_Table_20_Title_20_Right\'><span tal:replace=\'en_string\'/></text:p>\n
+ <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>\n
+ </table:table-cell>\n
</table:table-row>\n
</table:table-header-rows>\n
<table:table-row table:style-name=\'Tableau1.3\' tal:repeat=\'line_dict python:data_dict["line_list"]\'>\n
- <tal:block tal:define=\'style_name python:line_dict["style_name"];\n
- left_style_name python:line_dict["left_style_name"];\n
- right_style_name python:line_dict["right_style_name"]\'>\n
+ <div tal:omit-tag=\'\' tal:define=\'style_name python:line_dict["style_name"];\n
+ left_style_name python:line_dict["left_style_name"];\n
+ right_style_name python:line_dict["right_style_name"]\'>\n
<table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
- <text:p text:style-name=\'Table_20_Contents\'\n
- tal:content=\'python:line_dict["index"]\'\n
- tal:attributes=\'text:style-name left_style_name\'>1</text:p>\n
+ <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:line_dict["index"]\' tal:attributes=\'text:style-name left_style_name\'>1</text:p>\n
</table:table-cell>\n
<table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
<text:p text:style-name=\'Table_20_Contents\'\n
@@ -613,17 +574,136 @@ AAA=</string> </value>
tal:content=\'python:line_dict["stop_date"]\'\n
tal:attributes=\'text:style-name style_name\'>stop_date</text:p>\n
</table:table-cell>\n
- </tal:block>\n
+ <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'float\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'\n
+ tal:content=\'python:line_dict["base_price"]\'\n
+ tal:attributes=\'text:style-name right_style_name\'>base_price</text:p>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'float\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'\n
+ tal:content=\'python:line_dict["total_price"]\'\n
+ tal:attributes=\'text:style-name right_style_name\'>total_price</text:p>\n
+ </table:table-cell>\n
+ </div>\n
</table:table-row>\n
<table:table-row table:style-name=\'Tableau1.5\'>\n
<table:table-cell table:style-name=\'Tableau1.A5\'\n
table:number-columns-spanned=\'9\' office:value-type=\'string\'>\n
<table:table table:style-name=\'Tableau3\' table:name=\'Tableau3\'>\n
<table:table-column table:style-name=\'Tableau3.A\'/>\n
+ <table:table-column table:style-name=\'Tableau3.B\'/>\n
+ <table:table-column table:style-name=\'Tableau3.C\'/>\n
+ <table:table-column table:style-name=\'Tableau3.D\'/>\n
+ <table:table-column table:style-name=\'Tableau3.E\'/>\n
+ <table:table-row table:style-name=\'Tableau3.1\'>\n
+ <table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'/>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'/>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'/>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'/>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'/>\n
+ </table:table-cell>\n
+ </table:table-row>\n
+ <table:table-row table:style-name=\'Tableau3.2\'>\n
+ <table:table-cell table:style-name=\'Tableau3.A2\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'/>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau3.A2\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'/>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'/>\n
+ </table:table-cell>\n
+ <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")\'>\n
+ <text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
+ <text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau3.E2\' office:value-type=\'float\'>\n
+ <text:p text:style-name=\'Table_20_Contents_20_Right\' tal:content=\'python:data_dict["total_price_novat"]\'>800.000,00</text:p>\n
+ </table:table-cell>\n
+ </table:table-row>\n
+ <table:table-row table:style-name=\'Tableau3.3\'>\n
+ <table:table-cell table:style-name=\'Tableau3.A2\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'/>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau3.A2\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'/>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'/>\n
+ </table:table-cell>\n
+ <tal:block tal:define="global total_vat_list python: []">\n
+ <table:table-cell table:style-name=\'Tableau3.D3\'\n
+ office:value-type=\'string\'>\n
+ <tal:block tal:repeat="vat python: data_dict[\'vat_list\']">\n
+ <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")\'>\n
+ <text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
+ <text:p text:style-name=\'Table_20_Heading\'\n
+ tal:condition=\'python:my_string != en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
+ </tal:block>\n
+ </tal:block>\n
+ <text:p text:style-name=\'Table_20_Heading\'\n
+ 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>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau3.E3\'\n
+ office:value-type=\'float\'\n
+ tal:attributes="office:value python: sum(total_vat_list)">\n
+ <tal:block tal:repeat="vat python: data_dict[\'vat_list\']">\n
+ <text:p tal:define="vat_price python: vat.getPrice() * vat.getQuantity(); any python: total_vat_list.append(vat_price)"\n
+ text:style-name=\'Table_20_Contents_20_Right\'\n
+ tal:content="vat_price">2000</text:p>\n
+ </tal:block>\n
+ <text:p text:style-name=\'Table_20_Contents_20_Right\'\n
+ tal:content="python: sum(total_vat_list)">2000</text:p>\n
+ </table:table-cell>\n
+ </tal:block>\n
+ </table:table-row>\n
+ <table:table-row table:style-name=\'Tableau3.2\'>\n
+ <table:table-cell table:style-name=\'Tableau3.A2\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'/>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau3.A2\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'/>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'/>\n
+ </table:table-cell>\n
+ <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")\'>\n
+ <text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n
+ <text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau3.E3\' office:value-type=\'float\' tal:attributes="office:value python:data_dict[\'total_price_novat\'] + sum(total_vat_list)">\n
+ <text:p text:style-name=\'Table_20_Contents_20_Right\'\n
+ tal:content=\'python:data_dict["total_price_novat"] + sum(total_vat_list)\'>12345</text:p>\n
+ </table:table-cell>\n
+ </table:table-row>\n
+ <table:table-row table:style-name=\'Tableau3.1\'>\n
+ <table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'/>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'/>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'/>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'/>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'/>\n
+ </table:table-cell>\n
+ </table:table-row>\n
<table:table-row table:style-name=\'Tableau3.6\'>\n
- <table:table-cell table:style-name=\'Tableau3.A6\'\n
- office:value-type=\'string\'\n
- tal:define=\'orig_string string:Notes; en_string python:here.Base_translateString(orig_string, lang="en"); my_string python:here.Base_translateString(orig_string)\'>\n
+ <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")\'>\n
<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>\n
</table:table-cell>\n
<table:table-cell table:style-name=\'Tableau3.B6\' office:value-type=\'string\'>\n
@@ -640,11 +720,8 @@ AAA=</string> </value>
</table:table-cell>\n
</table:table-row>\n
<table:table-row table:style-name=\'Tableau3.7\'>\n
- <table:table-cell table:style-name=\'Tableau3.A7\'\n
- table:number-columns-spanned=\'5\'\n
- office:value-type=\'string\'>\n
- <text:p text:style-name=\'P3\'\n
- tal:content=\'python:data_dict["description"]\'>my_description</text:p>\n
+ <table:table-cell table:style-name=\'Tableau3.A7\' table:number-columns-spanned=\'5\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'P3\' tal:content=\'python:data_dict["description"]\'>my_description</text:p>\n
</table:table-cell>\n
<table:covered-table-cell/>\n
<table:covered-table-cell/>\n
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index d61d31715dc7e2f5c05934136b599cc817ce097a..ef491079a37cc374abca2e517e35441c362236d2 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-336
\ No newline at end of file
+337
\ No newline at end of file