Реализовано добавление статей по умполчанию при создании заказа. Форма создания заказа перенесена в таблицу

asuzr/common.py

@@ -14,10 +14,9 @@ class custom_date(date):
  def weekday_color(self):
     return self.day_colors[self.weekday()]
   
- @property
- def date_dd_mm_yy(self):
-    return self.strftime('%d/%m/%Y')
-
  @property
  def is_weekend(self):
     return self.weekday() >= 5
+
+ def __format__(self):
+    return self.strftime('%d.%m.%Y')

asuzr/models.py

@@ -108,6 +108,13 @@ class Order(models.Model):
     
     return need_color
   
+  def save(self, *args, **kwargs):
+    super(Order, self).save(*args, **kwargs)
+    cost_items = CostItem.objects.filter(default_item = True)
+    for ci in cost_items:
+      new_order_cost = OrderCosts(order = self, cost_item = ci, value = 0, formula = '')
+      new_order_cost.save()
+    
 #Эскизы
 class Sketch(models.Model):
   def get_sketch_path(self, file_name):

asuzr/tables.py

@@ -67,8 +67,8 @@ class ThumbnailColumn(tables.TemplateColumn):
     super(ThumbnailColumn, self).__init__(template, *args, **kwargs)
 
 class OrdersTable(tables.Table):
-  date = tables.DateColumn('d/m/Y', verbose_name = 'Дата')
-  deadline = tables.DateColumn('d/m/Y', verbose_name = 'Срок сдачи')
+  date = tables.DateColumn('d.m.Y', verbose_name = 'Дата')
+  deadline = tables.DateColumn('d.m.Y', verbose_name = 'Срок сдачи')
   #product = tables.LinkColumn('asuzr.views.production_table', verbose_name = 'Наименование', args=[tables.utils.A('pk')]) 
   product = StaffLinkColumn(view = 'asuzr.views.production_table', verbose_name = 'Наименование') 
   delivery = EditableColumn('delivery', verbose_name = 'Доставка')
@@ -159,6 +159,7 @@ class VisitTable(tables.Table):
       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>' % (
@@ -201,7 +202,7 @@ class DayOrdersTable(OrdersTable):
                 'designer', 
                 'deadline',
                )
-    template = 'asuzr/totals_table.html'
+    template = 'asuzr/table_with_form.html'
     
 class ProdPlanTable(tables.Table):
   date = tables.Column(verbose_name = 'Дата')
@@ -215,14 +216,11 @@ class ProdPlanTable(tables.Table):
     
 class ProductionTable(tables.Table):
   cost_item = tables.Column(verbose_name = 'Комплектующие')
-  value = tables.Column(verbose_name = 'Стоимость')
+  value = EditableColumn('value', verbose_name = 'Стоимость')
   
   summary = ['Итого затрат', 0]
   balance = ['Прибыль', 0]
   
-  def render_value(self, value):
-    return '%0.2f' % value
-  
   def set_summary(self, value):
     self.summary[1] = value
     

asuzr/views.py

@@ -128,7 +128,7 @@ def visit_view(request):
                                                'additional_info': add_info,
                                                'title': title,
                                                'dateform': form,
-                                               'order_form': order_form
+                                               'model_form': order_form
                                                })
 
 @login_required