Исправлены конфликты

asuzr/tables.py

@@ -124,8 +124,17 @@ class VisitTable(tables.Table):
   orders = tables.Column(verbose_name = 'Заказы', accessor = 'order.product__count')
   cost = tables.Column(verbose_name = 'Стоимость', accessor = 'order.price__sum')
   designer = tables.Column(verbose_name = 'Дизайнеры')
+ 
+  summary = ['Итого:','',0,0,0,0,'']
 
-  def render_orders(self, value, record):
+  def set_summaries(self, summaries):
+    indexes = {'calls': 2, 'visits': 3, 'orders': 4, 'cost': 5}
+    for s in summaries:
+      idx = indexes[s]
+      self.summary[idx] = summaries[s]
+ 
+  def render_orders(self, value, record, column):
+    value = 0 if value == None else value
     return mark_safe('<a href="%s?date=%s">%s</a>' % (
 			reverse('asuzr.views.visit_view'), 
 			record['date'].strftime('%d.%m.%Y'), 
@@ -134,6 +143,8 @@ class VisitTable(tables.Table):
 
   class Meta:
     attrs = {'class': 'paleblue'}
+    orderable = False
+    template = 'asuzr/weekend_table.html'
     
 class ProdPlanTable(tables.Table):
   date = tables.Column(verbose_name = 'Дата')