[Erp5-report] r22802 - in /erp5/trunk/bt5/erp5_base: SkinTemplateItem/portal_skins/erp5_bas...

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Aug  1 10:49:51 2008
New Revision: 22802

URL: http://svn.erp5.org?rev=22802&view=rev
Log:
if the source decision is a person, use the source section's default image as
logo

Modified:
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml
    erp5/trunk/bt5/erp5_base/bt/revision

Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml?rev=22802&r1=22801&r2=22802&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml Fri Aug  1 10:49:51 2008
@@ -278,15 +278,15 @@
       context.getSourceValue().getProperty(\'vat_code\', \'\') or \'\'),\n
 \n
   \'source_decision_title\': context.getSourceDecisionTitle() or \'\',\n
-  \'source_decision_image_path\': context.getSourceDecisionValue() is not None\\\n
-          and context.getSourceDecisionValue().getDefaultImagePath() or \'\',\n
-  \'source_decision_image_width\': context.getSourceDecisionValue() is not None\\\n
-          and context.getSourceDecisionValue().getDefaultImageWidth() is not None\\\n
-          and context.getSourceDecisionValue().getDefaultImageWidth() \\\n
+  \'source_decision_image_path\': context.getSourceDecisionValue(portal_type=\'Organisation\') is not None\\\n
+          and context.getSourceDecisionValue(portal_type=\'Organisation\').getDefaultImagePath() or \'\',\n
+  \'source_decision_image_width\': context.getSourceDecisionValue(portal_type=\'Organisation\') is not None\\\n
+          and context.getSourceDecisionValue(portal_type=\'Organisation\').getDefaultImageWidth() is not None\\\n
+          and context.getSourceDecisionValue(portal_type=\'Organisation\').getDefaultImageWidth() \\\n
               * inch_cm_ratio or \'\',\n
-  \'source_decision_image_height\': context.getSourceDecisionValue() is not None\\\n
-          and context.getSourceDecisionValue().getDefaultImageHeight() is not None\\\n
-          and context.getSourceDecisionValue().getDefaultImageHeight() \\\n
+  \'source_decision_image_height\': context.getSourceDecisionValue(portal_type=\'Organisation\') is not None\\\n
+          and context.getSourceDecisionValue(portal_type=\'Organisation\').getDefaultImageHeight() is not None\\\n
+          and context.getSourceDecisionValue(portal_type=\'Organisation\').getDefaultImageHeight() \\\n
               * inch_cm_ratio or \'\',\n
   \'source_decision_address\':getOneLineAddress(\n
           context.getSourceDecision() and \n

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=22802&r1=22801&r2=22802&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision Fri Aug  1 10:49:51 2008
@@ -1,1 +1,1 @@
-391
+392