From 8aaeb596b92c0103db035b5c8fd1b1c8417ef515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Fri, 1 Aug 2008 08:58:07 +0000
Subject: [PATCH] for sale, get logo on source_decision or source_section
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22805 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../portal_skins/erp5_trade/Order_viewAsODTStyles.xml | 6 +++---
.../portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml | 6 +++---
bt5/erp5_trade/bt/revision | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
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 5cea6f83f0..0067f2fd06 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
@@ -326,9 +326,9 @@ AAA=</string> </value>
orig_of string:of;\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_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
+ image_path python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_path\'] or (data_dict[\'source_decision_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_decision_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_decision_image_height\'] or data_dict[\'source_section_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
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml
index 2eda552413..c16e564f4f 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml
@@ -326,9 +326,9 @@ AAA=</string> </value>
orig_of string:of;\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_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
+ image_path python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_path\'] or (data_dict[\'source_decision_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_decision_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_decision_image_height\'] or data_dict[\'source_section_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
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index 4754f24761..a8114de9cf 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-461
\ No newline at end of file
+462
\ No newline at end of file
--
2.30.9