[Erp5-report] r20733 - in /erp5/trunk/bt5/erp5_invoicing: SkinTemplateItem/portal_skins/erp...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Apr 21 18:46:36 CEST 2008
Author: nicolas
Date: Mon Apr 21 18:46:35 2008
New Revision: 20733
URL: http://svn.erp5.org?rev=20733&view=rev
Log:
convert all Translation in unicode
Modified:
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewAsODT.xml
erp5/trunk/bt5/erp5_invoicing/bt/revision
Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewAsODT.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewAsODT.xml?rev=20733&r1=20732&r2=20733&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewAsODT.xml (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewAsODT.xml Mon Apr 21 18:46:35 2008
@@ -64,7 +64,7 @@
<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/Invoice_getODTDataDict\'>\n
+ tal:define=\'data_dict here/Invoice_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
@@ -299,75 +299,75 @@
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
+ en_string python: unicode(here.Base_translateString(orig_string, lang=\'en\'), \'utf-8\');\n
+ my_string python: unicode(here.Base_translateString(orig_string), \'utf-8\');\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
orig_title string:Invoice;\n
- en_title python:here.Base_translateString(orig_title, lang=\'en\');\n
- my_title python:here.Base_translateString(orig_title);\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;\n
- en_page python:here.Base_translateString(orig_page, lang=\'en\');\n
- my_page python:here.Base_translateString(orig_page);\n
+ 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: en_title != my_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: en_title != my_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
@@ -386,7 +386,7 @@
</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
@@ -401,7 +401,7 @@
<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
@@ -412,7 +412,7 @@
<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
@@ -422,7 +422,7 @@
</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
@@ -435,7 +435,7 @@
</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
@@ -444,7 +444,7 @@
<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
@@ -458,7 +458,7 @@
<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
@@ -467,7 +467,7 @@
</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
@@ -476,7 +476,7 @@
</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
@@ -500,91 +500,91 @@
<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
@@ -623,7 +623,7 @@
<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
@@ -662,8 +662,8 @@
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
@@ -677,7 +677,7 @@
<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
@@ -704,7 +704,7 @@
</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
@@ -766,6 +766,10 @@
<value> <string>Invoice_getODTStyleSheet</string> </value>
</item>
<item>
+ <key> <string>ooo_xml_file_id</string> </key>
+ <value> <string>content.xml</string> </value>
+ </item>
+ <item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/revision?rev=20733&r1=20732&r2=20733&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision Mon Apr 21 18:46:35 2008
@@ -1,1 +1,1 @@
-77
+78
More information about the Erp5-report
mailing list