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

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Nov  3 14:21:26 2008
New Revision: 24458

URL: http://svn.erp5.org?rev=24458&view=rev
Log:
only show tax lines if they have a non zero price

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=24458&r1=24457&r2=24458&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml [utf8] Mon Nov  3 14:21:26 2008
@@ -121,6 +121,14 @@
   if days:\n
     return \'%s %s\' % (days, translateString(\'Days\'))\n
   return \'\'\n
+\n
+def getTaxLineList(order):\n
+  tax_line_list = [line for line in\n
+       order.contentValues(portal_type=order.getPortalTaxMovementTypeList())\n
+       if line.getTotalPrice()]\n
+  tax_line_list.sort(key=lambda line:line.getTitle())\n
+  return tax_line_list\n
+\n
 \n
 line_list = []\n
 total_price = 0.0\n
@@ -388,8 +396,7 @@
   \'incoterm\': context.getIncoterm() and context.getIncotermValue().getCodification() or \'\',\n
 \n
   \'total_price_novat\': total_price,\n
-#    FIXME: use contentValues\n
-  \'vat_list\': context.searchFolder(portal_type=context.getPortalTaxMovementTypeList(), order_by=\'title\'),\n
+  \'vat_list\': getTaxLineList(context),\n
   \'description\': getFieldAsLineList(context.getDescription()),\n
   \'specialise_title\': context.getProperty(\'specialise_title\',\'\'),\n
 \n
@@ -451,6 +458,7 @@
                             <string>separator</string>
                             <string>getOrderedDate</string>
                             <string>getPaymentConditionText</string>
+                            <string>getTaxLineList</string>
                             <string>line_list</string>
                             <string>total_price</string>
                             <string>total_vat</string>

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=24458&r1=24457&r2=24458&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Mon Nov  3 14:21:26 2008
@@ -1,1 +1,1 @@
-457
+458