From e3bb03499a036a60b975591789a8e43120e79ceb Mon Sep 17 00:00:00 2001
From: Mame Coumba Sall <mame@nexedi.com>
Date: Wed, 19 Aug 2009 20:22:09 +0000
Subject: [PATCH] 2009-08-19 mame *revert to previous version of script,
changes made are moved to bt specific to customer
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28477 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../portal_skins/erp5_base/Delivery_getODTDataDict.xml | 6 ++----
bt5/erp5_base/bt/revision | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml
index f08706793c..95479a28fd 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml
@@ -173,7 +173,6 @@ for line in getSubLineList(context):\n
\'base_price\': \'\',\n
\'total_price\': \'\',\n
\'specialise_title\': \'\',\n
- \'aggregate_title_list\' : [x.getReference() for x in line.getAggregateValueList()] or \'\',\n
}\n
else:\n
if line.getPortalType().endswith(\'Cell\'):\n
@@ -198,7 +197,6 @@ for line in getSubLineList(context):\n
\'base_price\': line.getPrice() or \'\',\n
\'total_price\': line.getTotalPrice() or \'\',\n
\'specialise_title\' : line.getProperty(\'specialise_title\', \'\'),\n
- \'aggregate_title_list\' : [x.getReference() for x in line.getAggregateValueList()] or \'\',\n
}\n
total_price += line.getTotalPrice() or 0.0\n
line_list.append(unicodeDict(line_dict.copy()))\n
@@ -476,11 +474,11 @@ return unicodeDict(data_dict)\n
<string>prod_desc</string>
<string>desc</string>
<string>getattr</string>
+ <string>line_dict</string>
+ <string>display_id</string>
<string>append</string>
<string>$append0</string>
<string>x</string>
- <string>line_dict</string>
- <string>display_id</string>
<string>_getitem_</string>
<string>_inplacevar_</string>
<string>inch_cm_ratio</string>
diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision
index b0c703c41a..2df5e549ce 100644
--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
@@ -1 +1 @@
-628
\ No newline at end of file
+629
\ No newline at end of file
--
2.30.9