[Erp5-report] r22728 - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins/erp5_tr...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Jul 29 17:59:01 CEST 2008
Author: jerome
Date: Tue Jul 29 17:59:00 2008
New Revision: 22728
URL: http://svn.erp5.org?rev=22728&view=rev
Log:
improve Packing List printout:
* show order reference and order date
* apply most fixes applied to Order printout
* don't show prices
Added:
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewODTPrintDialog/your_international_form.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewODTPrintDialog/your_target_language.xml
Modified:
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_getODTDataDict.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODT.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewODTPrintDialog.xml
erp5/trunk/bt5/erp5_trade/bt/revision
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_getODTDataDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_getODTDataDict.xml?rev=22728&r1=22727&r2=22728&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_getODTDataDict.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_getODTDataDict.xml Tue Jul 29 17:59:00 2008
@@ -89,7 +89,15 @@
sub_list.extend(getSubLineList(x))\n
return sub_list\n
\n
-return context.Delivery_getODTDataDict(getSourceReference, getSubLineList)\n
+data_dict = context.Delivery_getODTDataDict(getSourceReference, getSubLineList)\n
+order = context.getCausalityValue(portal_type=(\'Sale Order\', \'Purchase Order\'))\n
+if order is not None:\n
+ order_date = order.getStopDate()\n
+ if context.getPortalType().startswith(\'Sale\'):\n
+ order_date = order.getStartDate()\n
+ data_dict.update(order_reference=order.getReference(),\n
+ order_date=order_date)\n
+return data_dict\n
</string> </value>
</item>
<item>
@@ -142,6 +150,10 @@
<string>getSubLineList</string>
<string>_getattr_</string>
<string>context</string>
+ <string>data_dict</string>
+ <string>order</string>
+ <string>None</string>
+ <string>order_date</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODT.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODT.xml?rev=22728&r1=22727&r2=22728&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODT.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODT.xml Tue Jul 29 17:59:00 2008
@@ -64,7 +64,11 @@
<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/PackingList_getODTDataDict;\n
+ set_precision python: request.set(\'precision\', here.getQuantityPrecisionFromResource(here.getPriceCurrency()));\n
+ quantity_renderer nocall:here/OrderLine_viewFieldLibrary/my_quantity/render_pdf;\n
+ date_renderer nocall:here/OrderLine_viewFieldLibrary/my_start_date/render_pdf;\n
+ default_language python:test(request.get(\'international_form\'), \'en\', here.Localizer.get_selected_language())">\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
@@ -80,7 +84,7 @@
<style:table-properties fo:margin-left=\'0.021cm\' fo:margin-right=\'-0.014cm\' fo:break-before=\'page\' table:align=\'margins\' style:width=\'18.994cm\'/>\n
</style:style>\n
<style:style style:family=\'table-column\' style:name=\'Tableau1.A\'>\n
- <style:table-column-properties style:rel-column-width=\'2690*\' style:column-width=\'0.78cm\'/>\n
+ <style:table-column-properties style:rel-column-width=\'3690*\' style:column-width=\'1.58cm\'/>\n
</style:style>\n
<style:style style:family=\'table-column\' style:name=\'Tableau1.B\'>\n
<style:table-column-properties style:rel-column-width=\'7254*\' style:column-width=\'2.103cm\'/>\n
@@ -121,13 +125,13 @@
<style:table-column-properties style:rel-column-width=\'5326*\' style:column-width=\'1.542cm\'/>\n
</style:style>\n
<style:style style:family=\'table-column\' style:name=\'Tableau2.B\'>\n
- <style:table-column-properties style:rel-column-width=\'20270*\' style:column-width=\'5.868cm\'/>\n
+ <style:table-column-properties style:rel-column-width=\'18000*\' style:column-width=\'5.000cm\'/>\n
</style:style>\n
<style:style style:family=\'table-column\' style:name=\'Tableau2.C\'>\n
- <style:table-column-properties style:rel-column-width=\'4344*\' style:column-width=\'1.258cm\'/>\n
+ <style:table-column-properties style:rel-column-width=\'5326*\' style:column-width=\'1.542cm\'/>\n
</style:style>\n
<style:style style:family=\'table-column\' style:name=\'Tableau2.D\'>\n
- <style:table-column-properties style:rel-column-width=\'20214*\' style:column-width=\'5.853cm\'/>\n
+ <style:table-column-properties style:rel-column-width=\'18000*\' style:column-width=\'5.000cm\'/>\n
</style:style>\n
<style:style style:family=\'table-column\' style:name=\'Tableau2.E\'>\n
<style:table-column-properties style:rel-column-width=\'15381*\' style:column-width=\'4.454cm\'/>\n
@@ -247,7 +251,7 @@
<style:paragraph-properties fo:text-align=\'start\' style:justify-single-word=\'false\'/>\n
</style:style>\n
<style:style style:parent-style-name=\'Table_20_Contents\' style:family=\'paragraph\' style:name=\'P3\'>\n
- <style:paragraph-properties fo:text-align=\'justify\' style:justify-single-word=\'false\'/>\n
+ <style:paragraph-properties fo:text-align=\'left\' style:justify-single-word=\'false\'/>\n
</style:style>\n
<style:style style:parent-style-name=\'Text_20_body\' style:family=\'paragraph\' style:name=\'P4\'>\n
<style:text-properties style:font-size-complex=\'6pt\' style:font-size-asian=\'6pt\' style:font-weight-complex=\'normal\' style:font-weight-asian=\'normal\' fo:font-size=\'6pt\' fo:font-weight=\'normal\'/>\n
@@ -279,9 +283,6 @@
<table:table-column table:style-name=\'Tableau1.D\'/>\n
<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
@@ -297,46 +298,52 @@
<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
+ orig_message python:here.Base_translateString(orig_string, lang=default_language);\n
+ translated_message python:here.Base_translateString(orig_string);">\n
<text:p text:style-name=\'Table_20_Heading\'>\n
- <tal:block tal:replace=\'en_string\'/>:</text:p>\n
+ <tal:block tal:replace=\'orig_message\'/>:</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:condition=\'python:translated_message != orig_message\'><span tal:replace=\'translated_message\'/>:</text:p>\n
</tal:block>\n
</table:table-cell>\n
<table:table-cell table:style-name=\'Tableau2.A1\'\n
office:value-type=\'string\'>\n
- <text:p text:style-name=\'Table_20_Contents\'\n
+ <text:p text:style-name=\'Big_20_Table_20_Content_20_Left\'\n
tal:content=\'python:data_dict["source_section_title"]\'>source_section</text:p>\n
- <text:p text:style-name=\'Table_20_Contents\'\n
+ <text:p text:style-name=\'Table_20_Contents_20_Left\'\n
tal:content=\'python:data_dict["source_section_address"]\'>address</text:p>\n
- <text:p text:style-name=\'Table_20_Contents\'\n
+ <text:p text:style-name=\'Table_20_Contents_20_Left\'\n
tal:content=\'python:data_dict["source_section_telfax"]\'>tel, fax</text:p>\n
- <text:p text:style-name=\'Table_20_Contents\'\n
+ <text:p text:style-name=\'Table_20_Contents_20_Left\'\n
tal:content=\'python:data_dict["source_section_email"]\'>email</text:p>\n
+ <text:p text:style-name=\'Table_20_Contents_20_Left\'\n
+ tal:condition=\'data_dict/source_section_vatid\'\n
+ tal:content=\'python:data_dict["source_section_vatid"]\'>vat ID</text:p>\n
</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: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
+ tal:define=\'orig_string string:Client; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")\'>\n
+ <text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'orig_message\'/>:</text:p>\n
+ <text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:translated_message != orig_message\'><span tal:replace=\'translated_message\'/>:</text:p>\n
</table:table-cell>\n
<table:table-cell table:style-name=\'Tableau2.A1\' office:value-type=\'string\'>\n
- <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:data_dict["destination_title"]\'>destination</text:p>\n
- <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:data_dict["destination_address"]\'>address</text:p>\n
- <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:data_dict["destination_telfax"]\'>tel, fax</text:p>\n
- <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:data_dict["destination_email"]\'>email</text:p>\n
+ <text:p text:style-name=\'Big_20_Table_20_Content_20_Left\' tal:content=\'python:data_dict["destination_section_title"]\'>destination</text:p>\n
+ <text:p text:style-name=\'Table_20_Contents_20_Left\' tal:content=\'python:data_dict["destination_section_address"]\'>address</text:p>\n
+ <text:p text:style-name=\'Table_20_Contents_20_Left\' tal:content=\'python:data_dict["destination_section_telfax"]\'>tel, fax</text:p>\n
+ <text:p text:style-name=\'Table_20_Contents_20_Left\' tal:content=\'python:data_dict["destination_section_email"]\'>email</text:p>\n
+ <text:p text:style-name=\'Table_20_Contents_20_Left\' tal:content=\'python:data_dict["destination_section_vatid"]\'\n
+ tal:condition="data_dict/destination_section_vatid">vat ID</text:p>\n
</table:table-cell>\n
<table:table-cell>\n
<table:table table:is-sub-table=\'true\'>\n
<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: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 table:style-name=\'Tableau2.A1\' office:value-type=\'string\' tal:define=\'orig_string string:Reference; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")\'>\n
+ <text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'orig_message\'/>:</text:p>\n
+ <text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:translated_message != orig_message\'><span tal:replace=\'translated_message\'/>:</text:p>\n
</table:table-cell>\n
<table:table-cell table:style-name=\'Tableau2.E1.2.1\' office:value-type=\'string\'>\n
<text:p text:style-name=\'Big_20_Table_20_Content\' tal:content=\'python:data_dict["reference"]\'>reference</text:p>\n
@@ -345,13 +352,22 @@
<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: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
+ tal:define=\'orig_string string:Document Date; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")\'>\n
+ <text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'orig_message\'/>:</text:p>\n
+ <text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:translated_message != orig_message\'><span tal:replace=\'translated_message\'/>:</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\'\n
tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'start_date\'] or data_dict[\'stop_date\']">start_date</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:Order Reference; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")\'>\n
+ <text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'orig_message\'/>:</text:p>\n
+ <text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:translated_message != orig_message\'><span tal:replace=\'translated_message\'/>:</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=\'data_dict/order_reference | nothing\'>order reference</text:p>\n
</table:table-cell>\n
</table:table-row>\n
</table:table>\n
@@ -359,49 +375,59 @@
</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: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 table:style-name=\'Tableau2.E1.1.2\' office:value-type=\'string\' tal:define=\'orig_string string:Ship From; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")\'>\n
+ <text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'orig_message\'/>:</text:p>\n
+ <text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:translated_message != orig_message\'><span tal:replace=\'translated_message\'/>:</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["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
+ <text:p text:style-name=\'Big_20_Table_20_Content_20_Left\' tal:content=\'python:data_dict["source_title"]\'>name</text:p>\n
+ <text:p text:style-name=\'Table_20_Contents_20_Left\' tal:content=\'python:data_dict["source_address"]\'>address</text:p>\n
+ <text:p text:style-name=\'Table_20_Contents_20_Left\' tal:content=\'python:data_dict["source_telfax"]\'>tel, fax</text:p>\n
+ <text:p text:style-name=\'Table_20_Contents_20_Left\'\n
+ tal:condition="data_dict/source_vatid"\n
+ tal:content=\'python:data_dict["source_vatid"]\'>vat id</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: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 table:style-name=\'Tableau2.E1.1.2\' office:value-type=\'string\' tal:define=\'orig_string string:Ship To; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")\'>\n
+ <text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'orig_message\'/>:</text:p>\n
+ <text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:translated_message != orig_message\'><span tal:replace=\'translated_message\'/>:</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
- <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:data_dict["destination_decision_telfax"]\'>tel, fax</text:p>\n
- <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:data_dict["destination_decision_email"]\'>email</text:p>\n
+ <text:p text:style-name=\'Big_20_Table_20_Content_20_Left\' tal:content=\'python:data_dict["destination_title"]\'>name</text:p>\n
+ <text:p text:style-name=\'Table_20_Contents_20_Left\' tal:content=\'python:data_dict["destination_address"]\'>address</text:p>\n
+ <text:p text:style-name=\'Table_20_Contents_20_Left\' tal:content=\'python:data_dict["destination_telfax"]\'>tel, fax</text:p>\n
+ <text:p text:style-name=\'Table_20_Contents_20_Left\'\n
+ tal:condition="data_dict/destination_vatid"\n
+ tal:content=\'python:data_dict["destination_vatid"]\'>vat id</text:p>\n
</table:table-cell>\n
<table:table-cell>\n
<table:table table:is-sub-table=\'true\'>\n
<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:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8");\n
- 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 table:style-name=\'Tableau2.E1.1.2\' office:value-type=\'string\' tal:define=\'orig_string string:Order Date; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")\'>\n
+ <text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'orig_message\'/>:</text:p>\n
+ <text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:translated_message != orig_message\'><span tal:replace=\'translated_message\'/>:</text:p>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau2.E1.2.2\' office:value-type=\'string\'>\n
+ <text:p tal:condition=\'data_dict/order_date | nothing\' \n
+ text:style-name=\'Table_20_Contents\'\n
+ tal:content=\'python: date_renderer(data_dict["order_date"])\'>order date</text:p>\n
+ <text:p tal:condition="not:data_dict/order_date | nothing" text:style-name=\'Table_20_Contents\'/>\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:Delivery Mode; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")\'>\n
+ <text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'orig_message\'/>:</text:p>\n
+ <text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:translated_message != orig_message\'><span tal:replace=\'translated_message\'/>:</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["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\'\n
- office:value-type=\'string\'\n
- tal:define=\'orig_string string:Incoterm;\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
- <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 table:style-name=\'Tableau2.E1.1.2\' office:value-type=\'string\' tal:define=\'orig_string string:Incoterm; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")\'>\n
+ <text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'orig_message\'/>:</text:p>\n
+ <text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:translated_message != orig_message\'><span tal:replace=\'translated_message\'/>:</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
@@ -423,58 +449,34 @@
<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:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8");\n
- 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\'\n
- office:value-type=\'string\'\n
- tal:define=\'orig_string string:Your Item no.;\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
- <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\'\n
- office:value-type=\'string\'\n
- tal:define=\'orig_string string:Our Item no.;\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
- <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: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: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: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: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 table:style-name=\'Tableau1.A2\' office:value-type=\'string\' tal:define=\'orig_string string:Line; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")\'>\n
+ <text:p text:style-name=\'Item_20_Table_20_Title_20_Left\'><span tal:replace=\'orig_message\'/></text:p>\n
+ <text:p text:style-name=\'Item_20_Table_20_Title_20_Left\' tal:condition=\'python:translated_message != orig_message\'><span tal:replace=\'translated_message\'/></text:p>\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.; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")\'>\n
+ <text:p text:style-name=\'Item_20_Table_20_Title_20_Left\'><span tal:replace=\'orig_message\'/></text:p>\n
+ <text:p text:style-name=\'Item_20_Table_20_Title_20_Left\' tal:condition=\'python:translated_message != orig_message\'><span tal:replace=\'translated_message\'/></text:p>\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.; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")\'>\n
+ <text:p text:style-name=\'Item_20_Table_20_Title_20_Left\'><span tal:replace=\'orig_message\'/></text:p>\n
+ <text:p text:style-name=\'Item_20_Table_20_Title_20_Left\' tal:condition=\'python:translated_message != orig_message\'><span tal:replace=\'translated_message\'/></text:p>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau1.A2\' office:value-type=\'string\' tal:define=\'orig_string string:Description; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")\'>\n
+ <text:p text:style-name=\'Item_20_Table_20_Title_20_Left\'><span tal:replace=\'orig_message\'/></text:p>\n
+ <text:p text:style-name=\'Item_20_Table_20_Title_20_Left\' tal:condition=\'python:translated_message != orig_message\'><span tal:replace=\'translated_message\'/></text:p>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau1.A2\' office:value-type=\'string\' tal:define=\'orig_string string:Quantity; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")\'>\n
+ <text:p text:style-name=\'Item_20_Table_20_Title_20_Left\'><span tal:replace=\'orig_message\'/></text:p>\n
+ <text:p text:style-name=\'Item_20_Table_20_Title_20_Left\' tal:condition=\'python:translated_message != orig_message\'><span tal:replace=\'translated_message\'/></text:p>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau1.A2\' office:value-type=\'string\' tal:define=\'orig_string string:Unit; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")\'>\n
+ <text:p text:style-name=\'Item_20_Table_20_Title_20_Left\'><span tal:replace=\'orig_message\'/></text:p>\n
+ <text:p text:style-name=\'Item_20_Table_20_Title_20_Left\' tal:condition=\'python:translated_message != orig_message\'><span tal:replace=\'translated_message\'/></text:p>\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
+ <tal:block 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
@@ -491,36 +493,28 @@
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\' tal:attributes="text:style-name left_style_name"><tal:block tal:repeat="line line_dict/description"><tal:block\n
+ tal:replace="line"/><text:line-break tal:condition="not:repeat/line/end"/></tal:block></text:p>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau1.A3\'\n
+ office:value-type=\'float\'\n
+ tal:condition="python: line_dict[\'total_quantity\'] != \'\'"\n
+ tal:attributes=\'office:value line_dict/total_quantity\'> \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:content="python: quantity_renderer(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\'\n
+ office:value-type=\'string\'\n
+ tal:condition="python: line_dict[\'total_quantity\'] == \'\'"> \n
+ <text:p text:style-name=\'Table_20_Contents\'/>\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
+ </tal:block>\n
</table:table-row>\n
<table:table-row table:style-name=\'Tableau1.5\'>\n
<table:table-cell table:style-name=\'Tableau1.A5\'\n
@@ -558,13 +552,6 @@
<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
@@ -576,31 +563,6 @@
<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
@@ -612,14 +574,6 @@
<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
@@ -639,8 +593,8 @@
</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: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 table:style-name=\'Tableau3.A6\' office:value-type=\'string\' tal:define=\'orig_string string:Notes; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")\'>\n
+ <text:p text:style-name=\'P2\'><span tal:replace=\'orig_message\'/><span tal:omit-tag=\'\' tal:condition=\'python:translated_message != orig_message\'> / <span tal:replace=\'translated_message\'/></span>:</text:p>\n
</table:table-cell>\n
<table:table-cell table:style-name=\'Tableau3.B6\' office:value-type=\'string\'>\n
<text:p text:style-name=\'Table_20_Contents\'/>\n
@@ -657,7 +611,9 @@
</table:table-row>\n
<table:table-row table:style-name=\'Tableau3.7\'>\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
+ <text:p text:style-name=\'P3\'><tal:block tal:repeat="line data_dict/description"><tal:block\n
+ tal:replace="line"/><text:line-break tal:condition="not:repeat/line/end"/></tal:block>\n
+ </text:p>\n
</table:table-cell>\n
<table:covered-table-cell/>\n
<table:covered-table-cell/>\n
@@ -680,7 +636,8 @@
<text:p text:style-name=\'P4\'/>\n
</office:text>\n
</office:body>\n
-</office:document-content>
+</office:document-content>\n
+
]]></string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml?rev=22728&r1=22727&r2=22728&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml Tue Jul 29 17:59:00 2008
@@ -191,6 +191,9 @@
<style:style style:name="Big_20_Table_20_Content" style:display-name="Big Table Content" style:family="paragraph" style:parent-style-name="Table_20_Contents">\n
<style:text-properties fo:font-size="8pt" fo:font-weight="bold"/>\n
</style:style>\n
+ <style:style style:name="Big_20_Table_20_Content_20_Left" style:display-name="Big Table Content Left" style:family="paragraph" style:parent-style-name="Big_20_Table_20_Content">\n
+ <style:paragraph-properties fo:margin-left="0.049cm" fo:margin-right="0cm" fo:text-align="start" style:justify-single-word="false" fo:text-indent="0cm" style:auto-text-indent="false"/>\n
+ </style:style>\n
<style:style style:name="Item_20_Table_20_Title" style:display-name="Item Table Title" style:family="paragraph" style:parent-style-name="Table_20_Heading" style:class="extra">\n
<style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>\n
<style:text-properties fo:font-size="7pt" style:font-weight-asian="normal" style:font-weight-complex="normal"/>\n
@@ -272,6 +275,9 @@
</style:style>\n
<style:style style:name="Tableau4.A1" style:family="table-cell">\n
<style:table-cell-properties fo:padding="0.097cm" fo:border="none"/>\n
+ </style:style>\n
+ <style:style style:name="Tableau4.A2" style:family="table-cell">\n
+ <style:table-cell-properties fo:padding="0.097cm" fo:border="none" style:vertical-align="middle"/>\n
</style:style>\n
<style:style style:name="P1" style:family="paragraph" style:parent-style-name="Table_20_Contents">\n
<style:text-properties style:font-name-asian="DejaVu Sans1" style:font-size-asian="14pt" style:font-name-complex="DejaVu Sans1" style:font-size-complex="14pt"/>\n
@@ -304,18 +310,19 @@
</office:automatic-styles>\n
<office:master-styles>\n
<style:master-page style:name="Standard" style:page-layout-name="pm1">\n
- <style:header tal:define="orig_title string:Packing List;\n
- en_title python: unicode(here.Base_translateString(orig_title, lang=\'en\'), \'utf-8\');\n
+ <style:header tal:define="default_language python:test(request.get(\'international_form\'), \'en\', here.Localizer.get_selected_language());\n
+ orig_title string:Packing List;\n
+ en_title python: unicode(here.Base_translateString(orig_title, lang=default_language), \'utf-8\');\n
my_title python: unicode(here.Base_translateString(orig_title), \'utf-8\');\n
orig_page string:Page;\n
- en_page python: unicode(here.Base_translateString(orig_page, lang=\'en\'), \'utf-8\');\n
+ en_page python: unicode(here.Base_translateString(orig_page, lang=default_language), \'utf-8\');\n
my_page python: unicode(here.Base_translateString(orig_page), \'utf-8\');\n
orig_of string:of;\n
- en_of python: unicode(here.Base_translateString(orig_of, lang=\'en\'), \'utf-8\');\n
+ en_of python: unicode(here.Base_translateString(orig_of, lang=default_language), \'utf-8\');\n
my_of python: unicode(here.Base_translateString(orig_of), \'utf-8\');\n
- image_path python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_path\'] or data_dict[\'source_section_image_path\'];\n
- image_width python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_width\'] or data_dict[\'source_section_image_width\'];\n
- image_height python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_height\'] or data_dict[\'source_section_image_height\']">\n
+ image_path python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_path\'] or data_dict[\'source_decision_image_path\'];\n
+ image_width python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_width\'] or data_dict[\'source_decision_image_width\'];\n
+ image_height python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_height\'] or data_dict[\'source_decision_image_height\']">\n
<table:table table:name="Tableau4" table:style-name="Tableau4">\n
<table:table-column table:style-name="Tableau4.A"/>\n
<table:table-column table:style-name="Tableau4.B"/>\n
@@ -334,46 +341,35 @@
height image_height"/>\n
</text:p>\n
</table:table-cell>\n
- <table:table-cell table:style-name="Tableau4.A1" office:value-type="string">\n
+ <table:table-cell table:style-name="Tableau4.A2" office:value-type="string">\n
+ <text:p text:style-name="Big_20_Table_20_Content_20_Left"\n
+ tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_administration_title\'] or data_dict[\'source_administration_title\']">\n
+ </text:p>\n
<text:p text:style-name="Header"\n
- tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_title\'] or data_dict[\'source_section_title\']">\n
+ tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_administration_address\'] or data_dict[\'source_administration_address\']">\n
</text:p>\n
<text:p text:style-name="Header"\n
- tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_address\'] or data_dict[\'source_section_address\']">\n
+ tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_administration_telfax\'] or data_dict[\'source_administration_telfax\']">\n
</text:p>\n
<text:p text:style-name="Header"\n
- tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_telfax\'] or data_dict[\'source_section_telfax\']">\n
+ tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_administration_email\'] or data_dict[\'source_administration_email\']">\n
</text:p>\n
<text:p text:style-name="Header"\n
- tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_email\'] or data_dict[\'source_section_email\']">\n
- </text:p>\n
- <text:p text:style-name="Header"\n
- tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_vatid\'] or data_dict[\'source_section_vatid\']">\n
- </text:p>\n
- </table:table-cell>\n
- <table:table-cell table:style-name="Tableau4.A1" office:value-type="string">\n
- <text:p text:style-name="P1"/>\n
- </table:table-cell>\n
- </table:table-row>\n
- <table:table-row>\n
- <table:table-cell table:style-name="Tableau4.A1" office:value-type="string">\n
- <text:p text:style-name="P1"/>\n
- </table:table-cell>\n
- <table:table-cell table:style-name="Tableau4.A1" office:value-type="string">\n
- <text:p text:style-name="P1"/>\n
+ tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_administration_vatid\'] or data_dict[\'source_administration_vatid\']">\n
+ </text:p>\n
</table:table-cell>\n
<table:table-cell table:style-name="Tableau4.A1" office:value-type="string">\n
<text:p text:style-name="Header_20_Title"\n
tal:content="en_title">\n
</text:p>\n
<text:p text:style-name="Header_20_right"\n
- tal:content="my_title">\n
+ tal:content="my_title" tal:condition="python: my_title != en_title">\n
</text:p>\n
<text:p text:style-name="Header_20_right">\n
- <text:p tal:replace="my_page"/>\n
+ <text:p tal:replace="my_page"/>\n
<text:page-number text:select-page="current">1</text:page-number>\n
- <text:p tal:replace="my_of"/><text:page-count>1</text:page-count>\n
- </text:p>\n
+ <text:p tal:replace="my_of"/>\n
+ <text:page-count>1</text:page-count></text:p>\n
</table:table-cell>\n
</table:table-row>\n
</table:table>\n
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewODTPrintDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewODTPrintDialog.xml?rev=22728&r1=22727&r2=22728&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewODTPrintDialog.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewODTPrintDialog.xml Tue Jul 29 17:59:00 2008
@@ -88,6 +88,7 @@
<value>
<list>
<string>your_target_language</string>
+ <string>your_international_form</string>
</list>
</value>
</item>
Added: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewODTPrintDialog/your_international_form.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewODTPrintDialog/your_international_form.xml?rev=22728&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewODTPrintDialog/your_international_form.xml (added)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewODTPrintDialog/your_international_form.xml Tue Jul 29 17:59:00 2008
@@ -1,0 +1,171 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>your_international_form</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string>Include english and translated version of all terms.</string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>International Form</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewODTPrintDialog/your_target_language.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewODTPrintDialog/your_target_language.xml?rev=22728&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewODTPrintDialog/your_target_language.xml (added)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewODTPrintDialog/your_target_language.xml Tue Jul 29 17:59:00 2008
@@ -1,0 +1,93 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>your_target_language</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>your_target_language</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewDialogFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=22728&r1=22727&r2=22728&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision Tue Jul 29 17:59:00 2008
@@ -1,1 +1,1 @@
-447
+449
More information about the Erp5-report
mailing list