Updating from latest 15.0

.github/workflows/integration_test.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   trigger:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Trigger event on frepple repository
         uses: mvasigh/dispatch-action@main

README.md

@@ -1,8 +1,19 @@
-Odoo addon providing 2-way integration with frePPLe advanced planning. 
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+
+Are you still using spreadsheets next to Odoo ?
+Frepple is bringing forecasting, inventory planning and production planning capabilities to Odoo.
+
+This odoo addon provides 2-way integration with frePPLe advanced planning.
+This repository is composed of 3 modules:
+- frepple: This is the core of the connectors to make frepple and odoo exchange data.
+- autologin: This module is optional and used to automatically log a user to an Odoo instance. We use this module in our online Odoo demo instances for a better user experience.
+- freppledata: This module is optional. It is a sample dataset that we load in our online Odoo demo instances.
+
+Note: To connect a frepple instance to an Odoo instance, ONLY THE FREPPLE MODULE SHOULD BE INSTALLED.
 
 Check out:
 
-- high level overview: https://frepple.org/features/odoo-connector/
-- technical documentation: https://frepple.org/docs/current/integration-guide/odoo-connector.html
+- high level overview: https://frepple.com/odoo-integration/
+- technical documentation: https://frepple.com/docs/current/erp-integration/odoo-connector/
 
 

autologin/__manifest__.py

@@ -14,12 +14,15 @@
 module on an actual production environment.
         """,
     "author": "frePPLe",
-    "license": "AGPL-3",
+    "license": "Other OSI approved licence",
     "category": "Uncategorized",
     "version": "15.0.0",
     "depends": ["base", "web"],
     "data": [],
     "demo": [],
     "autoinstall": False,
     "installable": True,
-}
+    "price": 0,
+    "currency": "EUR",
+    "images": ["static/description/images/autologin.png"],
+}

frepple/__init__.py

@@ -2,27 +2,35 @@
 #
 # Copyright (C) 2014 by frePPLe bv
 #
-# This library is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License as published
-# by the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
 #
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero
-# General Public License for more details.
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
 #
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
 import os
 import pathlib
 
-with open(
-    os.path.join(pathlib.Path(__file__).parent.resolve(), "__manifest__.py"), "r"
-) as f:
-    with_mrp = "mrp" in eval(f.read())["depends"]
+# commenting below section as causing loops in import
+
+# with open(
+#     os.path.join(pathlib.Path(__file__).parent.resolve(), "__manifest__.py"), "r"
+# ) as f:
+#     with_mrp = "mrp" in eval(f.read())["depends"]
 
 from . import models
 from . import controllers

frepple/__manifest__.py

@@ -6,7 +6,7 @@
     "summary": "Advanced planning and scheduling",
     "author": "frePPLe",
     "website": "https://frepple.com",
-    "license": "AGPL-3",
+    "license": "Other OSI approved licence",
     "description": "Connector to frePPLe - finite capacity planning and scheduling",
     "external_dependencies": {"python": ["jwt"]},
     # Option 1: for manufacturing companies using MRP module
@@ -17,9 +17,12 @@
         "views/frepple_data.xml",
         "views/res_config_settings_views.xml",
         "views/mrp_skill.xml",
-        "views/mrp_workcenter_inherit.xml",
         "views/mrp_workcenter_skill.xml",
+        "views/mrp_workcenter_inherit.xml",
+        "views/mrp_secondary_workcenter.xml",
         "views/mrp_routing_workcenter_inherit.xml",
+        "views/mrp_workorder_inherit.xml",
+        "views/mrp_workorder_secondary_workcenter.xml",
         "views/product_supplierinfo_inherit.xml",
     ],
     # Option 2: for distribution companies not using the MRP module
@@ -39,4 +42,7 @@
             "frepple/static/src/js/frepple.js",
         ],
     },
+    "price": 0,
+    "currency": "EUR",
+    "images": ["static/description/images/frepple_animation.gif"],
 }

frepple/controllers/__init__.py

@@ -2,17 +2,23 @@
 #
 # Copyright (C) 2014 by frePPLe bv
 #
-# This library is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License as published
-# by the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
 #
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero
-# General Public License for more details.
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
 #
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 from . import frepplexml

frepple/controllers/frepplexml.py

@@ -2,31 +2,38 @@
 #
 # Copyright (C) 2014-2016 by frePPLe bv
 #
-# This library is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License as published
-# by the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
 #
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero
-# General Public License for more details.
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
 #
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
 import base64
 import logging
 import odoo
 import os
+from pathlib import Path
 import traceback
 from tempfile import NamedTemporaryFile
 from werkzeug.exceptions import MethodNotAllowed, InternalServerError
 from werkzeug.wrappers import Response
 
+from odoo import http
 from odoo.addons.web.controllers.main import db_monodb, ensure_db
-
 from odoo.addons.frepple.controllers.outbound import exporter, Odoo_generator
 from odoo.addons.frepple.controllers.inbound import importer
 
@@ -108,15 +115,18 @@ def xml(self, **kwargs):
                     version.append(v)
         language = kwargs.get("language", req.httprequest.form.get("language", None))
         database = kwargs.get("database", req.httprequest.form.get("database", None))
+        if not database:
+            database = odoo.http.db_monodb(httprequest=req.httprequest)
         company_name = kwargs.get("company", req.httprequest.form.get("company", None))
         company = None
-        if company_name:
+        if company_name and req.env:
             for i in req.env["res.company"].search(
                 [("name", "=", company_name)], limit=1
             ):
                 company = i
             if not company:
                 return Response("Invalid company name argument", 401)
+        apps = kwargs.get("apps", req.httprequest.form.get("apps", None)) or ""
 
         # Login
         req.session.db = database
@@ -144,24 +154,36 @@ def xml(self, **kwargs):
                     singlecompany=kwargs.get("singlecompany", "false").lower()
                     == "true",
                     version=version,
+                    delta=float(kwargs.get("delta", 999)),
+                    apps=apps,
                 )
-                try:
-                    tmpfile = NamedTemporaryFile(mode="w+t", delete=False)
+                # last empty double quote is to let python understand frepple is a folder.
+                xml_folder = os.path.join(str(Path.home()), "logs", "frepple", "")
+                os.makedirs(os.path.dirname(xml_folder), exist_ok=True)
+
+                # delete any old xml file in that folder
+                for file_name in os.listdir(xml_folder):
+                    # construct full file path
+                    file = xml_folder + file_name
+                    if os.path.isfile(file):
+                        os.remove(file)
+
+                with NamedTemporaryFile(
+                    mode="w+t", delete=False, dir=xml_folder
+                ) as tmpfile:
                     for i in xp.run():
                         tmpfile.write(i)
-                    tmpfile.close()
-                    data = open(tmpfile.name).read()
-                finally:
-                    os.unlink(tmpfile.name)
-                return req.make_response(
-                    data,
-                    headers=[
-                        ("Content-Type", "application/xml;charset=utf8"),
-                        ("Cache-Control", "no-cache, no-store, must-revalidate"),
-                        ("Pragma", "no-cache"),
-                        ("Expires", "0"),
-                    ],
+                    filename = tmpfile.name
+
+                res = http.send_file(
+                    filename,
+                    mimetype="application/xml;charset=utf8",
+                    as_attachment=False,
                 )
+                res.headers["Cache-Control"] = "no-cache, no-store, must-revalidate"
+                res.headers["Pragma"] = "no-cache"
+                res.headers["Expires"] = "0"
+                return res
             except Exception as e:
                 logger.exception("Error generating frePPLe XML data")
                 raise InternalServerError(
@@ -193,5 +215,10 @@ def xml(self, **kwargs):
             except Exception as e:
                 logger.exception("Error processing data posted by frePPLe")
                 raise InternalServerError(
-                    description="Error processing data posted by frePPLe: check the Odoo log file for more details"
+                    description="Error processing data posted by frePPLe:<br>%s"
+                    % (
+                        traceback.format_exc()
+                        if company and company.disclose_stack_trace
+                        else e
+                    )
                 )