|
@ -338,6 +338,8 @@ class TurnoverReport(models.TransientModel): |
|
|
record_dict[key] = item |
|
|
record_dict[key] = item |
|
|
for record in record_dict.values(): |
|
|
for record in record_dict.values(): |
|
|
record_date = record['last_count_date'] |
|
|
record_date = record['last_count_date'] |
|
|
|
|
|
if not record_date: |
|
|
|
|
|
continue |
|
|
if ((not self.start_date and not self.end_date) or |
|
|
if ((not self.start_date and not self.end_date) or |
|
|
(self.start_date and self.end_date and |
|
|
(self.start_date and self.end_date and |
|
|
self.start_date <= self.end_date and |
|
|
self.start_date <= self.end_date and |
|
@ -345,7 +347,7 @@ class TurnoverReport(models.TransientModel): |
|
|
(self.start_date and not self.end_date and |
|
|
(self.start_date and not self.end_date and |
|
|
record_date >= self.start_date) or |
|
|
record_date >= self.start_date) or |
|
|
(not self.start_date and self.end_date and |
|
|
(not self.start_date and self.end_date and |
|
|
record_date <= self.end_date)): |
|
|
False <= self.end_date)): |
|
|
if record['id'] in filtered_records: |
|
|
if record['id'] in filtered_records: |
|
|
filtered_record = filtered_records[record['id']] |
|
|
filtered_record = filtered_records[record['id']] |
|
|
filtered_record['opening_stock'] += record['opening_stock'] |
|
|
filtered_record['opening_stock'] += record['opening_stock'] |
|
|