Revised the has_order_hole attribute of the accounting transaction data model.
This commit is contained in:
		| @@ -117,8 +117,10 @@ class Transaction(models.Model): | ||||
|         1, 2, 3, 4, 5..., and should be reordered. """ | ||||
|         if self._has_order_hole is None: | ||||
|             orders = [x.ord for x in Transaction.objects.filter( | ||||
|                 date=self.date).order_by("-ord")] | ||||
|             if orders[0] != len(orders): | ||||
|                 date=self.date)] | ||||
|             if max(orders) != len(orders): | ||||
|                 self._has_order_hole = True | ||||
|             elif min(orders) != 1: | ||||
|                 self._has_order_hole = True | ||||
|             elif len(orders) != len(set(orders)): | ||||
|                 self._has_order_hole = True | ||||
|   | ||||
| @@ -110,6 +110,7 @@ class BaseReportView(generic.ListView): | ||||
|             return HttpResponseRedirect( | ||||
|                 str(UrlBuilder(request.get_full_path()) | ||||
|                     .del_param("page"))) | ||||
|         print("accounting.views.BaseReportView.get() 1 before") | ||||
|         try: | ||||
|             r = super(BaseReportView, self) \ | ||||
|                 .get(request, *args, **kwargs) | ||||
| @@ -117,6 +118,14 @@ class BaseReportView(generic.ListView): | ||||
|             return HttpResponseRedirect( | ||||
|                 str(UrlBuilder(request.get_full_path()) | ||||
|                     .del_param("page"))) | ||||
|         print("accounting.views.BaseReportView.get() 2 after") | ||||
|         return r | ||||
|  | ||||
|     def get_context_data(self, **kwargs): | ||||
|         print("accounting.views.BaseReportView.get_context_data() 1 before") | ||||
|         r = super(BaseReportView, self).get_context_data(**kwargs) | ||||
|         print("accounting.views.BaseReportView.get_context_data() 2 after") | ||||
|         print(r) | ||||
|         return r | ||||
|  | ||||
|  | ||||
| @@ -132,6 +141,7 @@ class CashReportView(BaseReportView): | ||||
|         Returns: | ||||
|             List[Record]: The accounting records for the cash report | ||||
|         """ | ||||
|         print("accounting.views.CashReportView.get_queryset() 1 before") | ||||
|         period = PeriodParser(self.kwargs["period_spec"]) | ||||
|         if self.kwargs["subject_code"] == "0": | ||||
|             records = Record.objects.raw( | ||||
| @@ -197,4 +207,5 @@ ORDER BY | ||||
|         pagination = Pagination( | ||||
|             len(records), self.page_no, self.page_size, True) | ||||
|         start_no = pagination.page_size * (pagination.page_no - 1) | ||||
|         print("accounting.views.CashReportView.get_queryset() 2 after") | ||||
|         return records[start_no:start_no + pagination.page_size] | ||||
|   | ||||
		Reference in New Issue
	
	Block a user