squashed merge of the prep-8.0 branch

frePPLe · Apr 15, 2023 · b4dfc5a · b4dfc5a
1 parent 086b1e5
commit b4dfc5a
Show file tree

Hide file tree

Showing 456 changed files with 113,038 additions and 4,811 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -121,3 +121,13 @@ FrePPLe redistributes parts of the following third party software components:
     Redistributed angular-websocket.min.js
     Licensed under the MIT license
     See https://github.com/AngularClass/angular-websocket
+
+* src/forecast/exprtk.h
+    Free use of the C++ Mathematical Expression Toolkit Library is
+    permitted under the guidelines and in accordance with the most
+    current version of the MIT License.
+    See http://www.partow.net/programming/exprtk/index.html
+
+* include\rapidjson\*
+    Redistributed http://rapidjson.org/
+    Licensed under the MIT license
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -161,6 +161,33 @@ if(NOT ${HAVE_XERCESC})
   message(FATAL_ERROR "xerces-c include headers not found")
 endif()
 
+find_program(pg_config NAMES pg_config)
+
+if(pg_config)
+  execute_process(
+    COMMAND ${pg_config} --libdir
+    OUTPUT_VARIABLE POSTGRES_LIB
+    ERROR_QUIET
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  execute_process(
+    COMMAND ${pg_config} --includedir
+    OUTPUT_VARIABLE POSTGRES_INCLUDE
+    ERROR_QUIET
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  link_directories("${POSTGRES_LIB}")
+  include_directories(${POSTGRES_INCLUDE})
+  list(APPEND CMAKE_REQUIRED_INCLUDES "${POSTGRES_INCLUDE}")
+  check_include_file("libpq-fe.h" HAVE_LIBPQ)
+
+  if(NOT HAVE_LIBPQ)
+    message("PostgreSQL include headers not found ${HAVE_LIBPQ}")
+  endif()
+else()
+  message(FATAL_ERROR "PostgreSQL pg_config not found")
+endif()
+
 # C++ header file locations
 include_directories(
   "${CMAKE_SOURCE_DIR}/include"

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

diff --git a/README.md b/README.md
@@ -25,8 +25,7 @@ Visit [https://frepple.com](https://frepple.com) for documentation, screencasts
 
 ## License
 
-The *Community Edition* is released under the [GNU Affero General
-Public License v3 or later](http://www.gnu.org/licenses/).
+The *Community Edition* is released under the [MIT licence](https://opensource.org/license/mit/).
 
 The *Enterprise Edition* can be purchased from frePPLe bv. It provides additional functionality
 and professional support.

diff --git a/bin/frepple.xsd b/bin/frepple.xsd
@@ -1,19 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2007-2013 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.
-
- 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.
-
- 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/>.
+Copyright (C) 2007-2013 by frePPLe bv
+
+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:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+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.
 -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified" attributeFormDefault="unqualified">
 
@@ -1159,6 +1165,85 @@
     </xsd:sequence>
   </xsd:complexType>
 
+  <xsd:simpleType name="positiveInt">
+    <xsd:restriction base="xsd:int">
+      <xsd:minInclusive value="0" />
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <!-- FORECAST -->
+  <xsd:complexType name="demand_forecast">
+    <xsd:complexContent>
+      <xsd:extension base="demand">
+        <xsd:choice minOccurs="0" maxOccurs="unbounded">
+          <xsd:element name="calendar" type="calendar" />
+          <xsd:element name="horizon_future" type="positiveInt" />
+          <xsd:element name="horizon_history" type="positiveInt" />
+          <xsd:element name="forecast_partition" type="xsd:integer" />
+          <xsd:element name="discrete" type="xsd:boolean" />
+          <xsd:element name="planned" type="xsd:boolean" />
+          <xsd:element name="methods" type="xsd:string" />
+          <xsd:element name="buckets" type="demand_forecastbucketlist" />
+        </xsd:choice>
+        <xsd:attribute name="discrete" type="xsd:boolean" />
+        <xsd:attribute name="planned" type="xsd:boolean" />
+        <xsd:attribute name="methods" type="xsd:string" />
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+
+  <xsd:complexType name="demand_forecastbucket">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:normalizedString" minOccurs="0" />
+      <xsd:element name="forecasttotal" type="positiveDouble" minOccurs="0" />
+      <xsd:element name="forecasttotalvalue" type="positiveDouble" minOccurs="0" />
+      <xsd:element name="forecastconsumed" type="positiveDouble" minOccurs="0" />
+      <xsd:element name="forecastconsumedvalue" type="positiveDouble" minOccurs="0" />
+      <xsd:element name="forecastbaseline" type="positiveDouble" minOccurs="0" />
+      <xsd:element name="forecastbaselinevalue" type="positiveDouble" minOccurs="0" />
+      <xsd:element name="forecastoverride" type="positiveDouble" minOccurs="0" />
+      <xsd:element name="forecastoverridevalue" type="positiveDouble" minOccurs="0" />
+      <xsd:element name="forecastplanned" type="positiveDouble" minOccurs="0" />
+      <xsd:element name="forecastplannedvalue" type="positiveDouble" minOccurs="0" />
+      <xsd:element name="ordersopen" type="positiveDouble" minOccurs="0" />
+      <xsd:element name="ordersopenvalue" type="positiveDouble" minOccurs="0" />
+      <xsd:element name="orderstotal" type="positiveDouble" minOccurs="0" />
+      <xsd:element name="orderstotalvalue" type="positiveDouble" minOccurs="0" />
+      <xsd:element name="ordersadjustment" type="positiveDouble" minOccurs="0" />
+      <xsd:element name="ordersadjustmentvalue" type="positiveDouble" minOccurs="0" />
+      <xsd:element name="ordersplanned" type="positiveDouble" minOccurs="0" />
+      <xsd:element name="ordersplannedvalue" type="positiveDouble" minOccurs="0" />
+      <xsd:element name="quantity" type="positiveDouble" minOccurs="0" />
+      <xsd:element name="start" type="xsd:dateTime" minOccurs="0" />
+      <xsd:element name="end" type="xsd:dateTime" minOccurs="0" />
+    </xsd:choice>
+    <xsd:attribute name="name" type="xsd:normalizedString" />
+    <xsd:attribute name="forecasttotal" type="positiveDouble" />
+    <xsd:attribute name="forecasttotalvalue" type="positiveDouble" />
+    <xsd:attribute name="forecastconsumed" type="positiveDouble" />
+    <xsd:attribute name="forecastconsumedvalue" type="positiveDouble" />
+    <xsd:attribute name="forecastbaseline" type="positiveDouble" />
+    <xsd:attribute name="forecastbaselinevalue" type="positiveDouble" />
+    <xsd:attribute name="forecastoverride" type="positiveDouble" />
+    <xsd:attribute name="forecastoverridevalue" type="positiveDouble" />
+    <xsd:attribute name="ordersopen" type="positiveDouble" />
+    <xsd:attribute name="ordersopenvalue" type="positiveDouble" />
+    <xsd:attribute name="orderstotal" type="positiveDouble" />
+    <xsd:attribute name="orderstotalvalue" type="positiveDouble" />
+    <xsd:attribute name="ordersadjustment" type="positiveDouble" />
+    <xsd:attribute name="ordersadjustmentvalue" type="positiveDouble" />
+    <xsd:attribute name="quantity" type="positiveDouble" />
+    <xsd:attribute name="consumed" type="positiveDouble" />
+    <xsd:attribute name="start" type="xsd:dateTime" />
+    <xsd:attribute name="end" type="xsd:dateTime" />
+  </xsd:complexType>
+
+  <xsd:complexType name="demand_forecastbucketlist">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="bucket" type="demand_forecastbucket" />
+    </xsd:choice>
+  </xsd:complexType>
+
   <!-- Define the root element and its contents. -->
   <xsd:element name="plan">
     <xsd:annotation>

diff --git a/contrib/docker/debian-10.dockerfile b/contrib/docker/debian-10.dockerfile
@@ -1,17 +1,24 @@
 #
 # Copyright (C) 2020 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
+# 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.
 #
 
 #

diff --git a/contrib/docker/opensuse-15.1.dockerfile b/contrib/docker/opensuse-15.1.dockerfile
@@ -1,18 +1,24 @@
 #
 # Copyright (C) 2018-2019 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.
 #
 
 #
@@ -24,9 +30,9 @@ FROM opensuse/leap:15.1 as builder
 RUN zypper refresh && \
   zypper --non-interactive update && \
   zypper --non-interactive install --force-resolution --replacefiles \
-    libxerces-c-3_1 httpd python3 python3-pip gcc rpmbuild \
-    libxerces-c-devel openssl cmake python3-devel gcc-c++ gcc tar gzip \
-    libpq5 postgresql-devel postgresql openssl-devel && \
+  libxerces-c-3_1 httpd python3 python3-pip gcc rpmbuild \
+  libxerces-c-devel openssl cmake python3-devel gcc-c++ gcc tar gzip \
+  libpq5 postgresql-devel postgresql openssl-devel && \
   pip3 install sphinx && \
   zypper clean
 

diff --git a/contrib/docker/rhel-8.dockerfile b/contrib/docker/rhel-8.dockerfile
@@ -1,17 +1,24 @@
 #
 # Copyright (C) 2019 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
+# 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.
 #
 
 #