prepare pr to master

.gitignore

@@ -21,8 +21,9 @@ pip-log.txt
 .tox
 *~
 
-# VS Code
+# IntelliJ
+*.iml
+/.idea/
+
+#VSCODE
 .vscode
-projectsettings/media/uploads
-projectsettings/media/data_files
-projectsettings/media/tmp

.travis.yml

@@ -2,6 +2,12 @@ language: python
 python:
 - '3.4'
 
+before_install:
+  - wget https://github.com/mozilla/geckodriver/releases/download/v0.20.1/geckodriver-v0.20.1-linux64.tar.gz
+  - mkdir geckodriver
+  - tar -xzf geckodriver*.tar.gz -C geckodriver
+  - export PATH=$PATH:$PWD/geckodriver
+
 install:
   - python setup.py install
   - pip install -r requirements/heroku_requirements.txt

Dockerfile

@@ -1,14 +1,13 @@
 FROM python:3.6
 
-RUN mkdir /app
 WORKDIR /app
 
 # Intall dependencies
 COPY /requirements/development_requirements.txt /app/
 COPY /requirements/base_requirements.txt /app/
 
-RUN pip install -r development_requirements.txt
 COPY . /app
 
 RUN chmod +x /app/entrypoint.sh
 ENTRYPOINT ["/app/entrypoint.sh"]
+

Dockerfile.prod

@@ -1,17 +1,12 @@
 FROM python:3.6
 
-RUN mkdir /app
 WORKDIR /app
 
 # Intall dependencies
-COPY /requirements/development_requirements.txt /app/
 COPY /requirements/base_requirements.txt /app/
 
-RUN pip install -r development_requirements.txt
 COPY . /app
 
-# Add uWSGI config
-ADD ./projectsettings/services/django-uwsgi.ini /etc/uwsgi/django-uwsgi.ini
+RUN chmod +x /app/entrypoint.prod.sh
+ENTRYPOINT ["/app/entrypoint.prod.sh"]
 
-RUN chmod +x /app/entrypoint.sh
-ENTRYPOINT ["/app/entrypoint.sh"]

LICENSE

@@ -1,13 +1,29 @@
-This software is published under the BSD license as listed below.
+BSD 3-Clause License
 
-Copyright © 2009-2018 Aaron Riedener, Untereggen, Switzerland
+Copyright (c) 2009-2018, Aaron Riedener, Untereggen, Switzerland
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-    * Neither the name of Aaron Riedener nor the names of the contributors to koalixcrm may be used to endorse or promote products derived from this software without specific prior written permission. 
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
 
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

docker-compose.prod.yml

@@ -1,39 +1,14 @@
-version: '3'
+version: '2.0'
 
-services:  
+services:
   db:
     image: postgres
-    volumes:
-      - pgdata:/var/lib/postgresql/data
-  koalixcrm:    
-    build: .    
-    volumes:
-      - .:/app/
-      - static-files:/app/projectsettings/static
-      - media-files:/app/projectsettings/media
-    expose:
-      - "8000"
-    depends_on:
-      - db
-    env_file:
-      - ./projectsettings/environment/development.env
-  webserver:
-    build:
-      context: .
-      dockerfile: ./projectsettings/services/webserver/Dockerfile
-    volumes:         
-      - static-files:/app/projectsettings/static
-      - media-files:/app/projectsettings/media
+  koalixcrm:
+    image: koalixswitzerland/koalixcrm:1.12.dev20180210
+    environment:
+      - DJANGO_SETTINGS_MODULE=projectsettings.settings.production_settings
+      - JAVA_HOME=/usr/bin/jdk1.8.0_162/jre
     ports:
-      - "80:80"
-      - "443:443"
+      - "8000:8000"
     depends_on:
-      - koalixcrm    
-    env_file:
-      - ./projectsettings/environment/development.env 
-
-volumes:
-  .:
-  static-files:
-  media-files:
-  pgdata:
+      - db

docker-compose.yml

@@ -1,21 +1,14 @@
-version: '3'
+version: '2.0'
 
-services:  
+services:
   db:
     image: postgres
-    volumes:
-      - pgdata:/var/lib/postgresql/data
-  koalixcrm:    
-    build: .    
-    volumes:
-      - .:/app/      
+  koalixcrm:
+    build: .
+    environment:
+      - DJANGO_SETTINGS_MODULE=projectsettings.settings.development_settings
+      - JAVA_HOME=/usr/bin/jdk1.8.0_162/jre
     ports:
       - "8000:8000"
     depends_on:
-      - db
-    env_file:
-      - ./projectsettings/environment/development.env
-
-volumes:
-  .:  
-  pgdata:
+      - db

documentation/source/architecture.rst

@@ -0,0 +1,14 @@
+.. highlight:: rst
+
+Architecture
+========
+
+Standard installation with docker, postgres
+-------------------------------------------
+.. image:: /images/koalixcrm_architecture_django_webserver.png
+
+Standard installation with docker, postgres and apache2
+-------------------------------------------------------
+.. image:: /images/koalixcrm_architecture_dedicated_webserver.png
+
+

documentation/source/crm.rst

@@ -6,12 +6,21 @@ CRM
 Introduction
 ------------
 
-Objecttypes
------------
+Products
+--------
 
-Contract
+Contact
+--------
+
+Customer
 ^^^^^^^^
 
+Documents
+---------
+
+Sales Contract
+^^^^^^^^^^^^^^
+
 Purchase Order
 ^^^^^^^^^^^^^^
 
@@ -21,12 +30,8 @@ Invoice
 Quote
 ^^^^^
 
-Customer
-^^^^^^^^
+Reporting
+---------
 
-Distributors
-^^^^^^^^^^^^
 
-Suppliers
-^^^^^^^^^
 

documentation/source/customisation.rst

@@ -42,7 +42,7 @@ After you finised translating the whole file test your translation by compiling
 
   django-admin compilemessages 
 
-After this you are able to use your translation. Sometimes seting your language in ``/var/www/koalixcrm/settings.py`` is required.
+After this you are able to use your translation. Sometimes setting your language in ``/var/www/koalixcrm/settings.py`` is required.
 Go on with your translation for accounting and for djangouserextention folders.
 As soon as you finish this part you will be able to work with koalixcrm in your own language. But there is still something missing: the templatefiles for pdf creation have to be translated as well.