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

[nobody at svn.erp5.org]

Author: nicolas
Date: Wed Apr 16 17:04:12 2008
New Revision: 20575

URL: http://svn.erp5.org?rev=20575&view=rev
Log:
Test existing values before calling method in them
Fix wrong deleted action in last commit

Modified:
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_getODTDataDict.xml
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_getODTDataDict.xml
    erp5/trunk/bt5/erp5_trade/bt/revision
    erp5/trunk/bt5/erp5_trade/bt/template_action_path_list

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_getODTDataDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_getODTDataDict.xml?rev=20575&r1=20574&r2=20575&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_getODTDataDict.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_getODTDataDict.xml Wed Apr 16 17:04:12 2008
@@ -219,7 +219,7 @@
   \'destination_email\': getEmail(context.getDestination() and context.getDestinationValue().getEmailText() or \'\'),\n
 \n
   \'destination_section_title\': unicode(context.getDestinationSectionTitle() or \'\', \'utf8\'),\n
-  \'destination_section_image_path\': context.getDestinationSectionValue().getDefaultImagePath(),\n
+  \'destination_section_image_path\': context.getDestinationSectionValue() is not None and context.getDestinationSectionValue().getDefaultImagePath() or \'\',\n
   \'destination_section_address\': unicode(getOneLineAddress(\n
       context.getDestinationSection() and context.getDestinationSectionValue().getDefaultAddressText() or \'\',\n
       context.getDestinationSection() and context.getDestinationSectionValue().getDefaultAddressRegionTitle() or \'\'), \'utf8\'),\n

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_getODTDataDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_getODTDataDict.xml?rev=20575&r1=20574&r2=20575&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_getODTDataDict.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_getODTDataDict.xml Wed Apr 16 17:04:12 2008
@@ -203,7 +203,7 @@
   \'destination_email\': getEmail(context.getDestination() and context.getDestinationValue().getEmailText() or \'\'),\n
 \n
   \'destination_section_title\': unicode(context.getDestinationSectionTitle() or \'\', \'utf8\'),\n
-  \'destination_section_image_path\': context.getDestinationSectionValue().getDefaultImagePath(),\n
+  \'destination_section_image_path\': context.getDestinationSectionValue() is not None and context.getDestinationSectionValue().getDefaultImagePath() or \'\',\n
   \'destination_section_address\': unicode(getOneLineAddress(\n
       context.getDestinationSection() and context.getDestinationSectionValue().getDefaultAddressText() or \'\',\n
       context.getDestinationSection() and context.getDestinationSectionValue().getDefaultAddressRegionTitle() or \'\'), \'utf8\'),\n

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=20575&r1=20574&r2=20575&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision Wed Apr 16 17:04:12 2008
@@ -1,1 +1,1 @@
-287
+289

Modified: erp5/trunk/bt5/erp5_trade/bt/template_action_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/template_action_path_list?rev=20575&r1=20574&r2=20575&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/template_action_path_list (original)
+++ erp5/trunk/bt5/erp5_trade/bt/template_action_path_list Wed Apr 16 17:04:12 2008
@@ -108,6 +108,7 @@
 Sale Packing List Module | workflow_report
 Sale Packing List | choose_solve_actions
 Sale Packing List | container_fast_input
+Sale Packing List | details
 Sale Packing List | jump_related_sale_invoice
 Sale Packing List | packing_list_print
 Sale Packing List | view