Merge pull request #505 from frePPLe/18.0

Syncing from upstream frePPLe/odoo (18.0)
brain-tec · Feb 19, 2025 · ce61c69 · ce61c69
2 parents bf96bd8 + ae74051
commit ce61c69
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/frepple/models/quote.py b/frepple/models/quote.py
@@ -249,7 +249,7 @@ def action_quote(self):
                         "description": "",
                         "due": due_date_user_tz.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
                         "item": {"name": product_name},
-                        "location": {"name": str(quote.warehouse_id.name)},
+                        "location": {"name": str(quote.warehouse_id.code)},
                         "customer": {"name": "All customers"},
                         "minshipment": quote.minimum_shipment,
                         "maxlateness": quote.maximum_lateness * 86400,

diff --git a/frepple/models/sale_order.py b/frepple/models/sale_order.py
@@ -84,7 +84,7 @@ def action_frepple_quote(self):
             # -----[ BUILD THE REQUEST BODY ]-----
             request_body = {"demands": []}
             for line in sale_order.order_line:
-                if line.product_id.type == "product":
+                if line.product_id.type == "consu":
                     product_name = self.getfrePPLeItemName(
                         line.product_id, use_short_names
                     )
@@ -106,7 +106,7 @@ def action_frepple_quote(self):
                             "description": "",
                             "due": due_date,
                             "item": {"name": product_name},
-                            "location": {"name": sale_order.warehouse_id.name},
+                            "location": {"name": sale_order.warehouse_id.code},
                             "customer": {
                                 "name": "%s %s"
                                 % (