From 36162477a436d12c1fed81787cec6d1410877114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com>
Date: Tue, 12 Aug 2014 15:55:33 +0200
Subject: [PATCH] customize title of printout & use getMovementList to retrieve
line as it is customizable
---
.../portal_skins/erp5_base/Delivery_getODTDataDict.xml | 3 +++
bt5/erp5_base/bt/revision | 2 +-
.../portal_skins/erp5_trade/Order_viewAsODTStyles.xml | 7 +++----
bt5/erp5_trade/bt/revision | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml
index 3069c03395..4c15f65da3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml
@@ -338,7 +338,10 @@ destination_decision = context.getDestinationDecisionValue()\n
if destination_decision is None:\n
destination_decision = EmptyOrganisation()\n
\n
+report_title = context.getSimulationState() == "draft" and "Draft Order" or "Order"\n
+\n
data_dict = {\n
+ \'report_title\' : report_title,\n
\'source_section_title\': source_section.getProperty(\'corporate_name\') or\\\n
source_section.getTitle(),\n
\'source_section_image_path\': source_section.getDefaultImagePath() or \'\',\n
diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision
index 1286216edf..c0bb52cb63 100644
--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
@@ -1 +1 @@
-1067
\ No newline at end of file
+1068
\ No newline at end of file
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml
index 9c8e61f98d..bb30adbe7b 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml
@@ -302,7 +302,7 @@ AAA=</string> </value>
<office:master-styles>\n
<style:master-page style:name="Standard" style:page-layout-name="pm1">\n
<style:header tal:define="default_language python:test(request.get(\'international_form\'), \'en\', here.Localizer.get_selected_language());\n
- orig_title python: test(context.getSimulationState() == \'offered\', \'Offer\', \'Order\');\n
+ orig_title python: data_dict[\'report_title\'];\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
@@ -371,8 +371,7 @@ AAA=</string> </value>
</style:master-page>\n
<style:master-page style:name="Endnote" style:page-layout-name="pm2"/>\n
</office:master-styles>\n
-</office:document-styles>\n
-
+</office:document-styles>
]]></unicode> </value>
</item>
@@ -402,7 +401,7 @@ AAA=</string> </value>
</item>
<item>
<key> <string>title</string> </key>
- <value> <string></string> </value>
+ <value> <unicode></unicode> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index 2a9ab72883..03eda3b249 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-1181
\ No newline at end of file
+1182
\ No newline at end of file
--
2.30.9