[med-svn] [openmolar] 10/17: Merge tag 'upstream/1.0.15-gd81f9e5'

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository openmolar.

commit 8254f469b27cb01c3ac28897e9ff62f660c220ca
Merge: 36a8ff6 f7ad827
Author: Andreas Tille <tille at debian.org>
Date:   Sat Dec 17 18:59:51 2016 +0100

    Merge tag 'upstream/1.0.15-gd81f9e5'
    
    Upstream version 1.0.15-gd81f9e5

 MANIFEST                                           |   15 +-
 PKG-INFO                                           |    2 +-
 src/openmolar/__init__.py                          |   13 +-
 src/openmolar/create_db.py                         |   97 +-
 src/openmolar/dbtools/appointments.py              |   19 +-
 src/openmolar/dbtools/db_settings.py               |    7 +
 .../{settings/version.py => dbtools/locations.py}  |   53 +-
 src/openmolar/dbtools/patient_write_changes.py     |    5 +-
 src/openmolar/dbtools/search.py                    |   75 +-
 src/openmolar/dbtools/writeNewPatient.py           |   61 +-
 src/openmolar/ptModules/patientDetails.py          |    5 +-
 src/openmolar/qt-designer/main.ui                  |  402 +++--
 src/openmolar/qt4gui/contract_gui_module.py        |   21 +-
 .../qt4gui/customwidgets/appointmentwidget.py      |   38 +-
 .../qt4gui/dialogs/advanced_names_dialog.py        |  276 +++
 .../dialogs/advanced_record_management_dialog.py   |    1 +
 src/openmolar/qt4gui/dialogs/base_dialogs.py       |    2 +-
 src/openmolar/qt4gui/dialogs/dialog_collection.py  |    6 +
 src/openmolar/qt4gui/dialogs/first_run_dialog.py   |  500 ++++--
 src/openmolar/qt4gui/dialogs/newCourse.py          |    2 +-
 .../qt4gui/dialogs/patient_location_dialog.py      |  143 ++
 src/openmolar/qt4gui/diary_widget.py               |    5 +
 src/openmolar/qt4gui/forum_widget.py               |   72 +-
 src/openmolar/qt4gui/maingui.py                    |   94 +-
 src/openmolar/qt4gui/schema_updater.py             |    2 +
 src/openmolar/resources/demo_data.sql              |  145 ++
 src/openmolar/resources/hdp.png                    |  Bin 23276 -> 0 bytes
 src/openmolar/resources/hdp_maintenance.png        |  Bin 0 -> 11730 bytes
 .../resources/{schema.sql => minimal_data.sql}     | 1763 +-------------------
 src/openmolar/resources/resources.qrc              |    1 -
 src/openmolar/resources/schema.sql                 |  591 +------
 src/openmolar/resources/triggers.sql               |   94 ++
 src/openmolar/schema_upgrades/schema3_5to3_6.py    |  110 ++
 .../schema3_6to3_7.py}                             |  106 +-
 src/openmolar/settings/fee_tables.py               |   15 +-
 src/openmolar/settings/localsettings.py            |   19 +-
 src/openmolar/settings/version.py                  |    2 +-
 37 files changed, 1996 insertions(+), 2766 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/openmolar.git