modify accounting model

billard/models.py

@@ -84,14 +84,14 @@ class Desk(models.Model):
 
 
 class Accounting(models.Model):
-    client = models.ForeignKey(Client, verbose_name="Client")
-    desk_no = models.IntegerField(verbose_name="Tischnummer")
+    desk = models.ForeignKey(Desk, verbose_name="Tisch")
     time_from = models.DateTimeField(verbose_name="Beginn")
     time_to = models.DateTimeField(blank=True, null=True, verbose_name="Ende")
     prize = models.DecimalField(max_digits=5, decimal_places=2, blank=True, null=True, verbose_name="Preis")
+    billed = models.BooleanField(default=False, verbose_name="Abgerechnet")
 
     def __str__(self):
-        return '{}: {} -> {}, {}'.format(self.client.uuid, self.time_from, self.time_to, self.prize)
+        return '{}: {} -> {}, {}, {}'.format(self.desk, self.time_from, self.time_to, self.prize, self.billed)
 
     class Meta:
         ordering = ['-time_from']
@@ -117,15 +117,14 @@ def process_location_data():
         else:
             cli = cli[0]
             desk = cli.desks.filter(desk_no=ld.desk_no)[0]
-            ac = Accounting.objects.filter(client=cli, desk_no=ld.desk_no).order_by('time_from').reverse()
+            ac = desk.accounting_set.order_by('time_from').reverse()
             if ld.on_off:
                 if ac.count() > 0 and ac[0].time_to is None:
                     ac[0].time_to = datetime.now()
                     ac[0].save()
                     # TODO Send error eMail to Admin
                 acc = Accounting(
-                    client=cli,
-                    desk_no=ld.desk_no,
+                    desk=desk,
                     time_from=ld.tst,
                 )
                 acc.save()