diff --git a/flectra/release.py b/flectra/release.py index 531adacdb1..6b7400dae3 100644 --- a/flectra/release.py +++ b/flectra/release.py @@ -30,7 +30,7 @@ License :: OSI Approved :: GNU Lesser General Public License v3 Programming Language :: Python """ url = 'https://www.flectrahq.com' -author = 'FlectraHQ, OpenERP S.A.' +author = 'FlectraHQ' author_email = 'info@flectrahq.com' license = 'LGPL-3' diff --git a/setup/win32/Makefile.python b/setup/win32/Makefile.python index 84e766c5c9..1ed2be9a67 100644 --- a/setup/win32/Makefile.python +++ b/setup/win32/Makefile.python @@ -1 +1 @@ -PYTHON_VERSION=27 +PYTHON_VERSION=3.7.7 diff --git a/setup/win32/Makefile.servicename b/setup/win32/Makefile.servicename index bf47e07d73..9b71d821dc 100644 --- a/setup/win32/Makefile.servicename +++ b/setup/win32/Makefile.servicename @@ -1 +1 @@ -SERVICENAME= \ No newline at end of file +SERVICENAME=flectra-server-2.0 diff --git a/setup/win32/Makefile.version b/setup/win32/Makefile.version index e278258465..8a5b1077b9 100644 --- a/setup/win32/Makefile.version +++ b/setup/win32/Makefile.version @@ -1 +1 @@ -VERSION= +VERSION=2.0.20220701 diff --git a/setup/win32/setup.nsi b/setup/win32/setup.nsi index 62cbeb47f2..10a18fb4f6 100644 --- a/setup/win32/setup.nsi +++ b/setup/win32/setup.nsi @@ -59,7 +59,7 @@ Unicode True !endif !ifndef PYTHONVERSION - !define PYTHONVERSION '3.7.4' + !define PYTHONVERSION '3.8.3' !endif !ifndef SERVICENAME @@ -485,5 +485,5 @@ Function ComponentLeave FunctionEnd Function LaunchLink - ExecShell "open" "http://localhost:8069/" + ExecShell "open" "http://localhost:7073/" FunctionEnd diff --git a/setup/win32/static/getfiles.sh b/setup/win32/static/getfiles.sh index 42f236fd59..ae4c148c5c 100644 --- a/setup/win32/static/getfiles.sh +++ b/setup/win32/static/getfiles.sh @@ -13,7 +13,7 @@ trap cleanup EXIT wget -q http://get.enterprisedb.com/postgresql/postgresql-9.5.4-2-windows.exe # wkhtmltopdf -wget -q -P $TEMPDIR http://download.gna.org/wkhtmltopdf/0.12/0.12.1/wkhtmltox-0.12.1.2_msvc2013-win32.exe +wget -q -P $TEMPDIR https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.1/wkhtmltox-0.12.1.2_msvc2013-win32.exe 7z x -o$TEMPDIR $TEMPDIR/wkhtmltox-0.12.1.2_msvc2013-win32.exe cp $TEMPDIR/bin/wkhtmltopdf.exe ./wkhtmltopdf diff --git a/setup/win32/static/pixmaps/flectra-icon.ico b/setup/win32/static/pixmaps/flectra-icon.ico index 1bb1c89905..ec39d4dd53 100644 Binary files a/setup/win32/static/pixmaps/flectra-icon.ico and b/setup/win32/static/pixmaps/flectra-icon.ico differ diff --git a/setup/win32/static/pixmaps/flectra-intro.bmp b/setup/win32/static/pixmaps/flectra-intro.bmp index 92de71c1ce..b924d81c20 100644 Binary files a/setup/win32/static/pixmaps/flectra-intro.bmp and b/setup/win32/static/pixmaps/flectra-intro.bmp differ diff --git a/setup/win32/static/pixmaps/flectra-slogan.bmp b/setup/win32/static/pixmaps/flectra-slogan.bmp index eab825249c..ea9850f6bc 100644 Binary files a/setup/win32/static/pixmaps/flectra-slogan.bmp and b/setup/win32/static/pixmaps/flectra-slogan.bmp differ