diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportMacro.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportMacro.xml index 91caea7c7a144c278f3612558d7c3d4760a95ee5..68a717b7b114df51cbd8cd1450f6abfe5c5f47e0 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportMacro.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportMacro.xml @@ -101,8 +101,10 @@ <text:span text:style-name=\'T1\' i18n:translate="Resources" i18n:domain="erp5_ui">Resources</text:span>: <tal:block tal:replace="python:\', \'.join(line_item.getSourceTradeTitleList([]))">JP Smets, B. Faye</tal:block></text:p>\n <text:p text:style-name=\'Project_20_Box\' tal:condition="line_item/getOutcomeDescription">\n <text:span text:style-name=\'T1\' i18n:translate="Result" i18n:domain="erp5_ui">Result</text:span>: <tal:block tal:replace="line_item/getOutcomeDescription">description of result</tal:block>\n - </text:p>\n - <text:p text:style-name=\'Text_20_body\' tal:content="line_item/getDescription">Description of project line.</text:p>\n + </text:p>\n + <tal:block tal:define="description line_item/getDescription">\n + <text:p text:style-name=\'Text_20_body\'><tal:block tal:repeat="partial_description python: description.split(\'\\n\')"><tal:block tal:content="partial_description"/><tal:block tal:condition="python: not(repeat[\'partial_description\'].end)"><text:line-break/></tal:block></tal:block></text:p>\n + </tal:block>\n <tal:block tal:define="global current_line python:line_item"/>\n <tal:block metal:use-macro="here/SaleOrder_viewDetailedReportMacro/macros/line"/>\n </tal:block>\n @@ -129,7 +131,7 @@ </tal:block>\n <text:span text:style-name=\'T1\' i18n:translate="End" i18n:domain="erp5_ui">End</text:span>: <tal:block tal:replace="line_item/getStopDate">2006-01-01</tal:block>\n </text:p>\n - <text:p text:style-name=\'Text_20_body\' tal:content="line_item/getDescription">Description of project line.</text:p>\n + <text:p text:style-name=\'Text_20_body\'><tal:block tal:repeat="partial_description python: description.split(\'\\n\')"><tal:block tal:content="partial_description"/><tal:block tal:condition="python: not(repeat[\'partial_description\'].end)"><text:line-break/></tal:block></tal:block></text:p>\n <tal:block tal:define="global depth python:depth - 1"/>\n </tal:block>\n \n @@ -138,8 +140,7 @@ </tal:block>\n </office:text>\n </office:body>\n -</office:document-content>\n - +</office:document-content> ]]></unicode> </value> </item> diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision index d2014d1325a1a06af2e4fc4ef62f8224143b5657..26102a7bd5731a4d0595ea8e7f00a30edb9b1743 100644 --- a/bt5/erp5_project/bt/revision +++ b/bt5/erp5_project/bt/revision @@ -1 +1 @@ -817 \ No newline at end of file +818 \ No newline at end of file