From 4f49c4ff80d27c608b62fc886da5538db2a606c7 Mon Sep 17 00:00:00 2001
From: Ramez Ashraf <ramez@rasystem.io>
Date: Thu, 18 May 2023 09:09:58 +0300
Subject: [PATCH 1/8] Enhance names and translations

---
 slick_reporting/fields.py | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/slick_reporting/fields.py b/slick_reporting/fields.py
index 267369f..67becfa 100644
--- a/slick_reporting/fields.py
+++ b/slick_reporting/fields.py
@@ -376,7 +376,7 @@ def get_time_series_field_verbose_name(cls, date_period, index, dates, pattern):
 
 class FirstBalanceField(SlickReportField):
     name = "__fb__"
-    verbose_name = _("first balance")
+    verbose_name = _("opening balance")
 
     def prepare(self, q_filters=None, extra_filters=None, **kwargs):
         extra_filters = extra_filters or {}
@@ -401,7 +401,7 @@ class TotalReportField(SlickReportField):
 
 class BalanceReportField(SlickReportField):
     name = "__balance__"
-    verbose_name = _("Cumulative Total")
+    verbose_name = _("Closing Total")
     requires = ["__fb__"]
 
     def final_calculation(self, debit, credit, dep_dict):
@@ -439,6 +439,7 @@ def final_calculation(self, debit, credit, dep_dict):
 field_registry.register(CreditReportField)
 
 
+@field_registry.register
 class DebitReportField(SlickReportField):
     name = "__debit__"
     verbose_name = _("Debit")
@@ -447,7 +448,24 @@ def final_calculation(self, debit, credit, dep_dict):
         return debit
 
 
-field_registry.register(DebitReportField)
+@field_registry.register
+class CreditQuantityReportField(SlickReportField):
+    name = "__credit_quantity__"
+    verbose_name = _("Credit QTY")
+    is_summable = False
+
+    def final_calculation(self, debit, credit, dep_dict):
+        return credit
+
+
+@field_registry.register
+class DebitQuantityReportField(SlickReportField):
+    name = "__debit_quantity__"
+    verbose_name = _("Debit QTY")
+    is_summable = False
+
+    def final_calculation(self, debit, credit, dep_dict):
+        return debit
 
 
 class TotalQTYReportField(SlickReportField):
@@ -461,8 +479,8 @@ class TotalQTYReportField(SlickReportField):
 
 
 class FirstBalanceQTYReportField(FirstBalanceField):
-    name = "__fb_quan__"
-    verbose_name = _("starting QTY")
+    name = "__fb_quantity__"
+    verbose_name = _("Opening QTY")
     calculation_field = "quantity"
     is_summable = False
 
@@ -472,14 +490,14 @@ class FirstBalanceQTYReportField(FirstBalanceField):
 
 class BalanceQTYReportField(SlickReportField):
     name = "__balance_quantity__"
-    verbose_name = _("Cumulative QTY")
+    verbose_name = _("Closing QTY")
     calculation_field = "quantity"
-    requires = ["__fb_quan__"]
+    requires = ["__fb_quantity__"]
     is_summable = False
 
     def final_calculation(self, debit, credit, dep_dict):
         # Use `get` so it fails loud if its not there
-        fb = dep_dict.get("__fb_quan__")
+        fb = dep_dict.get("__fb_quantity__")
         fb = fb or 0
         return fb + debit - credit
 

From 22b25b5858616cf671556e362714d1617127f59e Mon Sep 17 00:00:00 2001
From: Ramez Ashraf <ramez@rasystem.io>
Date: Fri, 19 May 2023 21:55:51 +0300
Subject: [PATCH 2/8] Add time series documentation

---
 docs/source/index.rst               |  1 +
 docs/source/time_series_options.rst | 62 +++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 docs/source/time_series_options.rst

diff --git a/docs/source/index.rst b/docs/source/index.rst
index eb8d6f2..e96b64f 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -75,6 +75,7 @@ Next step :ref:`structure`
 
    concept
    the_view
+   time_series_options
    report_generator
    computation_field
 
diff --git a/docs/source/time_series_options.rst b/docs/source/time_series_options.rst
new file mode 100644
index 0000000..d56aaea
--- /dev/null
+++ b/docs/source/time_series_options.rst
@@ -0,0 +1,62 @@
+Time Series Reports
+==================
+
+
+Here is a quick recipe to what you want to do
+
+.. code-block:: python
+
+    from django.utils.translation import gettext_lazy as _
+    from django.db.models import Sum
+    from slick_reporting.views import SlickReportView
+
+    class MyReport(SlickReportView):
+
+        time_series_pattern = "monthly"
+        # options are : "daily", "weekly", "monthly", "yearly", "custom"
+
+        # if time_series_pattern is "custom", then you can specify the dates like so
+        # time_series_custom_dates = [
+        #   (datetime.date(2020, 1, 1), datetime.date(2020, 1, 14)),
+        #   (datetime.date(2020, 2, 1), datetime.date(2020, 2, 14)),
+        #   (datetime.date(2020, 3, 1), datetime.date(2020, 3,14)),
+        ]
+
+
+        time_series_columns = [
+            SlickReportField.create(Sum, "value", verbose_name=_("Value")),
+        ]
+        # These columns will be calculated for each period in the time series.
+
+
+
+        columns = ['some_optional_field',
+            '__time_series__',
+            # You can customize where the time series columns are displayed in relation to the other columns
+
+            SlickReportField.create(Sum, "value", verbose_name=_("Value")),
+            # This is the same as the time_series_columns, but this one will be on the whole set
+
+        ]
+
+
+
+
+        time_series_selector = True
+        # This will display a selector to change the time series pattern
+
+        # settings for the time series selector
+        # ----------------------------------
+
+        time_series_selector_choices=None  # A list Choice tuple [(value, label), ...]
+        time_series_selector_default = "monthly"  # The initial value for the time series selector
+        time_series_selector_label = _("Period Pattern)  # The label for the time series selector
+        time_series_selector_allow_empty = False  # Allow the user to select an empty time series
+
+
+
+Links to demo
+-------------
+
+Time series Selector pattern Demo `Demo <https://my-shop.django-erp-framework.com/reports/profitability/profitabilityreportmonthly/>`_
+and here is the `Code on github <https://github.com/RamezIssac/my-shop/blob/main/general_reports/reports.py#L44>`_ for the report.

From e43605fad27cdd8e44b794d4ef037c25f13aa5b0 Mon Sep 17 00:00:00 2001
From: Ramez Ashraf <ramez@rasystem.io>
Date: Tue, 23 May 2023 18:28:19 +0300
Subject: [PATCH 3/8] Fix in quantity reports

---
 slick_reporting/fields.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/slick_reporting/fields.py b/slick_reporting/fields.py
index 67becfa..10a3c57 100644
--- a/slick_reporting/fields.py
+++ b/slick_reporting/fields.py
@@ -452,6 +452,7 @@ def final_calculation(self, debit, credit, dep_dict):
 class CreditQuantityReportField(SlickReportField):
     name = "__credit_quantity__"
     verbose_name = _("Credit QTY")
+    calculation_field = "quantity"
     is_summable = False
 
     def final_calculation(self, debit, credit, dep_dict):
@@ -461,6 +462,7 @@ def final_calculation(self, debit, credit, dep_dict):
 @field_registry.register
 class DebitQuantityReportField(SlickReportField):
     name = "__debit_quantity__"
+    calculation_field = "quantity"
     verbose_name = _("Debit QTY")
     is_summable = False
 

From 2fbc32efc786d1ae807eeabbea13fb3d23c07dfe Mon Sep 17 00:00:00 2001
From: Ramez Ashraf <ramez@rasystem.io>
Date: Sat, 27 May 2023 14:53:46 +0300
Subject: [PATCH 4/8] Renaming following django-erp-framework

---
 .../{ra.chartsjs.js => erp_framework.chartsjs.js}      |  0
 .../{ra.highchart.js => erp_framework.highchart.js}    |  0
 slick_reporting/templates/slick_reporting/base.html    |  2 +-
 .../templates/slick_reporting/simple_report.html       | 10 +++++-----
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename slick_reporting/static/slick_reporting/{ra.chartsjs.js => erp_framework.chartsjs.js} (100%)
 rename slick_reporting/static/slick_reporting/{ra.highchart.js => erp_framework.highchart.js} (100%)

diff --git a/slick_reporting/static/slick_reporting/ra.chartsjs.js b/slick_reporting/static/slick_reporting/erp_framework.chartsjs.js
similarity index 100%
rename from slick_reporting/static/slick_reporting/ra.chartsjs.js
rename to slick_reporting/static/slick_reporting/erp_framework.chartsjs.js
diff --git a/slick_reporting/static/slick_reporting/ra.highchart.js b/slick_reporting/static/slick_reporting/erp_framework.highchart.js
similarity index 100%
rename from slick_reporting/static/slick_reporting/ra.highchart.js
rename to slick_reporting/static/slick_reporting/erp_framework.highchart.js
diff --git a/slick_reporting/templates/slick_reporting/base.html b/slick_reporting/templates/slick_reporting/base.html
index c3de1c9..950ba91 100644
--- a/slick_reporting/templates/slick_reporting/base.html
+++ b/slick_reporting/templates/slick_reporting/base.html
@@ -14,7 +14,7 @@
 
     <link rel="stylesheet" type="text/css"
           href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"/>
-    <title>Python Slick Reporting</title>
+    <title>Django Slick Reporting</title>
 </head>
 <body>
 <div class="container">
diff --git a/slick_reporting/templates/slick_reporting/simple_report.html b/slick_reporting/templates/slick_reporting/simple_report.html
index d4a8c09..6e2efd3 100644
--- a/slick_reporting/templates/slick_reporting/simple_report.html
+++ b/slick_reporting/templates/slick_reporting/simple_report.html
@@ -60,13 +60,13 @@ <h4 class="py-5">Results</h4>
 {% block extrajs %}
     {{ block.super }}
     <script src="{% static 'slick_reporting/main.js' %}"></script>
-    <script src="{% static 'slick_reporting/ra.chartsjs.js' %}"></script>
-    <script src="{% static 'slick_reporting/ra.highchart.js' %}"></script>
+    <script src="{% static 'slick_reporting/erp_framework.chartsjs.js' %}"></script>
+    <script src="{% static 'slick_reporting/erp_framework.highchart.js' %}"></script>
 
     <link href="https://cdn.jsdelivr.net/npm/select2@4.0.13/dist/css/select2.min.css" rel="stylesheet"/>
-<script src="https://cdn.jsdelivr.net/npm/select2@4.0.13/dist/js/select2.min.js"
-        integrity="sha384-JnbsSLBmv2/R0fUmF2XYIcAEMPHEAO51Gitn9IjL4l89uFTIgtLF1+jqIqqd9FSk"
-        crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/select2@4.0.13/dist/js/select2.min.js"
+            integrity="sha384-JnbsSLBmv2/R0fUmF2XYIcAEMPHEAO51Gitn9IjL4l89uFTIgtLF1+jqIqqd9FSk"
+            crossorigin="anonymous"></script>
 
 
     <script>

From 02d332d3497ddf7202ffe215ee2b378909a8f34d Mon Sep 17 00:00:00 2001
From: Ramez Ashraf <ramez@rasystem.io>
Date: Sat, 27 May 2023 15:57:22 +0300
Subject: [PATCH 5/8] Add view options documentation Work on crosstab reports

---
 docs/source/index.rst           |  1 +
 docs/source/view_options.rst    | 49 +++++++++++++++++++++++++++++++++
 slick_reporting/fields.py       |  2 +-
 slick_reporting/form_factory.py |  1 +
 slick_reporting/generator.py    |  2 +-
 5 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 docs/source/view_options.rst

diff --git a/docs/source/index.rst b/docs/source/index.rst
index e96b64f..97566c2 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -75,6 +75,7 @@ Next step :ref:`structure`
 
    concept
    the_view
+   view_options
    time_series_options
    report_generator
    computation_field
diff --git a/docs/source/view_options.rst b/docs/source/view_options.rst
new file mode 100644
index 0000000..2fe620c
--- /dev/null
+++ b/docs/source/view_options.rst
@@ -0,0 +1,49 @@
+
+Report View Options
+===================
+
+We can categorize the output of a report into 4 sections:
+
+* List report: Similar to a django changelist, it's a direct view of the report model records with some extra features like sorting, filtering, pagination, etc.
+* Grouped report: similar to what you'd expect from a SQL group by query, it's a list of records grouped by a certain field
+* Time series report: a step up from the grouped report, where the results are computed for each time period (day, week, month, year, etc) or you can specify a custom periods.
+* Crosstab report: It's a report where a table showing the relationship between two or more variables. (like Client sales of each product comparison)
+
+
+
+General Options
+---------------
+
+* columns
+
+Columns can be a list of column names , or a tuple of (column name, options dictionary) pairs.
+
+example:
+
+.. code-block:: python
+
+    class MyReport()
+        columns = [
+            'id',
+            ('name', {'verbose_name': "My verbose name", is_summable=False}),
+            'description',
+        ]
+
+
+
+* date_field: the date field to be used in filtering and computing (ie: the time series report).
+
+* report_model: the model where the relevant data is stored, in more complex reports, it's usually a database view / materialized view.
+
+* report_title: the title of the report to be displayed in the report page.
+
+* group_by : the group by field, if not specified, the report will be a list report.
+
+* excluded_fields
+
+* chart_settings : a list of dictionary (or Chart object) of charts you want to attach to the report.
+
+
+
+
+
diff --git a/slick_reporting/fields.py b/slick_reporting/fields.py
index 10a3c57..7896a1f 100644
--- a/slick_reporting/fields.py
+++ b/slick_reporting/fields.py
@@ -345,7 +345,7 @@ def get_crosstab_field_verbose_name(cls, model, id):
         :return: a verbose string
         """
         if id == "----":
-            return _("The reminder")
+            return _("The remainder")
         return f"{cls.verbose_name} {model} {id}"
 
     @classmethod
diff --git a/slick_reporting/form_factory.py b/slick_reporting/form_factory.py
index 80a7123..04a7adc 100644
--- a/slick_reporting/form_factory.py
+++ b/slick_reporting/form_factory.py
@@ -97,6 +97,7 @@ def get_filters(self):
 
     @cached_property
     def crosstab_key_name(self):
+        # todo get the model more accurately
         """
         return the actual foreignkey field name by simply adding an '_id' at the end.
         This is hook is to customize this naieve approach.
diff --git a/slick_reporting/generator.py b/slick_reporting/generator.py
index 66c9ac2..2cfacde 100644
--- a/slick_reporting/generator.py
+++ b/slick_reporting/generator.py
@@ -302,7 +302,7 @@ def __init__(
         # self.date_field = date_field or self.date_field
 
         # in case of a group by, do we show a grouped by model data regardless of their appearance in the results
-        # a client who didnt make a transaction during the date period.
+        # a client who didn't make a transaction during the date period.
         self.show_empty_records = False  # show_empty_records if show_empty_records else self.show_empty_records
         # Looks like this options is harder then what i thought as it interfere with the usual filtering of the report
 

From a5cf80a0313b548378795d74560375635eb7b1bf Mon Sep 17 00:00:00 2001
From: Ramez Ashraf <ramez@rasystem.io>
Date: Sat, 27 May 2023 16:05:25 +0300
Subject: [PATCH 6/8] Fix typo reminder -> remainder

---
 slick_reporting/form_factory.py | 26 +++++++++++++-------------
 slick_reporting/generator.py    | 22 +++++++++++-----------
 slick_reporting/views.py        | 12 ++++++------
 tests/test_generator.py         | 10 +++++-----
 tests/tests.py                  | 10 +++++-----
 5 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/slick_reporting/form_factory.py b/slick_reporting/form_factory.py
index 04a7adc..d4552f8 100644
--- a/slick_reporting/form_factory.py
+++ b/slick_reporting/form_factory.py
@@ -25,7 +25,7 @@ def get_crispy_helper(
     foreign_keys_map=None,
     crosstab_model=None,
     crosstab_key_name=None,
-    crosstab_display_compute_reminder=False,
+    crosstab_display_compute_remainder=False,
     add_date_range=True,
 ):
     from crispy_forms.helper import FormHelper
@@ -52,8 +52,8 @@ def get_crispy_helper(
     # first add the crosstab model and its display reimder then the rest of the fields
     if crosstab_model:
         filters_container.append(Field(crosstab_key_name))
-        if crosstab_display_compute_reminder:
-            filters_container.append(Field("crosstab_compute_reminder"))
+        if crosstab_display_compute_remainder:
+            filters_container.append(Field("crosstab_compute_remainder"))
 
     for k in foreign_keys_map:
         if k != crosstab_key_name:
@@ -115,16 +115,16 @@ def get_crosstab_ids(self):
             return [x for x in qs.values_list("pk", flat=True)]
         return []
 
-    def get_crosstab_compute_reminder(self):
-        return self.cleaned_data.get("crosstab_compute_reminder", True)
+    def get_crosstab_compute_remainder(self):
+        return self.cleaned_data.get("crosstab_compute_remainder", True)
 
     def get_crispy_helper(self, foreign_keys_map=None, crosstab_model=None, **kwargs):
         return get_crispy_helper(
             self.foreign_keys,
             crosstab_model=getattr(self, "crosstab_model", None),
             crosstab_key_name=getattr(self, "crosstab_key_name", None),
-            crosstab_display_compute_reminder=getattr(
-                self, "crosstab_display_compute_reminder", False
+            crosstab_display_compute_remainder=getattr(
+                self, "crosstab_display_compute_remainder", False
             ),
             **kwargs,
         )
@@ -140,7 +140,7 @@ def _default_foreign_key_widget(f_field):
 def report_form_factory(
     model,
     crosstab_model=None,
-    display_compute_reminder=True,
+    display_compute_remainder=True,
     fkeys_filter_func=None,
     foreign_key_widget_func=None,
     excluded_fields=None,
@@ -159,7 +159,7 @@ def report_form_factory(
 
     :param model: the report_model
     :param crosstab_model: crosstab model if any
-    :param display_compute_reminder:  relevant only if crosstab_model is specified. Control if we show the check to
+    :param display_compute_remainder:  relevant only if crosstab_model is specified. Control if we show the check to
     display the rest.
     :param fkeys_filter_func:  a receives an OrderedDict of Foreign Keys names and their model field instances found on the model, return the OrderedDict that would be used
     :param foreign_key_widget_func: receives a Field class return the used widget like this {'form_class': forms.ModelMultipleChoiceField, 'required': False, }
@@ -219,9 +219,9 @@ def report_form_factory(
             field_attrs["required"] = True
         fields[name] = f_field.formfield(**field_attrs)
 
-    if crosstab_model and display_compute_reminder:
-        fields["crosstab_compute_reminder"] = forms.BooleanField(
-            required=False, label=_("Display the crosstab reminder"), initial=True
+    if crosstab_model and display_compute_remainder:
+        fields["crosstab_compute_remainder"] = forms.BooleanField(
+            required=False, label=_("Display the crosstab remainder"), initial=True
         )
 
     bases = (
@@ -236,7 +236,7 @@ def report_form_factory(
             "_fkeys": fkeys_list,
             "foreign_keys": fkeys_map,
             "crosstab_model": crosstab_model,
-            "crosstab_display_compute_reminder": display_compute_reminder,
+            "crosstab_display_compute_remainder": display_compute_remainder,
         },
     )
     return new_form
diff --git a/slick_reporting/generator.py b/slick_reporting/generator.py
index 2cfacde..5546cbb 100644
--- a/slick_reporting/generator.py
+++ b/slick_reporting/generator.py
@@ -122,7 +122,7 @@ class ReportGenerator(object):
     crosstab_ids = None
     """A list is the ids to create a crosstab report on"""
 
-    crosstab_compute_reminder = True
+    crosstab_compute_remainder = True
     """Include an an extra crosstab_columns for the outer group ( ie: all expects those `crosstab_ids`) """
 
     show_empty_records = True
@@ -161,7 +161,7 @@ def __init__(
         crosstab_model=None,
         crosstab_columns=None,
         crosstab_ids=None,
-        crosstab_compute_reminder=None,
+        crosstab_compute_remainder=None,
         swap_sign=False,
         show_empty_records=None,
         print_flag=False,
@@ -187,7 +187,7 @@ def __init__(
         :param crosstab_model:
         :param crosstab_columns:
         :param crosstab_ids:
-        :param crosstab_compute_reminder:
+        :param crosstab_compute_remainder:
         :param swap_sign:
         :param show_empty_records:
         :param base_model:
@@ -226,10 +226,10 @@ def __init__(
         self.crosstab_model = self.crosstab_model or crosstab_model
         self.crosstab_columns = crosstab_columns or self.crosstab_columns or []
         self.crosstab_ids = self.crosstab_ids or crosstab_ids or []
-        self.crosstab_compute_reminder = (
-            self.crosstab_compute_reminder
-            if crosstab_compute_reminder is None
-            else crosstab_compute_reminder
+        self.crosstab_compute_remainder = (
+            self.crosstab_compute_remainder
+            if crosstab_compute_remainder is None
+            else crosstab_compute_remainder
         )
 
         self.format_row = format_row_func or self._default_format_row
@@ -374,11 +374,11 @@ def _apply_queryset_options(self, query, fields=None):
 
     def _construct_crosstab_filter(self, col_data):
         """
-        In charge of adding the needed crosstab filter, specific to the case of is_reminder or not
+        In charge of adding the needed crosstab filter, specific to the case of is_remainder or not
         :param col_data:
         :return:
         """
-        if col_data["is_reminder"]:
+        if col_data["is_remainder"]:
             filters = [~Q(**{f"{col_data['model']}_id__in": self.crosstab_ids})]
         else:
             filters = [Q(**{f"{col_data['model']}_id": col_data["id"]})]
@@ -805,7 +805,7 @@ def get_crosstab_parsed_columns(self):
         """
         report_columns = self.crosstab_columns or []
         ids = list(self.crosstab_ids)
-        if self.crosstab_compute_reminder:
+        if self.crosstab_compute_remainder:
             ids.append("----")
         output_cols = []
         ids_length = len(ids) - 1
@@ -827,7 +827,7 @@ def get_crosstab_parsed_columns(self):
                         "ref": magic_field_class,
                         "id": id,
                         "model": self.crosstab_model,
-                        "is_reminder": counter == ids_length,
+                        "is_remainder": counter == ids_length,
                         "source": "magic_field" if magic_field_class else "",
                         "is_summable": magic_field_class.is_summable,
                     }
diff --git a/slick_reporting/views.py b/slick_reporting/views.py
index e0ada3b..c23f6f5 100644
--- a/slick_reporting/views.py
+++ b/slick_reporting/views.py
@@ -103,7 +103,7 @@ class SlickReportViewBase(FormView):
     crosstab_model = None
     crosstab_ids = None
     crosstab_columns = None
-    crosstab_compute_reminder = True
+    crosstab_compute_remainder = True
     excluded_fields = None
     report_title_context_key = "title"
 
@@ -184,7 +184,7 @@ def get_form_class(self):
         return self.form_class or report_form_factory(
             self.get_report_model(),
             crosstab_model=self.crosstab_model,
-            display_compute_reminder=self.crosstab_compute_reminder,
+            display_compute_remainder=self.crosstab_compute_remainder,
             excluded_fields=self.excluded_fields,
             initial=self.get_form_initial(),
             show_time_series_selector=self.time_series_selector,
@@ -223,10 +223,10 @@ def get_report_generator(self, queryset, for_print):
         if self.crosstab_model:
             self.crosstab_ids = self.form.get_crosstab_ids()
 
-        crosstab_compute_reminder = (
-            self.form.get_crosstab_compute_reminder()
+        crosstab_compute_remainder = (
+            self.form.get_crosstab_compute_remainder()
             if self.request.GET or self.request.POST
-            else self.crosstab_compute_reminder
+            else self.crosstab_compute_remainder
         )
 
         time_series_pattern = self.time_series_pattern
@@ -251,7 +251,7 @@ def get_report_generator(self, queryset, for_print):
             crosstab_model=self.crosstab_model,
             crosstab_ids=self.crosstab_ids,
             crosstab_columns=self.crosstab_columns,
-            crosstab_compute_reminder=crosstab_compute_reminder,
+            crosstab_compute_remainder=crosstab_compute_remainder,
             format_row_func=self.format_row,
             container_class=self,
         )
diff --git a/tests/test_generator.py b/tests/test_generator.py
index b5343d4..b49b00c 100644
--- a/tests/test_generator.py
+++ b/tests/test_generator.py
@@ -24,13 +24,13 @@
 class MatrixTests(BaseTestData, TestCase):
     def test_matrix_column_included(self):
         report = CrosstabOnClient(
-            crosstab_ids=[self.client1.pk], crosstab_compute_reminder=False
+            crosstab_ids=[self.client1.pk], crosstab_compute_remainder=False
         )
         columns = report.get_list_display_columns()
         self.assertEqual(len(columns), 3, columns)
 
         report = CrosstabOnClient(
-            crosstab_ids=[self.client1.pk], crosstab_compute_reminder=True
+            crosstab_ids=[self.client1.pk], crosstab_compute_remainder=True
         )
         columns = report.get_list_display_columns()
         self.assertEqual(len(columns), 4, columns)
@@ -39,14 +39,14 @@ def test_matrix_column_position(self):
         report = CrosstabOnClient(
             columns=["__crosstab__", "name", "__total_quantity__"],
             crosstab_ids=[self.client1.pk],
-            crosstab_compute_reminder=False,
+            crosstab_compute_remainder=False,
         )
         columns = report.get_list_display_columns()
         self.assertEqual(len(columns), 3, columns)
         self.assertEqual(columns[0]["name"], "value__sumCT1")
 
         report = CrosstabOnClient(
-            crosstab_ids=[self.client1.pk], crosstab_compute_reminder=True
+            crosstab_ids=[self.client1.pk], crosstab_compute_remainder=True
         )
         columns = report.get_list_display_columns()
         self.assertEqual(len(columns), 4, columns)
@@ -69,7 +69,7 @@ def test_get_crosstab_parsed_columns(self):
         :return:
         """
         report = CrosstabOnClient(
-            crosstab_ids=[self.client1.pk], crosstab_compute_reminder=False
+            crosstab_ids=[self.client1.pk], crosstab_compute_remainder=False
         )
         columns = report.get_crosstab_parsed_columns()
         for col in columns:
diff --git a/tests/tests.py b/tests/tests.py
index 688b348..8900348 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -436,7 +436,7 @@ def test_crosstab_report_view(self):
         from .report_generators import ProductClientSalesMatrix
 
         data = ProductClientSalesMatrix(
-            crosstab_compute_reminder=True,
+            crosstab_compute_remainder=True,
             crosstab_ids=[self.client1.pk, self.client2.pk],
         ).get_report_data()
 
@@ -446,7 +446,7 @@ def test_crosstab_report_view(self):
             reverse("product_crosstab_client"),
             data={
                 "client_id": [self.client1.pk, self.client2.pk],
-                "crosstab_compute_reminder": True,
+                "crosstab_compute_remainder": True,
             },
             HTTP_X_REQUESTED_WITH="XMLHttpRequest",
         )
@@ -456,7 +456,7 @@ def test_crosstab_report_view(self):
 
     def test_crosstab_report_view_clumns_on_fly(self):
         data = ProductClientSalesMatrix2(
-            crosstab_compute_reminder=True,
+            crosstab_compute_remainder=True,
             crosstab_ids=[self.client1.pk, self.client2.pk],
         ).get_report_data()
 
@@ -464,7 +464,7 @@ def test_crosstab_report_view_clumns_on_fly(self):
             reverse("crosstab-columns-on-fly"),
             data={
                 "client_id": [self.client1.pk, self.client2.pk],
-                "crosstab_compute_reminder": True,
+                "crosstab_compute_remainder": True,
             },
             HTTP_X_REQUESTED_WITH="XMLHttpRequest",
         )
@@ -477,7 +477,7 @@ def test_chart_settings(self):
             reverse("product_crosstab_client"),
             data={
                 "client_id": [self.client1.pk, self.client2.pk],
-                "crosstab_compute_reminder": True,
+                "crosstab_compute_remainder": True,
             },
             HTTP_X_REQUESTED_WITH="XMLHttpRequest",
         )

From 47d73cad839a206a0e63e0b2324bb31c8b075bb0 Mon Sep 17 00:00:00 2001
From: Ramez Ashraf <ramez@rasystem.io>
Date: Sun, 28 May 2023 13:36:41 +0300
Subject: [PATCH 7/8] Fix in crosstab when compute remainder is False

---
 slick_reporting/generator.py |  4 +++-
 tests/tests.py               | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/slick_reporting/generator.py b/slick_reporting/generator.py
index 5546cbb..6e03c1f 100644
--- a/slick_reporting/generator.py
+++ b/slick_reporting/generator.py
@@ -827,7 +827,9 @@ def get_crosstab_parsed_columns(self):
                         "ref": magic_field_class,
                         "id": id,
                         "model": self.crosstab_model,
-                        "is_remainder": counter == ids_length,
+                        "is_remainder": counter == ids_length
+                        if self.crosstab_compute_remainder
+                        else False,
                         "source": "magic_field" if magic_field_class else "",
                         "is_summable": magic_field_class.is_summable,
                     }
diff --git a/tests/tests.py b/tests/tests.py
index 8900348..b688f9c 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -302,6 +302,16 @@ def test_productclientsalesmatrix(self):
         self.assertEqual(data[0]["__total__CT%s" % self.client2.pk], 600)
         self.assertEqual(data[0]["__total__CT----"], 900)
 
+    def test_productclientsalesmatrix_no_remainder(self):
+        report = report_generators.ProductClientSalesMatrix(
+            crosstab_ids=[self.client1.pk, self.client2.pk],
+            crosstab_compute_remainder=False,
+        )
+        data = report.get_report_data()
+        self.assertEqual(data[0]["__total__CT%s" % self.client1.pk], 300)
+        self.assertEqual(data[0]["__total__CT%s" % self.client2.pk], 600)
+        # self.assertEqual(data[0]["__total__CT----"], 900)
+
     def test_show_empty_records(self):
         report = report_generators.ClientTotalBalance()
         data = report.get_report_data()

From c3172ba939bfc5c461c9b092c9752850021c9a5a Mon Sep 17 00:00:00 2001
From: Ramez Ashraf <ramez@rasystem.io>
Date: Sun, 28 May 2023 14:12:07 +0300
Subject: [PATCH 8/8] version bump

---
 CHANGELOG.md                | 6 ++++++
 README.rst                  | 3 ++-
 slick_reporting/__init__.py | 4 ++--
 tests/tests.py              | 1 -
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30ea461..4168d9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.8.0]
+
+- Breaking: [Only if you use Crosstab reports] renamed crosstab_compute_reminder to crosstab_compute_remainder
+- Breaking : [Only if you set the templates statics by hand] renamed slick_reporting to ra.hightchart.js and ra.chartjs.js to 
+  erp_framework.highchart.js and erp_framework.chartjs.js respectively
+
 ## [0.7.0]
 
 - Added SlickReportingListView: a Report Class to display content of the model (like a ModelAdmin ChangeList)
diff --git a/README.rst b/README.rst
index e995a9d..d3505a6 100644
--- a/README.rst
+++ b/README.rst
@@ -21,6 +21,7 @@ Django Slick Reporting
 
 A one stop reports engine with batteries included.
 
+This is project is an extract of the reporting engine of `Django ERP Framework <https://github.com/RamezIssac/django-erp-framework>`_
 
 Features
 --------
@@ -28,7 +29,7 @@ Features
 - Effortlessly create Simple, Grouped, Time series and Crosstab reports in a handful of code lines.
 - Create your Custom Calculation easily, which will be integrated with the above reports types
 - Optimized for speed.
-- Batteries included! Chart.js , DataTable.net & a Bootstrap form.
+- Batteries included! Highcharts & Chart.js charting capabilities , DataTable.net & easily customizable Bootstrap form.
 
 Installation
 ------------
diff --git a/slick_reporting/__init__.py b/slick_reporting/__init__.py
index 4b2b010..01bb61f 100644
--- a/slick_reporting/__init__.py
+++ b/slick_reporting/__init__.py
@@ -1,5 +1,5 @@
 default_app_config = "slick_reporting.apps.ReportAppConfig"
 
-VERSION = (0, 7, 0)
+VERSION = (0, 8, 0)
 
-__version__ = "0.7.0"
+__version__ = "0.8.0"
diff --git a/tests/tests.py b/tests/tests.py
index b688f9c..607e307 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -310,7 +310,6 @@ def test_productclientsalesmatrix_no_remainder(self):
         data = report.get_report_data()
         self.assertEqual(data[0]["__total__CT%s" % self.client1.pk], 300)
         self.assertEqual(data[0]["__total__CT%s" % self.client2.pk], 600)
-        # self.assertEqual(data[0]["__total__CT----"], 900)
 
     def test_show_empty_records(self):
         report = report_generators.ClientTotalBalance()