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 f08706793c014d11ad9183a53b61383ce848176f..95479a28fdd6b834d2ffd29d941c667bb8d24bbb 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 b0c703c41aeb461a340aaf1f9b0cf3e7ef8dd773..2df5e549ce82e1d5ab41eb50985fff46dea72c60 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