[Collective-checkins] r46472 - in corenetorganizations/trunk: content skins/corenetorganizations

[lzdych <svn...@pl...>]

Author: lzdych
Date: Tue Jul 31 21:30:23 2007
New Revision: 46472

Modified:
   corenetorganizations/trunk/content/organization.py
   corenetorganizations/trunk/skins/corenetorganizations/organization_invoices.pt
Log:
improving invoices listing method and view


Modified: corenetorganizations/trunk/content/organization.py
==============================================================================
--- corenetorganizations/trunk/content/organization.py	(original)
+++ corenetorganizations/trunk/content/organization.py	Tue Jul 31 21:30:23 2007
@@ -904,7 +904,7 @@
         """
         catalog = getToolByName(self, 'portal_catalog')
         query = {'path'            : '/'.join(self.getPhysicalPath()),
-                 'object_provides' : interfaceToName(self, IOutInvoice)}
+                 'object_provides' : [interfaceToName(self, IOutInvoice),]}
         if year is not None:
             start = '%s/01/01' % year
             end   = '%s/12/31' % year

Modified: corenetorganizations/trunk/skins/corenetorganizations/organization_invoices.pt
==============================================================================
--- corenetorganizations/trunk/skins/corenetorganizations/organization_invoices.pt	(original)
+++ corenetorganizations/trunk/skins/corenetorganizations/organization_invoices.pt	Tue Jul 31 21:30:23 2007
@@ -101,11 +101,10 @@
 							item_url             item/getURL|item/absolute_url;
 							item_id              item/getId;
 							item_title_or_id     item/pretty_title_or_id;
-							item_obj             item/getObject;
 							item_invoice_type    item/getCOutInvoiceType;
-							item_due             item_obj/getDueDate;
+							item_due             item/getDueDate;
 							item_currency        item/getCurrency;
-							item_total           item_obj/getTotalAmount|python:0;
+							item_total           item/getTotalWithVAT;
 							item_type            item/portal_type;
 							item_delta           python:now - DateTime(item_due);
 							item_after           python:'%dd' % item_delta;
@@ -142,7 +141,7 @@
 								Type
 							</td>
 							
-							<td tal:content="python:toLocalizedTime(item_due, long_format=1)">
+							<td tal:content="python:toLocalizedTime(item_due)">
 								Due date
 							</td>