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

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Oct  3 10:53:57 2008
New Revision: 23995

URL: http://svn.erp5.org?rev=23995&view=rev
Log:
also use corporate name for source / destination

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=23995&r1=23994&r2=23995&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 Oct  3 10:53:57 2008
@@ -208,6 +208,13 @@
   def getProperty(self, prop, d=\'\'):\n
     return d\n
 \n
+source = context.getSourceValue()\n
+if source is None:\n
+  source = EmptyOrganisation()\n
+\n
+destination = context.getDestinationSectionValue()\n
+if destination is None:\n
+  destination = EmptyOrganisation()\n
 \n
 source_section = context.getSourceSectionValue()\n
 if source_section is None:\n
@@ -275,7 +282,7 @@
   \'source_administration_vatid\':\n
           getVatId(source_administration.getProperty(\'vat_code\', \'\')),\n
 \n
-  \'source_title\': context.getSourceTitle() or \'\',\n
+  \'source_title\': source.getProperty(\'corporate_name\') or source.getTitle(),\n
   \'source_address\': getOneLineAddress(\n
           context.getSource() and\n
               context.getSourceValue().getDefaultAddressText() or \'\',\n
@@ -317,7 +324,7 @@
                            is not None and\\\n
                            context.getSourceDecisionValue().getVatCode() or \'\'),\n
 \n
-  \'destination_title\': context.getDestinationTitle() or \'\',\n
+  \'destination_title\': destination.getProperty(\'corporate_name\') or destination.getTitle(),\n
   \'destination_address\': getOneLineAddress(\n
       context.getDestination() and \\\n
           context.getDestinationValue().getDefaultAddressText() or \'\',\n
@@ -463,6 +470,8 @@
                             <string>_inplacevar_</string>
                             <string>inch_cm_ratio</string>
                             <string>EmptyOrganisation</string>
+                            <string>source</string>
+                            <string>destination</string>
                             <string>source_section</string>
                             <string>destination_section</string>
                             <string>source_administration</string>

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=23995&r1=23994&r2=23995&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision Fri Oct  3 10:53:57 2008
@@ -1,1 +1,1 @@
-439
+440