[Erp5-report] r22805 - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins/erp5_tr...

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Aug  1 10:58:07 2008
New Revision: 22805

URL: http://svn.erp5.org?rev=22805&view=rev
Log:
for sale, get logo on source_decision or source_section

Modified:
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml
    erp5/trunk/bt5/erp5_trade/bt/revision

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml?rev=22805&r1=22804&r2=22805&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml Fri Aug  1 10:58:07 2008
@@ -326,9 +326,9 @@
                     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

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=22805&r1=22804&r2=22805&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 Fri Aug  1 10:58:07 2008
@@ -326,9 +326,9 @@
                     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

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=22805&r1=22804&r2=22805&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision Fri Aug  1 10:58:07 2008
@@ -1,1 +1,1 @@
-461
+462