Merge branch 'master' of https://github.com/odoo/odoo

diff --git a/.gitignore b/.gitignore
index 2f01ce2..96cf70e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,69 @@
-# sphinx build directories
-_build/
-
 # dotfiles
 .*
 !.gitignore
-# compiled python files
-*.py[co]
-# setup.py egg_info
-*.egg-info
-# emacs backup files
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.cache
+nosetests.xml
+coverage.xml
+
+# Translations
+*.mo
+*.pot
+
+# Logging stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# editors backup, swap or config files
 *~
+*.swp
+.project
+.pydevproject
+.settings
+.idea/
+
+# Data directory
+/data
+
 # hg stuff
 *.orig
 status
+
 # odoo filestore
 openerp/filestore
-# maintenance migration scripts
-openerp/addons/base/maintenance
 
 # generated for windows installer?
 install/win32/*.bat
@@ -24,10 +71,8 @@ install/win32/meta.py
 
 # various virtualenv
 /bin/
-/build/
-/dist/
 /include/
 /lib/
 /man/
 /share/
-/src/
\ No newline at end of file
+/src/

diff --git a/.gitmodules b/.gitmodules
new file mode 100644 (file)
index 0000000..cb7021f
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "addons/house_booking"]
+       path = addons/house_booking
+       url = https://github.com/inspyration/house_booking.git
+[submodule "addons/website_house_booking"]
+       path = addons/website_house_booking
+       url = https://github.com/inspyration/website_house_booking.git

diff --git a/addons/house_booking b/addons/house_booking
new file mode 160000 (submodule)
index 0000000..e6aae2e
--- /dev/null
+++ b/addons/house_booking
@@ -0,0 +1 @@
+Subproject commit e6aae2e44bb79886efd1d1562112955c00c2beb6

diff --git a/addons/website_house_booking b/addons/website_house_booking
new file mode 160000 (submodule)
index 0000000..b66bf25
--- /dev/null
+++ b/addons/website_house_booking
@@ -0,0 +1 @@
+Subproject commit b66bf2572e319c6eab9b907cd9543a43fc35900c

diff --git a/openerp-wsgi.py b/openerp-wsgi.py
index 4a3f34d..1ad46a1 100644 (file)
--- a/openerp-wsgi.py
+++ b/openerp-wsgi.py
@@ -1,23 +1,27 @@
-# WSGI Handler sample configuration file.
-#
-# Change the appropriate settings below, in order to provide the parameters
-# that would normally be passed in the command-line.
-# (at least conf['addons_path'])
-#
-# For generic wsgi handlers a global application is defined.
-# For uwsgi this should work:
-#   $ uwsgi_python --http :9090 --pythonpath . --wsgi-file openerp-wsgi.py
-#
-# For gunicorn additional globals need to be defined in the Gunicorn section.
-# Then the following command should run:
-#   $ gunicorn openerp:service.wsgi_server.application -c openerp-wsgi.py
+# -*- coding: utf-8 -*-
+
+"""
+WSGI Handler sample configuration file.
+=======================================
+
+Change the appropriate settings below, in order to provide the parameters
+that would normally be passed in the command-line.
+
+* For uwsgi this should work:
+
+    $ uwsgi_python --http :9090 --pythonpath . --wsgi-file openerp-wsgi.py
+
+For gunicorn additional globals need to be defined in the Gunicorn section.
+
+    $ gunicorn openerp:service.wsgi_server.application -c openerp-wsgi.py
+"""
 
 import openerp
 
 #----------------------------------------------------------
 # Common
 #----------------------------------------------------------
-openerp.multi_process = True # Nah!
+openerp.multi_process = True
 
 # Equivalent of --load command-line option
 openerp.conf.server_wide_modules = ['web']
@@ -26,10 +30,14 @@ conf = openerp.tools.config
 # Path to the OpenERP Addons repository (comma-separated for
 # multiple locations)
 
-conf['addons_path'] = '../../addons/trunk,../../web/trunk/addons'
+conf['addons_path'] = '/opt/odoo/addons,/opt/odoo/include/custom/8.0'
+
+#conf['admin_passwd'] = 'TrucSuperCompliquéEtVachementSecret'
 
 # Optional database config if not using local socket
-#conf['db_name'] = 'mycompany'
+#conf['db_name'] = 'TODO'
+#conf['dbfilter'] = 'TODO'
+#conf['list_db'] = 'TODO'
 #conf['db_host'] = 'localhost'
 #conf['db_user'] = 'foo'
 #conf['db_port'] = 5432
@@ -46,10 +54,10 @@ openerp.service.server.load_server_wide_modules()
 # Gunicorn
 #----------------------------------------------------------
 # Standard OpenERP XML-RPC port is 8069
-bind = '127.0.0.1:8069'
-pidfile = '.gunicorn.pid'
-workers = 4
-timeout = 240
-max_requests = 2000
+#bind = '127.0.0.1:8069'
+#pidfile = '.gunicorn.pid'
+#workers = 4
+#timeout = 240
+#max_requests = 2000
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: