fix: honor delta from query param

frePPLe · May 25, 2024 · 6daf918 · 6daf918
1 parent 1a00328
commit 6daf918
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/frepple/controllers/frepplexml.py b/frepple/controllers/frepplexml.py
@@ -150,6 +150,7 @@ def xml(self, **kwargs):
                     company=company_name,
                     mode=int(kwargs.get("mode", 1)),
                     timezone=kwargs.get("timezone", None),
+                    delta=int(kwargs.get("delta", 999)),
                     singlecompany=kwargs.get("singlecompany", "false").lower()
                     == "true",
                     version=version,

diff --git a/frepple/controllers/outbound.py b/frepple/controllers/outbound.py
@@ -1425,12 +1425,13 @@ def export_salesorders(self):
         """
         # Get all sales order lines
         search = (
-            [("product_id", "!=", False)]
+            [("product_id", "!=", False), ("order_id.active", "!=", False)]
             if self.delta >= 999
             else [
                 ("product_id", "!=", False),
+                ("order_id.active", "!=", False),
                 (
-                    "write_date",
+                    "order_id.date_order",
                     ">=",
                     datetime.now() - timedelta(days=self.delta),
                 ),