From 07fc2a67f8b4cca6ab2cd81be0344221fe7d85f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Mon, 4 Aug 2008 16:11:48 +0000
Subject: [PATCH] Adapt ProductionOrder_viewAsODT and
ProductionPackingList_viewAsODT for new Delivery_getODTDataDict API
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22871 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5_mrp/ProductionOrder_viewAsODT.xml | 11 ++++++-----
.../erp5_mrp/ProductionPackingList_viewAsODT.xml | 9 +++++----
bt5/erp5_mrp/bt/revision | 2 +-
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_viewAsODT.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_viewAsODT.xml
index c5fcccdf60..b6226c4252 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_viewAsODT.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_viewAsODT.xml
@@ -503,9 +503,8 @@ AAA=</string> </value>
tal:attributes=\'text:style-name style_name\'>transformation</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
+ <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
@@ -674,9 +673,11 @@ AAA=</string> </value>
<text:p text:style-name=\'Table_20_Contents\'/>\n
</table:table-cell>\n
</table:table-row>\n
- <table:table-row table:style-name=\'Tableau3.7\'>\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
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionPackingList_viewAsODT.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionPackingList_viewAsODT.xml
index 7a9f301d2a..cfc4738f87 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionPackingList_viewAsODT.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionPackingList_viewAsODT.xml
@@ -491,9 +491,8 @@ AAA=</string> </value>
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
+ <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\' office:value-type=\'float\'>\n
<text:p text:style-name=\'Table_20_Contents\'\n
@@ -657,7 +656,9 @@ AAA=</string> </value>
</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
diff --git a/bt5/erp5_mrp/bt/revision b/bt5/erp5_mrp/bt/revision
index 5f5d9b11ac..1c34b96390 100644
--- a/bt5/erp5_mrp/bt/revision
+++ b/bt5/erp5_mrp/bt/revision
@@ -1 +1 @@
-375
\ No newline at end of file
+377
\ No newline at end of file
--
2.30.9