From a54653f93782a6d7088b0cc919e9b17f1a72a383 Mon Sep 17 00:00:00 2001
From: Kilian Saffran <ksaffran@dks.lu>
Date: Fri, 5 Jul 2019 18:22:46 +0200
Subject: [PATCH] auto commit on 2019-07-05 18:22

---
 index.html                                    |   16 +-
 main.js                                       |   14 +-
 modules/accounting/accounting.html            |  192 ---
 modules/accounting/accounting.xul             |   26 -
 modules/accounting/accountingchild.html       |  189 ---
 modules/accounting/accountingopeninvoice.html |  154 ---
 modules/accounting/accountingyear.html        |   69 -
 modules/accounting/checkservice.html          |  110 --
 modules/accounting/img/accounting.png         |  Bin 1141 -> 0 bytes
 modules/accounting/js/accounting.js           |  740 -----------
 modules/accounting/js/accountingchild.js      |  633 ---------
 .../accounting/js/accountingopeninvoice.js    |  284 ----
 modules/accounting/js/accountingyear.js       |  501 -------
 modules/accounting/js/checkservice.js         |  137 --
 modules/dashboard/index.js                    |   17 -
 modules/forms/forms.html                      |  106 --
 modules/forms/forms.xul                       |    8 -
 modules/forms/img/doc.png                     |  Bin 761 -> 0 bytes
 modules/forms/img/form.png                    |  Bin 333 -> 0 bytes
 modules/forms/js/forms.js                     |   93 --
 modules/logbook/img/logbook.png               |  Bin 466 -> 0 bytes
 modules/logbook/js/logactivity.js             |  326 -----
 modules/logbook/js/logactivity_basic.js       |  282 ----
 modules/logbook/js/logchild.js                |  359 -----
 modules/logbook/js/logcominterne.js           |  328 -----
 modules/logbook/js/logcominterne_basic.js     |  296 -----
 modules/logbook/js/logstaff.js                |    1 -
 modules/logbook/logactivity.html              |  165 ---
 modules/logbook/logactivity_basic.html        |  125 --
 modules/logbook/logbook.xul                   |   19 -
 modules/logbook/logbook_basic.xul             |   18 -
 modules/logbook/logchild.html                 |  126 --
 modules/logbook/logcominterne.html            |  165 ---
 modules/logbook/logcominterne_basic.html      |  163 ---
 .../logstaff.html => persons/index.html}      |    0
 modules/persons/index.js                      |    0
 modules/reports/css/print.css                 |  138 --
 modules/reports/dlg/dlgpdfviewer.xul          |   42 -
 modules/reports/dlg/dlgprint.xul              |  164 ---
 modules/reports/img/logoprint.png             |  Bin 8121 -> 0 bytes
 modules/reports/img/print.png                 |  Bin 559 -> 0 bytes
 modules/reports/img/save.png                  |  Bin 597 -> 0 bytes
 modules/reports/img/settings.png              |  Bin 796 -> 0 bytes
 modules/reports/js/print.js                   |   64 -
 modules/reports/js/print_book.js              |   41 -
 modules/reports/js/print_calendar.js          |   35 -
 modules/reports/js/print_child.js             |  155 ---
 modules/reports/js/print_loaddata.js          |   67 -
 modules/reports/js/print_logchild.js          |   45 -
 modules/reports/js/print_multilist.js         |   75 --
 modules/reports/js/print_table.js             |   92 --
 modules/reports/js/printpdf.js                |   85 --
 modules/reports/js/printutils.js              |   41 -
 modules/reports/print_book.html               |   43 -
 modules/reports/print_calendar.html           |   53 -
 modules/reports/print_child.html              |  134 --
 modules/reports/print_list.html               |   69 -
 modules/reports/print_logchild.html           |   44 -
 modules/reports/print_multilist.html          |   63 -
 modules/reports/print_table.html              |   45 -
 modules/reports/reports.xul                   |   10 -
 modules/{settings => settings.old}/db.html    |    0
 .../{settings => settings.old}/dbconfig.js    |    0
 .../{dashboard => settings.old}/index.html    |   27 +-
 modules/settings.old/index.js                 |    7 +
 .../js/multisite_reader.js                    |    0
 .../{settings => settings.old}/multisite.xul  |    0
 .../support/js/multisite.js                   |    0
 .../support/js/update.js                      |    0
 .../support/multisite.html                    |    0
 .../support/support.xul                       |    0
 .../support/update.html                       |    0
 modules/settings/form_datastore.html          |  135 ++
 modules/settings/form_datastore.js            |   14 +
 modules/settings/index.html                   |  119 +-
 modules/settings/index.js                     |   72 +-
 modules/settings/lib/datastore.js             |   46 +
 modules/staff/coworker.html                   |  610 ---------
 modules/staff/coworker_basic.html             |  332 -----
 modules/staff/img/staff.png                   |  Bin 597 -> 0 bytes
 modules/staff/js/coworker.js                  | 1150 -----------------
 modules/staff/js/coworker_basic.js            |  827 ------------
 modules/staff/js/staff.js                     |  120 --
 modules/staff/js/staff_basic.js               |  122 --
 modules/staff/staff.html                      |   69 -
 modules/staff/staff.xul                       |    8 -
 modules/staff/staff_basic.html                |   77 --
 modules/staff/staff_basic.xul                 |    8 -
 modules/waitlist/waitlist.html                |  130 --
 modules/waitlist/waitlist.js                  |  206 ---
 renderer.js                                   |   71 +
 91 files changed, 432 insertions(+), 10885 deletions(-)
 delete mode 100644 modules/accounting/accounting.html
 delete mode 100644 modules/accounting/accounting.xul
 delete mode 100644 modules/accounting/accountingchild.html
 delete mode 100644 modules/accounting/accountingopeninvoice.html
 delete mode 100644 modules/accounting/accountingyear.html
 delete mode 100644 modules/accounting/checkservice.html
 delete mode 100644 modules/accounting/img/accounting.png
 delete mode 100644 modules/accounting/js/accounting.js
 delete mode 100644 modules/accounting/js/accountingchild.js
 delete mode 100644 modules/accounting/js/accountingopeninvoice.js
 delete mode 100644 modules/accounting/js/accountingyear.js
 delete mode 100644 modules/accounting/js/checkservice.js
 delete mode 100644 modules/dashboard/index.js
 delete mode 100644 modules/forms/forms.html
 delete mode 100644 modules/forms/forms.xul
 delete mode 100644 modules/forms/img/doc.png
 delete mode 100644 modules/forms/img/form.png
 delete mode 100644 modules/forms/js/forms.js
 delete mode 100644 modules/logbook/img/logbook.png
 delete mode 100644 modules/logbook/js/logactivity.js
 delete mode 100644 modules/logbook/js/logactivity_basic.js
 delete mode 100644 modules/logbook/js/logchild.js
 delete mode 100644 modules/logbook/js/logcominterne.js
 delete mode 100644 modules/logbook/js/logcominterne_basic.js
 delete mode 100644 modules/logbook/js/logstaff.js
 delete mode 100644 modules/logbook/logactivity.html
 delete mode 100644 modules/logbook/logactivity_basic.html
 delete mode 100644 modules/logbook/logbook.xul
 delete mode 100644 modules/logbook/logbook_basic.xul
 delete mode 100644 modules/logbook/logchild.html
 delete mode 100644 modules/logbook/logcominterne.html
 delete mode 100644 modules/logbook/logcominterne_basic.html
 rename modules/{logbook/logstaff.html => persons/index.html} (100%)
 create mode 100644 modules/persons/index.js
 delete mode 100644 modules/reports/css/print.css
 delete mode 100644 modules/reports/dlg/dlgpdfviewer.xul
 delete mode 100644 modules/reports/dlg/dlgprint.xul
 delete mode 100644 modules/reports/img/logoprint.png
 delete mode 100644 modules/reports/img/print.png
 delete mode 100644 modules/reports/img/save.png
 delete mode 100644 modules/reports/img/settings.png
 delete mode 100644 modules/reports/js/print.js
 delete mode 100644 modules/reports/js/print_book.js
 delete mode 100644 modules/reports/js/print_calendar.js
 delete mode 100644 modules/reports/js/print_child.js
 delete mode 100644 modules/reports/js/print_loaddata.js
 delete mode 100644 modules/reports/js/print_logchild.js
 delete mode 100644 modules/reports/js/print_multilist.js
 delete mode 100644 modules/reports/js/print_table.js
 delete mode 100644 modules/reports/js/printpdf.js
 delete mode 100644 modules/reports/js/printutils.js
 delete mode 100644 modules/reports/print_book.html
 delete mode 100644 modules/reports/print_calendar.html
 delete mode 100644 modules/reports/print_child.html
 delete mode 100644 modules/reports/print_list.html
 delete mode 100644 modules/reports/print_logchild.html
 delete mode 100644 modules/reports/print_multilist.html
 delete mode 100644 modules/reports/print_table.html
 delete mode 100644 modules/reports/reports.xul
 rename modules/{settings => settings.old}/db.html (100%)
 rename modules/{settings => settings.old}/dbconfig.js (100%)
 rename modules/{dashboard => settings.old}/index.html (58%)
 create mode 100644 modules/settings.old/index.js
 rename modules/{settings => settings.old}/js/multisite_reader.js (100%)
 rename modules/{settings => settings.old}/multisite.xul (100%)
 rename modules/{settings => settings.old}/support/js/multisite.js (100%)
 rename modules/{settings => settings.old}/support/js/update.js (100%)
 rename modules/{settings => settings.old}/support/multisite.html (100%)
 rename modules/{settings => settings.old}/support/support.xul (100%)
 rename modules/{settings => settings.old}/support/update.html (100%)
 create mode 100644 modules/settings/form_datastore.html
 create mode 100644 modules/settings/form_datastore.js
 create mode 100644 modules/settings/lib/datastore.js
 delete mode 100644 modules/staff/coworker.html
 delete mode 100644 modules/staff/coworker_basic.html
 delete mode 100644 modules/staff/img/staff.png
 delete mode 100644 modules/staff/js/coworker.js
 delete mode 100644 modules/staff/js/coworker_basic.js
 delete mode 100644 modules/staff/js/staff.js
 delete mode 100644 modules/staff/js/staff_basic.js
 delete mode 100644 modules/staff/staff.html
 delete mode 100644 modules/staff/staff.xul
 delete mode 100644 modules/staff/staff_basic.html
 delete mode 100644 modules/staff/staff_basic.xul
 delete mode 100644 modules/waitlist/waitlist.html
 delete mode 100644 modules/waitlist/waitlist.js
 create mode 100644 renderer.js

diff --git a/index.html b/index.html
index 73159b2..4466421 100644
--- a/index.html
+++ b/index.html
@@ -18,17 +18,17 @@
             <div class="bg-dark border-right" id="sidebar-wrapper">
               <div class="sidebar-heading"><a href="javascript:location.href='index.html';"><img src="img/creorga.png" style="width: 140px;"><br/>Creorga</a></div>
               <div class="list-group list-group-flush">
-                    <a  class="list-group-item list-group-item-action bg-light" href="javascript:userapp.loadmodule('dashboard');">Dashboard</a>
+                    <!-- <a  class="list-group-item list-group-item-action bg-light" href="javascript:userapp.loadmodule('dashboard');">Dashboard</a> -->
                     <a  class="list-group-item list-group-item-action bg-light" href="javascript:userapp.loadmodule('childs');">Enfants</a>
                     <a class="list-group-item list-group-item-action bg-light" href="javascript:userapp.loadmodule('presences');">Présences</a>
                     <a class="list-group-item list-group-item-action bg-light" href="javascript:userapp.loadmodule('persons');">Personnes de références</a>
-                    <a class="list-group-item list-group-item-action bg-light" href="javascript:userapp.loadmodule('accounting');">Décompte</a>
-                    <a class="list-group-item list-group-item-action bg-light" href="javascript:userapp.loadmodule('staff');">Staff</a>
-                    <a class="list-group-item list-group-item-action bg-light" href="javascript:userapp.loadmodule('vacancy');">Congés</a>
-                    <a class="list-group-item list-group-item-action bg-light" href="javascript:userapp.loadmodule('waitlist');">Liste d'attente</a>
+                    <!-- <a class="list-group-item list-group-item-action bg-light" href="javascript:userapp.loadmodule('accounting');">Décompte</a> -->
+                    <!-- <a class="list-group-item list-group-item-action bg-light" href="javascript:userapp.loadmodule('staff');">Staff</a> -->
+                    <!-- <a class="list-group-item list-group-item-action bg-light" href="javascript:userapp.loadmodule('vacancy');">Congés</a> -->
+                    <!-- <a class="list-group-item list-group-item-action bg-light" href="javascript:userapp.loadmodule('waitlist');">Liste d'attente</a> -->
                     <a class="list-group-item list-group-item-action bg-light" href="javascript:userapp.loadmodule('calendar');">Calendriers</a>
-                    <a class="list-group-item list-group-item-action bg-light" href="javascript:userapp.loadmodule('forms');">Formulaires</a>
-                    <a class="list-group-item list-group-item-action bg-light" href="javascript:userapp.loadmodule('logbook');">Livrets</a>
+                    <!-- <a class="list-group-item list-group-item-action bg-light" href="javascript:userapp.loadmodule('forms');">Formulaires</a> -->
+                    <!-- <a class="list-group-item list-group-item-action bg-light" href="javascript:userapp.loadmodule('logbook');">Livrets</a> -->
                     <a  class="list-group-item list-group-item-action bg-light" href="javascript:userapp.loadmodule('settings');">Configuration</a></li>
               </div>
             </div>
@@ -47,7 +47,7 @@
 <script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
 <script src="node_modules/jquery/dist/jquery.min.js"></script>
 <script src="node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
-<script src="node_modules/store2/dist/store2.min.js"></script>
+<!-- <script src="node_modules/store2/dist/store2.min.js"></script> -->
 <script src="js/app.js"></script>
 <script>if (window.module) module = window.module;</script>
 </body>
diff --git a/main.js b/main.js
index 17d57ce..40e1e4e 100644
--- a/main.js
+++ b/main.js
@@ -8,8 +8,6 @@ var child = require('child_process').execFile;
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
 let mainWindow
-let userdatapath = app.getPath('userData');
-
 
 function createWindow () {
   // Create the browser window.
@@ -17,10 +15,10 @@ function createWindow () {
 	var parameters = [];
 	 if (os.platform() == "win32"){
 	 	executablePath = "C:\\Strawberry\\perl\\bin\\perl.exe";
-	 	parameters = ["C:\\Users\\ksaff\\Workspace\\DKSService\\dkslocalserver.pl"];
+	 	parameters = ["C:\\Users\\ksaff\\Workspace\\dks_server\\dkslocalserver.pl"];
 	 } else { //os.platform() == "darwin"
 	 	executablePath = "/Users/kilian/perl5/perlbrew/perls/perl-5.28.1/bin/perl";
-	 	parameters = ["/Users/kilian/Workspace/DKSService/dkslocalserver.pl"];
+	 	parameters = ["/Users/kilian/Workspace/dks_server/dkslocalserver.pl"];
 	 }
 
   mainWindow = new BrowserWindow({
@@ -38,8 +36,9 @@ function createWindow () {
 	     if(err){
 	     	console.error('stderr',err);
 	     } else {
-	    	
-	    	
+	    	// var test = app.getPath('USERPROFILE');
+	    	// console.log("Path:" + test);
+	    	// console.log(data.toString());
 		    win.show()
 	     } 
 		
@@ -47,7 +46,7 @@ function createWindow () {
   mainWindow.show()
   // Open the DevTools.
   mainWindow.webContents.openDevTools()
-
+  
   // Emitted when the window is closed.
   mainWindow.on('closed', function () {
     // Dereference the window object, usually you would store windows
@@ -57,6 +56,7 @@ function createWindow () {
   })
 }
 
+
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
 // Some APIs can only be used after this event occurs.
diff --git a/modules/accounting/accounting.html b/modules/accounting/accounting.html
deleted file mode 100644
index be04fec..0000000
--- a/modules/accounting/accounting.html
+++ /dev/null
@@ -1,192 +0,0 @@
-
-<!DOCTYPE html>
-
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-  <title>Décompte</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="cache-control" content="max-age=0" />
-  <meta http-equiv="cache-control" content="no-cache" />
-  <meta http-equiv="expires" content="0" />
-  <meta http-equiv="expires" content="Tue, 01 Jan 1970 1:00:00 GMT" />
-  <meta http-equiv="pragma" content="no-cache" />
-  <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-  <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-  <link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/dataTables.bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css">
-  <!-- <link href="../../web/css/bootstrap-timepicker.min.css" rel="stylesheet" type="text/css"> -->
-  <link href="../../web/css/bootstrap-multiselect.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/glyphicons.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/creorga.css" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    .dataTables_filter {
-      margin-top: -30px;
-    }
-  </style>
-</head>
-
-<body>
-  <div class="container-fluid" style="padding-top: 5px;">
-    <div class="form-inline" id="mnuacc">
-      <div class="input-group month">
-        <span class="input-group-addon">du mois:</span>
-          <input type="date" class="form-control" value="" placeholder="mm.yyyy" style="width: 80px;" id="accmonth" onchange="set_accmonth();">
-        <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-      </div>
-      <button class="btn btn-primary" onclick="onpreviousmonth();" ><span class="glyphicon glyphicon-chevron-left"></span></button>
-      <button class="btn btn-primary" onclick="onnextmonth();" ><span class="glyphicon glyphicon-chevron-right"></span></button>
-      
-      <button class="btn btn-primary" onclick="generatecsv();" ><span class="glyphicons glyphicons-file-export"></span>&nbsp;Export CSV Check-Service</button>
-      <button class="btn btn-info" onclick="openmonthlypdf();" style="display: none;" id="monthlypdf"><span class="glyphicons glyphicons-file"></span>&nbsp;PDF des Factures importées et triées</button>
-      <!--<div class="input-group">
-        <div class="input-group-addon">Colonnes <span class="glyphicons glyphicons-eye-close" aria-hidden="true"></span></div>
-        <select id="hidden_columns" multiple="multiple" onchange="onhidecolumn(this.id);">
-        </select>
-      </div>-->
-    </div>
-    <div>
-      <table class="display compact dataTable cell-border" style="width: 100%;" id="tbl_accounting" role="grid"></table>
-    </div>
-   </div>
-  <div class="modal fade" id="edit_accounting">
-          <div class="modal-dialog" style="width: 850px; max-width: 850px;">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title">Editer facture</h4>
-              </div>
-              <div class="modal-body" style="max-height: calc(100vh - 200px);overflow-y: auto; ">
-
-                <div id="frmeditaccounting">
-                  <input type="hidden" value="0" id="uuid" />
-                  <input type="hidden" value="" id="action" />
-                  <input type="hidden" value="" id="childuuid" />
-                  <div class="form-group">
-                    <div class="checkbox" >
-                      <input type="checkbox" value="1" id="nocheckservice">
-                      <label for="nocheckservice">facture NON Check-Service</label>
-                    </div>
-                    </div>
-                    <div class="form-group">
-                      <label for="name">Enfant</label>
-                      <input type="text" value="" id="childname"  nullable="true" readonly="true" class="form-control">
-                    </div>
-                  <div class="form-group">
-                    <label for="name">Référence</label>
-                    <input type="text" value="" id="reference"  nullable="true" class="form-control">
-                  </div>
-                  <div class="form-group">
-                    <label for="invoicefile">Fichier</label>
-                    <input type="file" value="" id="invoicefile" nullable="true" accept=".pdf" class="form-control" disabled="1">
-                  </div>
-                  <div class="form-group col-md-6" id="date-container">
-                    <label for="invoicedate">Date de la Facture</label>
-
-                    <div id="dt_invoicedate" class="input-group date">
-                      <input type="date" class="form-control" value="" placeholder="dd.mm.yyyy"  id="invoicedate"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                  </div>
-                  <div class="form-group col-md-6">
-                  <label for="invoiceamount">Somme facturé</label>
-
-                  <div class="input-group number">
-                    <input type="number" value="" id="invoiceamount" style="text-align: right;" min="0" nullable="false" class="form-control">
-                    <div class="input-group-addon">€</div>
-                  </div>
-                </div>
-                  <div class="form-group col-md-6" id="date-container">
-                    <label for="payeddate">Date du Payement</label>
-
-                    <div id="dt_payeddate" class="input-group date">
-                      <input type="date" class="form-control" value="" widgetpos="top" placeholder="dd.mm.yyyy"  id="payeddate"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                  </div>
-                  <div class="form-group col-md-6">
-                  <label for="payedamount">Somme payé</label>
-
-                  <div class="input-group number">
-                    <input type="number" value="" id="payedamount" style="text-align: right;" min="0" nullable="false" class="form-control">
-                    <div class="input-group-addon">€</div>
-                  </div>
-                </div>
-                <div class="form-group col-md-12">
-                  <label for="payedamount">Somme prestation Check-Service</label>
-
-                  <div class="input-group number">
-                    <input type="number" value="" id="benefitamount" style="text-align: right;" min="0" nullable="false" class="form-control">
-                    <div class="input-group-addon">€</div>
-                  </div>
-                </div>
-                <div class="form-group col-md-4" id="date-container">
-                    <label for="reminderdate1">Date Rappel 1</label>
-
-                    <div id="dt_reminderdate1" class="input-group date">
-                      <input type="date" class="form-control" value="" widgetpos="top" placeholder="dd.mm.yyyy"  id="reminderdate1"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                  </div>
-                
-                <div class="form-group col-md-4" id="date-container">
-                    <label for="reminderdate2">Date Rappel 2</label>
-
-                    <div id="dt_reminderdate2" class="input-group date">
-                      <input type="date" class="form-control" value="" widgetpos="top" placeholder="dd.mm.yyyy"  id="reminderdate2"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                  </div>
-                
-                <div class="form-group col-md-4" id="date-container">
-                    <label for="reminderdate3">Date Rappel 3</label>
-
-                    <div id="dt_reminderdate3" class="input-group date">
-                      <input type="date" class="form-control" value="" widgetpos="top" placeholder="dd.mm.yyyy"  id="reminderdate3"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                  </div>
-                </div>
-                </div>
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Annuler</button> <button onclick="save_accounting();" class="btn btn-primary">OK</button>
-              </div>
-              </div>
-
-              
-            </div>
-          </div>
-  <div class="modal fade" id="confirm_delete_accounting">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-
-                <h4 class="modal-title">Supprimer Décompte</h4>
-              </div><!-- dialog contents -->
-
-              <div class="modal-body">
-                Êtes vous sûre de supprimer ce décompte de facturation, payement et/ou prestation?<br>
-                
-              </div><!-- dialog buttons -->
-
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Non</button> <button onclick="delete_accounting();" class="btn btn-primary">Oui</button>
-              </div>
-            </div>
-          </div>
-  </div>
-  <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-  <script src="../../web/js/moment-with-locales.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
-  <!-- <script src="../../web/js/bootstrap-timepicker.min.js" type="text/javascript"></script> -->
-  <script src="../../web/js/bootstrap-multiselect.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/navigation.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/system.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-    
-  <script src="../../web/js/labels.js" type="text/javascript"></script>
-  <script src="js/accounting.js" type="text/javascript"></script>
-  <script src="../../web/js/creorga.js" type="text/javascript"></script>
-  
-</body>
-</html>
diff --git a/modules/accounting/accounting.xul b/modules/accounting/accounting.xul
deleted file mode 100644
index 4ad1aed..0000000
--- a/modules/accounting/accounting.xul
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE overlay PUBLIC "-//MOZILLA//DTD XUL V1.0//EN"
-"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<overlay id="ov_accounting" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <toolbar id="co_maintoolbar" style="-moz-appearance: none;">
-    <toolbarbutton  type="menu"  class="btn btn-default" id="tbb_accounting" insertafter="tbb_presences" label="Décompte" image="modules/accounting/img/accounting.png" orient="vertical">
-    <menupopup class="tlbpopup" style="text-align: left;">
-      <label value="Décompte" style="font-weight: bold;"/>
-      <menuitem label="par mois" oncommand="navigation.load_appview('accounting','accounting', null,'Décompte par mois');"  id="mnuaccountingmonth"/>
-      <menuitem label="par enfant" oncommand="navigation.load_appview('accountingchild','accounting',null,'Décompte par enfant');"  id="mnuaccountingchild"/>
-      <menuitem label="factures ouvertes" oncommand="navigation.load_appview('accountingopeninvoice','accounting',null,'Factures ouvertes');"  id="mnuaccountingopeninvoice"/>
-      <menuseparator />
-      <menuitem label="import Check-Services" oncommand="navigation.load_appview('checkservice','accounting',null,'Import Check Service');"  id="mnuaccountingimport"/>
-      <!--<menu label="Import PDF" id="mnuimportpdf">
-        <menupopup style="text-align: left;">
-          <menuitem label="Factures Check-Service" oncommand="tools.readinvoicepdf();"  id="mnuaccountingimportinvoice"/>
-          <menuitem label="Décompte des prestations" oncommand="tools.readbenefitstatement();"  id="mnuaccountingbenefitstatement"/>
-        </menupopup>
-      </menu>-->
-      <menuseparator />
-      <label value="Bilan"  style="font-weight: bold;"/>
-      <menuitem label="Bilan annuelle" oncommand="navigation.load_appview('accountingyear','accounting',null,'Bilan annuelle');"  id="mnuaccountingyear"/>
-    </menupopup>
-    </toolbarbutton>
-  </toolbar>
-</overlay>
diff --git a/modules/accounting/accountingchild.html b/modules/accounting/accountingchild.html
deleted file mode 100644
index 6ff7f84..0000000
--- a/modules/accounting/accountingchild.html
+++ /dev/null
@@ -1,189 +0,0 @@
-
-<!DOCTYPE html>
-
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-  <title>Décompte Enfant</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="cache-control" content="max-age=0" />
-  <meta http-equiv="cache-control" content="no-cache" />
-  <meta http-equiv="expires" content="0" />
-  <meta http-equiv="expires" content="Tue, 01 Jan 1970 1:00:00 GMT" />
-  <meta http-equiv="pragma" content="no-cache" />
-  <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-  <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-  <link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/dataTables.bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css">
-  <!-- <link href="../../web/css/bootstrap-timepicker.min.css" rel="stylesheet" type="text/css"> -->
-  <link href="../../web/css/bootstrap-multiselect.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/glyphicons.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/creorga.css" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    .dataTables_filter {
-      margin-top: -30px;
-    }
-  </style>
-</head>
-
-<body>
-  <div class="container-fluid"  style="padding-top: 5px;">
-    <div class="form-inline" >
-      <div class="input-group month btn-group">
-        <span class="input-group-addon">du année:</span>
-          <select id="accyear" class="form-control" style="width: 80px;" onchange="set_accyear();"></select>
-        </span>
-      </div>
-      <div class="input-group">
-        <span class="input-group-addon">du enfant:</span>
-        <select  class="form-control" value="" id="accchild" onchange="set_accchild();"></select>
-      </div>
-      <button class="btn btn-primary" onclick="newinvoice();" ><span class="glyphicons glyphicons-plus"></span>&nbsp;Nouvelle Facture</button>
-      <!--<div class="input-group">
-        <div class="input-group-addon">Colonnes <span class="glyphicons glyphicons-eye-close" aria-hidden="true"></span></div>
-        <select id="hidden_columns" multiple="multiple" onchange="onhidecolumn(this.id);">
-        </select>
-      </div>-->
-   </div>
-   <div>
-    <table class="display dataTable cell-border" style="width: 100%;" id="tbl_accounting" role="grid"></table>
-   </div>
-   </div>
-  <div class="modal fade" id="edit_accounting">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title" id="head_invoice">Editer facture</h4>
-              </div>
-              <div class="modal-body" style="max-height: calc(100vh - 300px);overflow-y: auto; ">
-
-                <div id="frmeditaccounting">
-                  <input type="hidden" value="" id="uuid" />
-                  <input type="hidden" value="" id="action" />
-                  <input type="hidden" value="" id="childuuid" />
-                  
-                  <div class="form-group">
-                  <div class="checkbox" >
-                    <input type="checkbox" value="1" id="nocheckservice">
-                    <label for="nocheckservice">facture NON Check-Service</label>
-                  </div>
-                  </div>
-                  <div class="form-group">
-                    <label for="name">Enfant</label>
-                    <input type="text" value="" id="childname"  nullable="true" readonly="true" class="form-control">
-                  </div>
-                  <div class="form-group">
-                    <label for="name">Référence</label>
-                    <input type="text" value="" id="reference"  nullable="true" class="form-control">
-                  </div>
-                  <div class="form-group">
-                    <label for="invoicefile">Fichier</label>
-                    <input type="file" value="" id="invoicefile" nullable="true" class="form-control">
-                  </div>
-                  <div class="form-group col-md-6" id="date-container">
-                    <label for="invoicedate">Date de la Facture</label>
-
-                    <div id="dt_invoicedate" class="input-group date">
-                      <input type="date" class="form-control" value="" limits="0" placeholder="dd.mm.yyyy"  id="invoicedate"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                  </div>
-                  <div class="form-group col-md-6">
-                  <label for="invoiceamount">Somme facturé</label>
-
-                  <div class="input-group number">
-                    <input type="number" value="" id="invoiceamount" style="text-align: right;" min="0" nullable="false" class="form-control">
-                    <div class="input-group-addon">€</div>
-                  </div>
-                </div>
-                  <div class="form-group col-md-6" id="date-container">
-                    <label for="payeddate">Date du Payement</label>
-
-                    <div id="dt_payeddate" class="input-group date">
-                      <input type="date" class="form-control" value="" limits="0" placeholder="dd.mm.yyyy"  id="payeddate"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                  </div>
-                  <div class="form-group col-md-6">
-                  <label for="payedamount">Somme payé</label>
-
-                  <div class="input-group number">
-                    <input type="number" value="" id="payedamount" style="text-align: right;" min="0" nullable="false" class="form-control">
-                    <div class="input-group-addon">€</div>
-                  </div>
-                </div>
-                <div class="form-group col-md-12">
-                  <label for="payedamount">Somme prestation Check-Service</label>
-
-                  <div class="input-group number">
-                    <input type="number" value="" id="benefitamount" style="text-align: right;" min="0" nullable="false" class="form-control">
-                    <div class="input-group-addon">€</div>
-                  </div>
-                </div>
-                <div class="form-group col-md-4" id="date-container">
-                    <label for="reminderdate1">Date Rappel 1</label>
-
-                    <div id="dt_reminderdate1" class="input-group date">
-                      <input type="date" class="form-control" value="" limits="0" placeholder="dd.mm.yyyy"  id="reminderdate1"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                  </div>
-                
-                <div class="form-group col-md-4" id="date-container">
-                    <label for="reminderdate2">Date Rappel 2</label>
-
-                    <div id="dt_reminderdate2" class="input-group date">
-                      <input type="date" class="form-control" value="" limits="0" placeholder="dd.mm.yyyy"  id="reminderdate2"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                  </div>
-                
-                <div class="form-group col-md-4" id="date-container">
-                    <label for="reminderdate3">Date Rappel 3</label>
-
-                    <div id="dt_reminderdate3" class="input-group date">
-                      <input type="date" class="form-control" value="" limits="0" placeholder="dd.mm.yyyy"  id="reminderdate3"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                  </div>
-                </div>
-                </div>
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Annuler</button> <button onclick="save_accounting();" class="btn btn-primary">OK</button>
-              </div>
-              </div>
-            </div>
-          </div>
-  <div class="modal fade" id="confirm_delete_accounting">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-
-                <h4 class="modal-title">Supprimer Décompte</h4>
-              </div><!-- dialog contents -->
-
-              <div class="modal-body">
-                Êtes vous sûre de supprimer ce décompte de facturation, payement et/ou prestation?<br>
-                
-              </div><!-- dialog buttons -->
-
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Non</button> <button onclick="delete_accounting();" class="btn btn-primary">Oui</button>
-              </div>
-            </div>
-  <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-  <script src="../../web/js/moment-with-locales.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
-  <!-- <script src="../../web/js/bootstrap-timepicker.min.js" type="text/javascript"></script> -->
-  <script src="../../web/js/bootstrap-multiselect.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/navigation.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/system.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-    
-  <script src="../../web/js/labels.js" type="text/javascript"></script>
-  <script src="js/accountingchild.js" type="text/javascript"></script>
-  <script src="../../web/js/creorga.js" type="text/javascript"></script>
-  
-</body>
-</html>
diff --git a/modules/accounting/accountingopeninvoice.html b/modules/accounting/accountingopeninvoice.html
deleted file mode 100644
index b210ca0..0000000
--- a/modules/accounting/accountingopeninvoice.html
+++ /dev/null
@@ -1,154 +0,0 @@
-
-<!DOCTYPE html>
-
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-  <title>Factures ouvertes</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="cache-control" content="max-age=0" />
-  <meta http-equiv="cache-control" content="no-cache" />
-  <meta http-equiv="expires" content="0" />
-  <meta http-equiv="expires" content="Tue, 01 Jan 1970 1:00:00 GMT" />
-  <meta http-equiv="pragma" content="no-cache" />
-  <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-  <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-  <link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/dataTables.bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css">
-  <!-- <link href="../../web/css/bootstrap-timepicker.min.css" rel="stylesheet" type="text/css"> -->
-  <link href="../../web/css/bootstrap-multiselect.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/glyphicons.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/creorga.css" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    .dataTables_filter {
-      margin-top: 15px;
-    }
-  </style>
-</head>
-
-<body>
-   <div class="container-fluid"  style="padding-top: 5px;">
-    <div>
-      <table class="display dataTable cell-border" style="width: 100%;" id="tbl_accounting" role="grid"></table>
-    </div>
-   </div>
-  <div class="modal fade" id="edit_accounting">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title">Editer la facturation</h4>
-              </div>
-              <div class="modal-body" style="max-height: calc(100vh - 300px);overflow-y: auto; ">
-
-                <div id="frmeditaccounting">
-                  <input type="hidden" value="" id="uuid" />
-                  <input type="hidden" value="" id="action" />
-                  <input type="hidden" value="" id="childuuid" />
-                  <div class="form-group">
-                  <div class="checkbox" >
-                    <input type="checkbox" value="1" id="nocheckservice">
-                    <label for="nocheckservice">facture NON Check-Service</label>
-                  </div>
-                  </div>
-                  <div class="form-group">
-                    <label for="name">Enfant</label>
-                    <input type="text" value="" id="childname"  nullable="true" readonly="true" class="form-control">
-                  </div>
-                  <div class="form-group">
-                    <label for="name">Référence</label>
-                    <input type="text" value="" id="reference"  nullable="true" class="input- form-control">
-                  </div>
-                  <div class="form-group">
-                    <label for="invoicefile">Fichier</label>
-                    <input type="file" value="" id="invoicefile" nullable="true" class="form-control"">
-                  </div>
-                  <div class="form-group col-md-6" id="date-container">
-                    <label for="invoicedate">Date de la Facture</label>
-
-                    <div id="dt_invoicedate" class="input-group date">
-                      <input type="date" class="form-control" value="" limits="0" placeholder="dd.mm.yyyy"  id="invoicedate"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                  </div>
-                  <div class="form-group col-md-6">
-                  <label for="invoiceamount">Somme facturé</label>
-
-                  <div class="input-group number">
-                    <input type="number" value="" id="invoiceamount" style="text-align: right;" min="0" nullable="false" class="form-control">
-                    <div class="input-group-addon">€</div>
-                  </div>
-                </div>
-                  <div class="form-group col-md-6" id="date-container">
-                    <label for="payeddate">Date du Payement</label>
-
-                    <div id="dt_payeddate" class="input-group date">
-                      <input type="date" class="form-control" value="" limits="0" placeholder="dd.mm.yyyy"  id="payeddate"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                  </div>
-                  <div class="form-group col-md-6">
-                  <label for="payedamount">Somme payé</label>
-
-                  <div class="input-group number">
-                    <input type="number" value="" id="payedamount" style="text-align: right;" min="0" nullable="false" class="form-control">
-                    <div class="input-group-addon">€</div>
-                  </div>
-                </div>
-                <div class="form-group col-md-12">
-                  <label for="payedamount">Somme prestation Check-Service</label>
-
-                  <div class="input-group number">
-                    <input type="number" value="" id="benefitamount" style="text-align: right;" min="0" nullable="false" class="form-control">
-                    <div class="input-group-addon">€</div>
-                  </div>
-                </div>
-                <div class="form-group col-md-4" id="date-container">
-                    <label for="reminderdate1">Date Rappel 1</label>
-
-                    <div id="dt_reminderdate1" class="input-group date">
-                      <input type="date" class="form-control" value="" limits="0" placeholder="dd.mm.yyyy"  id="reminderdate1"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                  </div>
-                
-                <div class="form-group col-md-4" id="date-container">
-                    <label for="reminderdate2">Date Rappel 2</label>
-
-                    <div id="dt_reminderdate2" class="input-group date">
-                      <input type="date" class="form-control" value="" limits="0" placeholder="dd.mm.yyyy"  id="reminderdate2"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                  </div>
-                
-                <div class="form-group col-md-4" id="date-container">
-                    <label for="reminderdate3">Date Rappel 3</label>
-
-                    <div id="dt_reminderdate3" class="input-group date">
-                      <input type="date" class="form-control" value="" limits="0" placeholder="dd.mm.yyyy"  id="reminderdate3"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                  </div>
-                </div>
-                </div>
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Annuler</button> <button onclick="save_accounting();" class="btn btn-primary">OK</button>
-              </div>
-              </div>
-
-              
-            </div>
-  <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-  <script src="../../web/js/moment-with-locales.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
-  <!-- <script src="../../web/js/bootstrap-timepicker.min.js" type="text/javascript"></script> -->
-  <script src="../../web/js/bootstrap-multiselect.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/navigation.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/system.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-    
-  <script src="../../web/js/labels.js" type="text/javascript"></script>
-  <script src="js/accountingopeninvoice.js" type="text/javascript"></script>
-  <script src="../../web/js/creorga.js" type="text/javascript"></script>
-  
-</body>
-</html>
diff --git a/modules/accounting/accountingyear.html b/modules/accounting/accountingyear.html
deleted file mode 100644
index ac28392..0000000
--- a/modules/accounting/accountingyear.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-  <title>Bilan</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="cache-control" content="max-age=0" />
-  <meta http-equiv="cache-control" content="no-cache" />
-  <meta http-equiv="expires" content="0" />
-  <meta http-equiv="expires" content="Tue, 01 Jan 1970 1:00:00 GMT" />
-  <meta http-equiv="pragma" content="no-cache" />
-  <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-  <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-  <link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/dataTables.bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css">
-  <!-- <link href="../../web/css/bootstrap-timepicker.min.css" rel="stylesheet" type="text/css"> -->
-  <link href="../../web/css/bootstrap-multiselect.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/glyphicons.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/creorga.css" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    .dataTables_filter {
-      margin-top: -30px;
-    }
-    td {
-      vertical-align: top;
-    }
-    td:last-child{
-      font-weight: bold;
-    }
-  </style>
-</head>
-
-<body>
-   <div class="container-fluid"  style="padding-top: 5px;">
-    <div class="form-inline" id="mnuacc">
-      <div class="input-group month btn-group">
-        <span class="input-group-addon">du année:</span>
-        <select id="accyear" class="form-control" style="width: 80px;" onchange="set_accyear();"></select>
-      </div>
-      <div class="input-group btn-group">
-        <span class="input-group-addon">montants à visualiser:</span>
-        <select id="filter_amounts" class="form-control" multiple="multiple" onchange="onselamount();">
-        </select>
-      </div>
-    </div>
-   <div>
-    <table class="display dataTable cell-border" style="width: 100%;" id="tbl_accounting" role="grid"></table>
-   </div>
-   
-   </div>
-  <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-  <script src="../../web/js/moment-with-locales.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
-  <!-- <script src="../../web/js/bootstrap-timepicker.min.js" type="text/javascript"></script> -->
-  <script src="../../web/js/bootstrap-multiselect.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/navigation.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/system.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-  <script src="../../web/js/labels.js" type="text/javascript"></script>
-  <script src="js/accountingyear.js" type="text/javascript"></script>
-  <script src="../../web/js/creorga.js" type="text/javascript"></script>
-  
-</body>
-</html>
diff --git a/modules/accounting/checkservice.html b/modules/accounting/checkservice.html
deleted file mode 100644
index 82bbd27..0000000
--- a/modules/accounting/checkservice.html
+++ /dev/null
@@ -1,110 +0,0 @@
-
-<!DOCTYPE html>
-
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-  <title>Décompte</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="cache-control" content="max-age=0" />
-  <meta http-equiv="cache-control" content="no-cache" />
-  <meta http-equiv="expires" content="0" />
-  <meta http-equiv="expires" content="Tue, 01 Jan 1970 1:00:00 GMT" />
-  <meta http-equiv="pragma" content="no-cache" />
-  <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-  <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-  <link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/dataTables.bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css">
-  <!-- <link href="../../web/css/bootstrap-timepicker.min.css" rel="stylesheet" type="text/css"> -->
-  <link href="../../web/css/bootstrap-multiselect.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/glyphicons.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/creorga.css" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    .dataTables_filter {
-      margin-top: -30px;
-    }
-  </style>
-</head>
-
-<body>
-  <div class="container-fluid" style="padding-top: 5px;">
-   <div class="row">
-        <div class="col-sm-6">
-          <div class="panel panel-default">
-            <div class="panel-heading">
-              <h3 class="panel-title">&nbsp;Fichiers PDF <span style="font-weight: bold;">(requis pour import)</span></h3>
-            </div>
-            <div class="panel-body" id="infopanelpdf">
-              <div class="form-group">
-    			<label for="importfileinvoice">Fichier PDF:</label>
-    			<input type="text" class="form-control" id="importfileinvoice" readonly="1">
-    			<button class="btn btn-primary" id="btnselectpdf" onclick="loadinvoicepdf();">Charger fichier PDF</button>
-    			<!--<label for="importtype">Type:</label>
-   			<select class="formcontrol" id="importtype">
-    			<option value="inv">Factures Check-Service</option>
-    			<option value="stmt">Prestations Check-Service</option>
-    			<option value="invold">Anciennes Factures Check-Service</option>
-    			</select>-->
-    			
-  			  </div>
-  			  
-  			  
-            </div>
-          </div>
-          
-        </div>
-        <div class="col-sm-6">
-          <div class="panel panel-default">
-            <div class="panel-heading">
-              <h3 class="panel-title">&nbsp;Fichier XML <span style="font-weight: bold;">(optionel pour import)</span></h3>
-            </div>
-            <div class="panel-body" id="infopanelxml">
-              <div class="form-group">
-    			<label for="importfilexml">Fichier XML:</label>
-    			<input type="text" class="form-control" id="importfilexml" readonly="1">
-    			<button class="btn btn-primary" id="btnselectxml" onclick="loadinvoicexml();">Charger fichier XML</button>
-    			
-    			
-  			  </div>
-  			  
-  			  
-            </div>
-          </div>
-          
-        </div>
-        <div class="col-md-12">
-        <button class="btn btn-primary" id="btnimportfiles" onclick="importfiles();">Importer</button>
-        </div>
-        <div class="col-md-12" style="text-align: center;display: none;" id="importprogress">
-        	<p style="font-weight: bold;">Attendez s.v.p.! Import des fichiers en cours!</p>
-        	<progress style="width:50%;"></progress>
-        </div>
-        <div class="col-md-12" style="display: none;" id="importresult">
-        	<table class="display compact dataTable cell-border" style="width: 100%;" id="tbl_importresult" role="grid">
-        	<thead><tr><th>Reference</th><th>No Check-Service</th><th>Status d'import<th></tr></thead>
-        	<tbody></tbody>
-        	</table>
-        </div>
-      </div>
-    
-   </div>
-    
-  <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-  <script src="../../web/js/moment-with-locales.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
-  <!-- <script src="../../web/js/bootstrap-timepicker.min.js" type="text/javascript"></script> -->
-  <script src="../../web/js/bootstrap-multiselect.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/navigation.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/system.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-    
-  <script src="../../web/js/labels.js" type="text/javascript"></script>
-  <script src="js/checkservice.js" type="text/javascript"></script>
-  <script src="../../web/js/creorga.js" type="text/javascript"></script>
-  
-</body>
-</html>
diff --git a/modules/accounting/img/accounting.png b/modules/accounting/img/accounting.png
deleted file mode 100644
index 75c9b7fd365dbad4555f0776488bfbc8c8940986..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1141
zcmV-*1d98KP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;0hTGG%uvkhFkyu1OiD!
zK~z}7&6Zn;RaF?re|yiQHbRY2y311NW>IJjUC_cv1e?js%qUtB7}ZM@2~#_=rYNXZ
z<-Alx3_VD#5JJhEF4}{cV-seRk%TctM7M?5IOV7#<2k37|Bl6O&dk|!i2C4g)?SzI
z`u{HQA5%2iX6lj?f!V-vU@Guf4ZNNMjsTm0eqh8Jf4q<asY|8<EfRQD?rsJ60f>XW
zGH@m^DR*}_@ILUWHQv{xK<bi9foFjw!THy~dSDnB6ywI=yaZefOb0FkE|CEl-%o%w
z*7%-k3WUsV3xvM_bOA@L@js8_#jk>}O#>za&jTxgg}}W)Pc0tk1Xcr2TjM+G1y|~l
zZs2<1VTCn*?|2@_=<(Dg72qYHWQ{*qK<KH!3BVmdTVP~VO9(>h03HDPQkQHLy1xew
z<d~I#^MKO?&bxuj#}YV}0>^S^&A=l40QLg|xhyCFXDja2s3ZVa$3W_mIlxw6*1u3|
zjsu5*m#y*ts3(!oyB=7kT;BpT0awe#jRgc%^pCI*=REc)aKAOaFWZRqsHAUWjc>Ka
zU!wwJfRFUBANW-`2x$oTQoy^;8sB7%Zvt)wUIV@j?k)hfr!Hv;Jun4$3%Ch*PwPF_
z_-}FuKTGjm11y%}`+!bs{OiHJ2*4U&(RVYD0uKk?=mFZS@rUvXAjEs%7vKY-zbxfi
zfNlZw5HP#eG)-M{JK&^v1iT15nknFb6;%*i4r1G&x*q{oTH|*WEKWB7?*>~Z$G{9=
zew8;30@EY`bFzfD7Zt9sY*s(X=$RPU37ii62y778hR5JDXpLW+#d-qtM6g~G12cgU
zpu-x!61Z87X)Ul_S+GBN)SbGdAp_Y2=nG(v*5@_`IeTB~lAo;c+th|Pr7k%|=hJ{!
z)GhZ36ZO!MFbzjz)(vb{NCt#~H-KA!`PTT)>g<%OflhK&Dx{?<A_tTO!x9d#ICV)}
zhwvGi75=V-y#;y9Dbnq#(9}?Y=7NuxS>sD}WWi;?Jgxg<;6kO~6+k=CHx7f7QkOhb
zM;1I4tha<9d=q%k8vnaub%Dn65rHtv->mm9u*UZmjQ@?mJE1X|0+k@H8-b5CZ2kfK
zCLj)~5j`19L#@{Mtu+e26Id5)tpe8N6{zF@HUjKbPpAM>fb#<{3;>T<<GaQXJXdYK
zJ;=HZz&+OZgHh^|x0M!^38MQj@Ex#Cb$+L2iCMt4O6erH{~@s48h<RC30KLorFEp#
zJYcTEQVu5JIA_!jYkX_?IJU+QsTH>YyEF^@Im(b)jfRAeDCnMzT1PtT1r}N37v|G9
z8YO0D$f9%9rnC6Zlq)|Ma|F^Is+f1l`jCzSUDo*B{9oxWSME}YVDHN)00000NkvXX
Hu0mjfws8I{

diff --git a/modules/accounting/js/accounting.js b/modules/accounting/js/accounting.js
deleted file mode 100644
index 4531bb3..0000000
--- a/modules/accounting/js/accounting.js
+++ /dev/null
@@ -1,740 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg ) 
-
-var pconfig = {};
-var cdate = null;
-var initdate = new Date();
-initdate.setDate(1);
-var winh= window.innerHeight -140;
-var tblacc = null;
-var curchilduuid = '';
-var crecheuuid = null;
-var ccreche = null
-var importpath = null;
-var cweeks = new Array();
-var delacc = {};
-var numchilds = 0;
-var strminweek = null;
-var monthmin = null;
-var monthmax = null;
-var mpdffile = null;
-var aax = ['mon','tue','wed','thu','fri','sat'];
-//var lictype = apppref.getpreference("support.lictype"); 
-var amonth = ['','Janvier','Février','Mars','Avril','Mai','Juin','Juillet','Aôut','Septembre','Octobre','Novembre','Décembre'];
-function initdata(){
-  curcfg.loadconfig(apppref.getpreference("support.database.currentdb.num"));
-  load_helpers();
-  var configdata = apppref.getpreference("pageconfig.accounting");
-  
-  if (configdata != '') {
-    pconfig = JSON.parse(configdata);
-  }
-  
-  if (!pconfig.printlayout) {
-    pconfig.printlayout = 'list';
-    apppref.setpreference("pageconfig.accounting",pconfig);
-  }
-  ccreche = appdb.dbquery("select uuid,idcheckservice from creche LIMIT 1;");
-  crecheuuid = ccreche.sqldata[0].uuid;
-  importpath = FileUtils.File(curcfg.path.local  + system.sep() +"imports" + system.sep() + crecheuuid);
-  
-  if (pconfig.accmonth) {
-    
-    initdate = new Date(encodeparam(pconfig.accmonth, 'month').replace(/'/g, ''));
-    $("#accmonth").val(pconfig.accmonth);
-  }else {
-    $("#accmonth").val(initdate.toLocaleFormat('%m.%Y'));
-    pconfig.accmonth=initdate.toLocaleFormat('%m.%Y');
-  }
-  cdate = initdate.toLocaleFormat('%Y-%m-%d');
-  var cmonth = initdate.getMonth() +1;
-  mpdffile = system.getDirectory(appdb.dbFile.path) +  system.sep() + 'imports' + system.sep() + crecheuuid +system.sep() + initdate.getFullYear() + "." + cmonth + ".pdf"; 
-	if (system.fileexists(mpdffile)){
-		$("#monthlypdf").show();
-	}
-  //lictype = apppref.getpreference("support.lictype");
-  //if (lictype != 'free'){
-  //  $("#invoicefile").removeAttr("disabled");
-  //  $("#mnuacc").css({"position":"absolute","z-index":"1000"});
-  //} 
-  set_infoheader(amonth[parseInt(pconfig.accmonth.substring(0,2))] + " " + pconfig.accmonth.substring(3,8));
-  load_accounting_table();
-  var bfile = appdb.dbquery("select benefitfile from accounting where accmonth = date('"+pconfig.accmonth+"') group by benefitfile LIMIT 1;");
-  if (bfile.sqldata.length == 1) {
-    $('#mnuacc').append("<button type=\"button\" class=\"btn btn-primary\" onclick=\"openfile('"+ bfile.sqldata[0].benefitfile +"');\" title=\"editer\"><span class=\"glyphicon glyphicon-open\"></span> fichier des prestations</button>");
-  }
-  $("#accmonth").on("dp.hide", function (e) {
-    set_accmonth();
-  });
-  //load_column_selection();
-}
-
-function load_accounting_table(){
-  //dump("accounting:" + JSON.stringify(pconfig) + "\n");
-  var accyear = pconfig.accmonth.substring(3,7);
-  //dump("accyear:" + accyear + "\n"); 
-  var daterangesql = "select case when strftime('%Y',date(yeardaybegin)) == '"+accyear+"' then yeardaybegin else strftime('%Y-%m-%d',date(date(yeardaybegin),'+7 days')) end as yeardaybegin,"+
-  "strftime('%Y-%m-%d',date(date(yeardayend),'+6 days')) as yeardayend "+
-  "from ( " +
-  "select case when strftime('%w','"+accyear+"-01-01') = '1' then strftime('%Y-%m-%d','"+accyear+"-01-01') else strftime('%Y-%m-%d', date(date('"+accyear+"-01-01','-7 days'),'weekday 1')) end as yeardaybegin, "+
-  "case when strftime('%w','"+accyear+"-12-31') = '1' then strftime('%Y-%m-%d','"+accyear+"-12-31') else strftime('%Y-%m-%d', date(date('"+accyear+"-12-31','-7 days'),'weekday 1')) end as yeardayend "+
-  ");";
-  var daterange = appdb.dbquery(daterangesql);
-  daterange = daterange.sqldata[0];
-  var yearmin = daterange.yeardaybegin;
-  var yearmax = daterange.yeardayend;
-  
-  var weekssql =
-  "select *,'Semaine ' || strftime('%W %Y',week1begin) || '<br/>' || strftime('%d.%m.%Y',week1begin) || '<br/>' ||  strftime('%d.%m.%Y',week1end) as week1str, "+  
-"'Semaine ' || strftime('%W %Y',week2begin) || '<br/>' || strftime('%d.%m.%Y',week2begin) || '<br/>' ||  strftime('%d.%m.%Y',week2end) as week2str, "+
-"'Semaine ' || strftime('%W %Y',week3begin) || '<br/>' || strftime('%d.%m.%Y',week3begin) || '<br/>' ||  strftime('%d.%m.%Y',week3end) as week3str, "+
-"'Semaine ' || strftime('%W %Y',week4begin) || '<br/>' || strftime('%d.%m.%Y',week4begin) || '<br/>' ||  strftime('%d.%m.%Y',week4end) as week4str, "+
-"'Semaine ' || strftime('%W %Y',week5begin) || '<br/>' || strftime('%d.%m.%Y',week5begin) || '<br/>' ||  strftime('%d.%m.%Y',week5end) as week5str,  "+
-"'Semaine ' || strftime('%W %Y',week6begin) || '<br/>' || strftime('%d.%m.%Y',week6begin) || '<br/>' ||  strftime('%d.%m.%Y',week6end) as week6str,  "+
-  "printf(\"%02d\",strftime('%W',week1begin)) as cwweek1, " +
-  "printf(\"%02d\",strftime('%W',week2begin)) as cwweek2, " +
-  "printf(\"%02d\",strftime('%W',week3begin)) as cwweek3, " +
-  "printf(\"%02d\",strftime('%W',week4begin)) as cwweek4, " +
-  "printf(\"%02d\",strftime('%W',week5begin)) as cwweek5, " +
-  "printf(\"%02d\",strftime('%W',week6begin)) as cwweek6 " +
-"from (" +
-  "select case when week1 >= '" + cdate + "' and week1 <= date('" + cdate + "','+1 month','-1 day') then week1 else null end as week1begin," +
-  "case when week1 >= '" + cdate + "' and week1 <= date('" + cdate + "','+1 month','-1 day') then date(week1,'+5 days') else null end as week1end," +
-  "case when week2 >= '" + cdate + "' and week2 <= date('" + cdate + "','+1 month','-1 day') then week2 else null end as week2begin," +
-  "case when week2 >= '" + cdate + "' and week2 <= date('" + cdate + "','+1 month','-1 day') then date(week2,'+5 days') else null end as week2end," +
-  "case when week3 >= '" + cdate + "' and week3 <= date('" + cdate + "','+1 month','-1 day') then week3 else null end as week3begin," +
-  "case when week3 >= '" + cdate + "' and week3 <= date('" + cdate + "','+1 month','-1 day') then date(week3,'+5 days') else null end as week3end,"  +
-  "case when week4 >= '" + cdate + "' and week4 <= date('" + cdate + "','+1 month','-1 day') then week4 else week4 end as week4begin," +
-  "case when week4 >= '" + cdate + "' and week4 <= date('" + cdate + "','+1 month','-1 day') then date(week4,'+5 days') else null end as week4end," +
-  "case when week5 >= '" + cdate + "' and week5 <= date('" + cdate + "','+1 month','-1 day') then week5 else null end as week5begin," +
-  "case when week5 >= '" + cdate + "' and week5 <= date('" + cdate + "','+1 month','-1 day') then date(week5,'+5 days') else null end as week5end, " +
-  "case when week6 >= '" + cdate + "' and week6 <= date('" + cdate + "','+1 month','-1 day') then week6 else null end as week6begin," +
-  "case when week6 >= '" + cdate + "' and week6 <= date('" + cdate + "','+1 month','-1 day') then date(week6,'+5 days') else null end as week6end " +
-"from (select weekdaybegin as week1, date(weekdaybegin,'+7 days') as week2, date(weekdaybegin,'+14 days') as week3, date(weekdaybegin,'+21 days') as week4, date(weekdaybegin,'+28 days') as week5, date(weekdaybegin,'+35 days') as week6 from (select case when strftime('%w','" + cdate + "') = '1' then strftime('%Y-%m-%d','" + cdate + "') else strftime('%Y-%m-%d', date(date('" + cdate + "','-7 days'),'weekday 1')) end as weekdaybegin)))";
-
-  cweeks = new Array();
-  
-  var weeks = appdb.dbquery(weekssql);
-  weeks = weeks.sqldata[0];
-  
-  
-  for (var w = 1; w < 7; w++) {
-    
-    if ((weeks["week" + w + "begin"]) && (weeks["week" + w + "begin"] != '')){
-
-      var obj = {cw:weeks["cwweek" + w],weekbegin:weeks["week" +w + "begin"],weekend:weeks["week" +w + "end"],weekheader:weeks["week" +w + "str"]};
-      cweeks.push(obj);
-    }
-  }
-  strminweek = cweeks[0].cw;
-  monthmin = cweeks[0].weekbegin;
-  monthmax = cweeks[cweeks.length-1].weekend;
-  aax = ['','mon','tue','wed','thu','fri','sat'];
-  // || ' (' || weekhourcosts || '€/h)' -- || ' (' || weeklunchcosts || '€/déj.)'+
-//   var accsql = "select planned.uuid as childuuid, planned.clientnumber as clientnumber, planned.checkservicenumber as checkservicenumber, COALESCE( planned.prename, '' ) || ' ' || COALESCE( planned.surname, '' ) AS childname, '' as presencedetails, '' as planneddetails,replace(acc.reference,'NOCHECKSERVICE:','<span style=\"color: red;\">(facture non check-service)</span><br/>') as reference, " +
-//   "case when acc.invoiceamount is not null then printf(\"%.2f\",COALESCE(acc.invoiceamount,0.00)) || '€' || case when acc.invoicedate is not null then '<br/>(' || strftime('%d.%m.%Y',acc.invoicedate) || ')' || CASE WHEN acc.reminderdate1 IS NOT NULL THEN '<br/>R1:' || strftime('%d.%m.%Y',acc.reminderdate1) ELSE '' END || CASE WHEN acc.reminderdate2 IS NOT NULL THEN '<br/>R2:' || strftime('%d.%m.%Y',acc.reminderdate2) ELSE '' END || CASE WHEN acc.reminderdate3 IS NOT NULL THEN '<br/>R3:' || strftime('%d.%m.%Y',acc.reminderdate3) ELSE '' END else '' end else '' end  as invoiced, " +
-// "case when acc.payedamount is not null then printf(\"%.2f\",COALESCE(acc.payedamount,0.00)) || '€' || case when acc.payeddate is not null then '<br/>(' || strftime('%d.%m.%Y',acc.payeddate) || ')' else '' end else '' end as payement," +
-// "'' as benefitamount," +
-// "'<button type=\"button\" class=\"btn btn-primary\" onclick=\"dlg_accounting(''' || acc.uuid || ''');\" title=\"editer\"><span class=\"glyphicon glyphicon-pencil\"></span></button>' || CASE WHEN acc.invoicefile IS NOT NULL and acc.invoicefile != '' THEN '<button type=\"button\" class=\"btn btn-primary\" onclick=\"openfile(''' || acc.invoicefile ||  ''');\" title=\"editer\"><span class=\"glyphicon glyphicon-open\"></span>'  else '' end || CASE WHEN acc.childuuid IS NOT NULL AND acc.accmonth IS NOT NULL THEN '<button type=\"button\" class=\"btn btn-danger\" onclick=\" confirm_delete_accounting(''' || acc.uuid || ''');\" title=\"supprimer\"><span class=\"glyphicon glyphicon-remove\"></span></button>' ELSE '' END AS act  " +
-// " from accounting acc join childs planned on (acc.childuuid=planned.uuid) WHERE acc.accmonth='"+ initdate.toLocaleFormat("%Y-%m-%d")+ "' and acc.reference LIKE 'NOCHECKSERVICE:%' "
-
-//   accsql += "UNION select planned.childuuid,planned.clientnumber,planned.checkservicenumber,planned.childname,d1.weekdetails as presencedetails,planned.planneddetails,d1.reference,d1.invoiced,d1.payement,d1.benefitamount,d1.act from ( " +
-//   "select childuuid,group_concat( '<span class=\"glyphicon glyphicon-calendar\"></span>:' || pcalweek || '&nbsp;<span class=\"glyphicon glyphicon-time\"></span>: ' || weekplantime , '<br/>' ) as planneddetails,clientnumber,childname,checkservicenumber from ("+
-//   "select pcalweek,childuuid,sum(monplantime) + sum(tueplantime) + sum(wedplantime) + sum(thuplantime) + sum(friplantime), sum(satplantime) as weekplantime,clientnumber,childname,checkservicenumber from ("+
-//   "select strftime(\"%W\",dd.daydate) as pcalweek, dd.daydate, ch.uuid as childuuid, ch.clientnumber, ch.prename || ' ' || ch.surname as childname, ch.checkservicenumber,";
-//   for (var d4 in aax){
-//   	  var dw4 = d4;dw4++;
-//   	  accsql += "case when strftime(\"%w\",dd.daydate) = '"+ dw4+"' then cast( ( strftime( \"%s\", "+ aax[d4]+"timeend )- strftime( \"%s\", "+ aax[d4]+"timebegin ) )/ 3600.0 AS REAL )+ case when "+ aax[d4]+"timebegin2 is not null then CAST( ( strftime( \"%s\", "+ aax[d4]+"timeend2 )- strftime( \"%s\", "+ aax[d4]+"timebegin2 ) )/ 3600.0 AS REAL ) else 0.0 end else 0.00 end as "+ aax[d4]+"plantime,";
-//   }
-//   	accsql += " null as nouse from childs ch join planning pl on ( ch.uuid = pl.childuuid ) JOIN( " ;
-//   	accsql += getdaterangesql(monthmin,monthmax);
-//   	accsql += ") dd on ( dd.daydate BETWEEN pl.datebegin AND pl.dateend ) ) group by childuuid,pcalweek ) group by childuuid) planned ";
-//  accsql += "left join ( " +
-//   "select clientnumber,checkservicenumber,childname,childuuid,group_concat( '<span class=\"glyphicon glyphicon-calendar\"></span>:' || calweek ||  '&nbsp;<span class=\"glyphicon glyphicon-time\"></span>: ' || durationweek  || '&nbsp;h&nbsp;<span class=\"glyphicon glyphicon-cutlery\"></span>: ' || lunchweek  ,'<br/>') as weekdetails, " +
-//   		//"printf(\"%.2f\",sum(weektotalhourcosts)) as monthtotalhourcosts, printf(\"%.2f\",sum(weektotallunchcosts)) as monthtotallunchcosts, printf(\"%.2f\",sum(weektotalhourcosts + weektotallunchcosts)) as monthtotalcosts," +
-//   		"invoiced,payement,benefitamount,reference, act from (SELECT childname, checkservicenumber, clientnumber,ttl.childuuid, printf(\"%02d\",calweek) as calweek, printf(\"%.2f\",sumdurationcalweek) AS durationweek, sumlunchcalweek as lunchweek, " +
-// //"printf(\"%.2f\",weekhourcosts) as weekhourcosts, printf(\"%.2f\",weeklunchcosts) as weeklunchcosts, " +
-// //"sumdurationcalweek * weekhourcosts as weektotalhourcosts, sumlunchcalweek * weeklunchcosts as weektotallunchcosts, " +
-// "case when acc.invoiceamount is not null then printf(\"%.2f\",COALESCE(acc.invoiceamount,0.00)) || '€' || case when acc.invoicedate is not null then '<br/>(' || strftime('%d.%m.%Y',acc.invoicedate) || ')' || CASE WHEN acc.reminderdate1 IS NOT NULL THEN '<br/>R1:' || strftime('%d.%m.%Y',acc.reminderdate1) ELSE '' END || CASE WHEN acc.reminderdate2 IS NOT NULL THEN '<br/>R2:' || strftime('%d.%m.%Y',acc.reminderdate2) ELSE '' END || CASE WHEN acc.reminderdate3 IS NOT NULL THEN '<br/>R3:' || strftime('%d.%m.%Y',acc.reminderdate3) ELSE '' END else '' end else '' end  as invoiced,replace(acc.reference,'NOCHECKSERVICE:','<span style=\"color: red\">(facture non check-service)</span><br/>') as reference, " +
-// "case when acc.payedamount is not null then printf(\"%.2f\",COALESCE(acc.payedamount,0.00)) || '€' || case when acc.payeddate is not null then '<br/>(' || strftime('%d.%m.%Y',acc.payeddate) || ')' else '' end else '' end as payement," +
-// "case when acc.benefitamount is not null then printf(\"%.2f\",COALESCE(acc.benefitamount,0.00)) || '€' else '' end as benefitamount," +
-// " '<button type=\"button\" class=\"btn btn-primary\" onclick=\"dlg_accounting(''' || acc.uuid || ''');\" title=\"editer\"><span class=\"glyphicon glyphicon-pencil\"></span></button>' || CASE WHEN acc.invoicefile IS NOT NULL and acc.invoicefile != '' THEN '<button type=\"button\" class=\"btn btn-primary\" onclick=\"openfile(''' || acc.invoicefile ||  ''');\" title=\"editer\"><span class=\"glyphicon glyphicon-open\"></span>'  else '' end || CASE WHEN acc.childuuid IS NOT NULL AND acc.accmonth IS NOT NULL THEN '<button type=\"button\" class=\"btn btn-primary\" onclick=\" confirm_delete_accounting(''' || acc.uuid || ''');\" title=\"supprimer\"><span class=\"glyphicon glyphicon-remove\"></span></button>' ELSE '' END AS act " +
-// "FROM ( SELECT pch.childname, pch.checkservicenumber, pch.clientnumber, pch.childuuid, px.calweek, px.sumdurationcalweek, px.sumlunchcalweek " +
-// //"CASE WHEN px.sumdurationcalweek IS NOT NULL AND pch.checkservicenumber IS NOT NULL THEN ( SELECT coalesce(wc0.costsperhour,0.00) FROM costs wc0 WHERE wc0.startdate < date('"+yearmin+"','+' || caldays || ' days') and wc0.weeklyhourslimit <= px.sumdurationcalweek ORDER BY wc0.startdate DESC,wc0.weeklyhourslimit DESC LIMIT 1 ) WHEN px.sumdurationcalweek IS NOT NULL AND pch.checkservicenumber IS NULL THEN ( SELECT coalesce(wc0.costperhourfallback,0.00) FROM costs wc0 WHERE wc0.startdate < date('"+yearmin+"','+' || caldays || ' days') and wc0.weeklyhourslimit <= px.sumdurationcalweek ORDER BY wc0.startdate DESC,wc0.weeklyhourslimit DESC LIMIT 1 ) ELSE NULL END AS weekhourcosts,"+
-// //"CASE WHEN px.sumlunchcalweek IS NOT NULL  THEN ( SELECT coalesce(wc0.dailylunchcosts,0.00) FROM costs wc0 WHERE wc0.startdate < date('"+yearmin+"','+' || caldays || ' days') and wc0.weeklyhourslimit <= px.sumdurationcalweek ORDER BY wc0.startdate DESC,wc0.weeklyhourslimit DESC LIMIT 1) ELSE NULL END AS weeklunchcosts " + 
-// "FROM ( SELECT COALESCE(ch.prename,'') || ' ' || COALESCE(ch.surname,'') AS childname,ch.uuid AS childuuid,ch.clientnumber,ch.checkservicenumber " +
-// "FROM childs ch JOIN planning pl ON ( ch.uuid=pl.childuuid) " +
-// "WHERE " +
-// "(( pl.datebegin <= DATE('"+monthmin+"') AND pl.dateend >= DATE('"+monthmax+"')) OR pl.datebegin BETWEEN '"+monthmin+"' AND '"+monthmax+"' OR pl.dateend BETWEEN '"+monthmin+"' AND '"+monthmax+"')) pch " +
-// "LEFT JOIN ( "+
-// "SELECT childuuid,calweek,case when strftime('%w',date(calyear ||'-01-01')) in ('1','2','3','4') then (cast(calweek as int)*7)-7 else (cast(calweek as int)*7) end as caldays ,"+
-// "sumlunchcalweek, coalesce(sum(monduration + tueduration + wedduration + thuduration + friduration),0.0) as sumdurationcalweek " +
-// "FROM ( SELECT childuuid, daydate,calyear, case when strftime('%w',date(calyear ||'-01-01')) in ('1','2','3','4') then case when calweek < '10' then '0' else '' end || cast(calweek as int) else calweek end as calweek," +
-// "max(monlunch) + max(tuelunch) + max(wedlunch) + max(thulunch) + max(frilunch) , max(satlunch) AS sumlunchcalweek, " +
-// "MAX(monduration) + MAX(monduration2) AS monduration, " +
-// "MAX(tueduration) + MAX(tueduration2) AS tueduration, " +
-// "MAX(wedduration) + MAX(wedduration2) AS wedduration, " +
-// "MAX(thuduration) + MAX(thuduration2) AS thuduration, " +
-// "MAX(friduration) + MAX(friduration2) AS friduration, " +
-// "MAX(satduration) + MAX(satduration2) AS satduration " +
-// "FROM ( "+
-// "SELECT childuuid, daydate, strftime('%Y',daydate) as calyear," +
-// "case when strftime('%w',daydate)='0' then strftime('%W',date(daydate,'-6 days')) else strftime('%W',date(date(daydate),'-' || strftime('%w',date(daydate)) || ' days','+1 day')) end as calweek, ";
-
-// for (var d1 in aax){
-//   var dw = d1;dw++;
-//   accsql += "CASE WHEN lunch=1 AND status IN (1,5) AND strftime('%w',daydate) = '"+dw+"' THEN 1 ELSE 0 END AS "+aax[d1]+"lunch,";
-// }
-
-// for (var d2 in aax){
-//   var dw2 = d2;dw2++;
-//   accsql += "CASE WHEN xx.status IS NOT NULL AND strftime('%w',xx.daydate) = '"+dw2+"' AND xx.daydate BETWEEN xx.datebegin AND xx.dateend THEN  CAST(( (( CAST(SUBSTR(xx."+ aax[d2]+"timeend,1,2) AS INT) *3600)+( CAST(SUBSTR(xx."+ aax[d2]+"timeend,4,2) AS INT) *60))-  ((CAST(SUBSTR(xx."+ aax[d2]+"timebegin,1,2) AS INT) *3600)+( CAST(SUBSTR(xx."+ aax[d2]+"timebegin,4,2) AS INT) *60)) ) / 3600 AS REAL)  ELSE 0.0 END AS "+ aax[d2]+"duration,";
-// }
-
-
-// for (var d3 in aax){
-//   var dw3 = d3;dw3++;
-//   accsql += "CASE WHEN xx.status IS NOT NULL AND strftime('%w',xx.daydate) = '1' AND xx.daydate BETWEEN xx.datebegin AND xx.dateend AND xx."+ aax[d3]+"timebegin2 IS NOT NULL AND xx."+ aax[d3]+"timeend2 IS NOT NULL THEN CAST(( (( CAST(SUBSTR(xx."+ aax[d3]+"timeend2,1,2) AS INT) *3600)+( CAST(SUBSTR(xx."+ aax[d3]+"timeend2,4,2) AS INT) *60))-  ((CAST(SUBSTR(xx."+ aax[d3]+"timebegin2,1,2) AS INT) *3600)+( CAST(SUBSTR(xx."+ aax[d3]+"timebegin2,4,2) AS INT) *60)) ) / 3600 AS REAL)  ELSE 0.0 END AS "+ aax[d3]+"duration2,";
-// }
-
-// accsql += "null as nouse FROM (" +
-// " select vacancydate as daydate, CAST('0' as boolean) as lunch,1 as status,pl.* from vacancy va " +
-// " left join planning pl on (va.vacancydate between pl.datebegin and pl.dateend) " + 
-// " where va.vacancydateto is null and va.vacancydate BETWEEN '"+monthmin+"' AND '"+monthmax+"' AND strftime('%w',va.vacancydate) not in ('0') " +
-// " group by va.vacancydate,pl.childuuid " +
-// " union " + 
-// " select pr.daydate,pr.lunch,pr.status,pl.* FROM presence pr " +
-// " JOIN planning pl ON ( pr.childuuid=pl.childuuid) WHERE pr.daydate BETWEEN '"+monthmin+"' AND '"+monthmax+"' "+
-// ") xx " +
-// "WHERE xx.daydate BETWEEN '"+monthmin+"' AND '"+monthmax+"') GROUP BY childuuid,calweek) GROUP BY childuuid,calweek) px " +
-// "ON ( pch.childuuid=px.childuuid) GROUP BY pch.childuuid,px.calweek ) ttl " +
-// "LEFT JOIN accounting acc ON ( ttl.childuuid = acc.childuuid AND acc.accmonth='"+ initdate.toLocaleFormat("%Y-%m-%d")+ "' where calweek is not null) group by childuuid) d1 ";
-// accsql +=  " on (planned.childuuid=d1.childuuid) order by planned.childname;";
-/* READY TO INSERT: */
-accsql = 'select plx.childuuid, plx.clientnumber, plx.checkservicenumber, plx.childname, plx.planneddetails,acc.invoiced, acc.reference,  acc.payement, acc.benefitamount, acc.act,prd.presencedetails ' +
-'from ( 	select childuuid, group_concat( \'<span class="glyphicon glyphicon-calendar"></span>:\' || pcalweek || \'&nbsp;<span class="glyphicon glyphicon-time"></span>: \' || weekplantime , 	\'<br/>\' ) as planneddetails, clientnumber, childname, checkservicenumber from (' +
-'select pcalweek, childuuid, coalesce(sum(monplantime),0.00) + coalesce(sum(tueplantime),0.00) + coalesce(sum(wedplantime),0.00) + coalesce(sum(thuplantime),0.00) + coalesce(sum(friplantime),0.00) +coalesce(sum(satplantime),0.00) as weekplantime, clientnumber, childname, checkservicenumber ' +
- 'from ( select strftime("%W", dd.daydate) as pcalweek, strftime("%w", dd.daydate) as weekday, dd.daydate, ch.uuid as childuuid, ch.clientnumber, ch.prename || \' \' || ch.surname as childname, ch.checkservicenumber, ';
-for (var i=1;i<aax.length;i++){
-  accsql += "case when strftime(\"%w\", dd.daydate) = '"+ i +"' then cast( ( strftime( \"%s\", "+aax[i]+"timeend )- strftime( \"%s\", "+aax[i]+"timebegin ) )/ 3600.0 AS REAL )+ case when "+aax[i]+"timebegin2 is not null then CAST( ( strftime( \"%s\", "+aax[i]+"timeend2 )- strftime( \"%s\", "+aax[i]+"timebegin2 ) )/ 3600.0 AS REAL ) else 0.0 end else 0.00 end as "+aax[i]+"plantime, ";
-}
- accsql +=  'null as nouse ' +
-  'from planning pl left join childs ch on ( pl.childuuid = ch.uuid) JOIN( ' ;
-  accsql += getdaterangesql(monthmin,monthmax);
-accsql += ') dd on ( dd.daydate BETWEEN pl.datebegin AND pl.dateend )  group by datebegin,dateend,childuuid,daydate ) group by pcalweek,childuuid ) planned group by childuuid ) plx ';
-accsql += " left join ( select a2.childuuid, a2.nocheckservice," +
-   "coalesce(printf(\"%.2f €\",a2.invoiceamount), 0.00) || coalesce (strftime('<br/> %d.%m.%Y', a2.invoicedate),'') || coalesce(', R1: ' || strftime('%d.%m.%Y', a2.reminderdate1),'') || coalesce(', R2: ' || strftime('%d.%m.%Y', a2.reminderdate2),'') || coalesce(', R3: ' || strftime('%d.%m.%Y', a2.reminderdate3),'') 	as invoiced, a2.reference, "+
-	"coalesce(printf(\"%.2f €\",a2.payedamount), 0.00) || coalesce (strftime('<br/> %d.%m.%Y', a2.payeddate),'') as payement,"+
-	"coalesce(printf(\"%.2f €\",a2.benefitamount), 0.00) as benefitamount," +
-	"'<button type=\"button\" class=\"btn btn-primary\" onclick=\"dlg_accounting(''' || a2.uuid || ''');\" title=\"editer\"><span class=\"glyphicon glyphicon-pencil\"></span></button>' || CASE WHEN a2.invoicefile IS NOT NULL and a2.invoicefile != '' THEN '<button type=\"button\" class=\"btn btn-primary\" onclick=\"openfile(''' || a2.invoicefile || ''');\" title=\"editer\"><span class=\"glyphicon glyphicon-open\"></span>' else '' end || "+
-	"CASE WHEN a2.childuuid IS NOT NULL AND a2.accmonth IS NOT NULL THEN '<button type=\"button\" class=\"btn btn-primary\" onclick=\" confirm_delete_accounting(''' || a2.uuid || ''');title=\"supprimer\"><span class=\"glyphicon glyphicon-remove\"></span></button>' " +
-	" ELSE '' END AS act from accounting a2 " +
- " where a2.accmonth = '"+ initdate.toISOString().substring(0,10)+"' ) acc on (plx.childuuid=acc.childuuid) left join (" +
-"select childuuid, group_concat( '<span class=\"glyphicon glyphicon-calendar\"></span>:' || calweek || '&nbsp;<span class=\"glyphicon glyphicon-time\"></span>: ' || weekduration || '&nbsp;<span class=\"glyphicon glyphicon-cuterly\"></span>: ' || weeklunch,'<br/>') as presencedetails from ( "+
-"select childuuid, calweek, monlunch + tuelunch + wedlunch + thulunch + frilunch + satlunch  as weeklunch, "+
-"monduration + tueduration + wedduration + thuduration + friduration + satduration + monduration2 + tueduration2 + wedduration2 + thuduration2 + friduration2 + satduration2 as weekduration " +
-" from (	" +	 "select childuuid,daydate,strftime('%Y', daydate) as calyear, " +
- "case when strftime('%w', daydate)= '0' then strftime('%W', date(daydate, '-6 days')) else strftime('%W', date(date(daydate), '-' || strftime('%w', date(daydate)) || ' days', '+1 day')) end as calweek, ";
- for (var i=1;i<aax.length;i++){
-  accsql += "CASE WHEN lunch = 1 AND status IN (1, 5) AND strftime('%w', daydate) = '"+ i +"' THEN 1 ELSE 0 END AS "+ aax[i]+"lunch, ";
- }
- for (var i=1;i<aax.length;i++){
-  accsql += "CASE WHEN status IS NOT NULL AND strftime('%w', daydate) = '"+ i +"'  THEN CAST(( (( coalesce(CAST(SUBSTR(endtime1, 1, 2) AS INT),0) * 3600)+( coalesce(CAST(SUBSTR(endtime1, 4, 2) AS INT),0) * 60))- ((coalesce(CAST(SUBSTR(begintime1, 1, 2) AS INT),0) * 3600)+( coalesce(CAST(SUBSTR(begintime1, 4, 2) AS INT),0) * 60)) ) / 3600 AS REAL) ELSE 0.0 END AS "+ aax[i]+"duration, ";
-  accsql += "CASE WHEN status IS NOT NULL AND strftime('%w', daydate) = '"+ i +"'  THEN CAST(( (( coalesce(CAST(SUBSTR(endtime2, 1, 2) AS INT),0) * 3600)+( coalesce(CAST(SUBSTR(endtime2, 4, 2) AS INT),0) * 60))- ((coalesce(CAST(SUBSTR(begintime2, 1, 2) AS INT),0) * 3600)+( coalesce(CAST(SUBSTR(begintime2, 4, 2) AS INT),0) * 60)) ) / 3600 AS REAL) ELSE 0.0 END AS "+ aax[i]+"duration2, ";
- }
- accsql +=  " null as nouse from presence where daydate between '"+monthmin+"' and '"+monthmax+"' ) prx group by calweek,childuuid ) prx2 group by childuuid ) prd on (prd.childuuid=acc.childuuid);";
-
-  jsdump("ACCMONTH" + accsql);
-  var accdata = appdb.dbquery(accsql);
-  jsdump(accdata);
-  //numchilds = accdata.sqldata.length;
-  var headerdata = [];
-  headerdata = getlabelswithkey("clientnumber,checkservicenumber,childname,presencedetails,planneddetails,reference,invoiced,payement,benefitamount,act");
-  //monthtotalhourcosts,monthtotallunchcosts,monthtotalcosts,
-  $("#tbl_accounting").html("");
-  //var hrow = [];
-  //hrow = headerdata;
-  //var tdclass= new Array();
-  var tblheader = '<tr>';
-  //dump("Headerdata:" + JSON.stringify(headerdata) + "\n")
-  for (var h in headerdata){
-    if ((headerdata[h].keyname == 'act') && (headerdata[h].class.indexOf('action1btn') == -1)){
-      headerdata[h].class +=" action1btn";
-    }
-    //if ((pconfig.hidden_columns) && (pconfig.hidden_columns.indexOf(headerdata[h].keyname) != -1)) {
-    //  if (headerdata[h].class.indexOf('colhidden') == -1) {
-    //    headerdata[h].class += " colhidden"; 
-    //  }
-    //}else {
-      headerdata[h].class.replace("colhidden","");
-    //}
-    tblheader += '<th class="' + headerdata[h].class +'">'+ headerdata[h].title+'</th>';
-
-  }
-  tblheader += '</tr>';
-  //tblh0 += '</tr>';
-  tblacc = null;
-  //dump("\n\nTBL header: " + tblheader + "\n\n\n");
-  $("#tbl_accounting").append("<thead>" + tblheader + "</thead>");
-  $("#tbl_accounting").append("<tfoot>" + tblheader + "</tfoot>");
-  $("#tbl_accounting").append("<tbody>");
- 
-  var curchld = "";
-
-  
-  for (var i in accdata.sqldata){
-    var row = accdata.sqldata[i];
-    
-        var tr = '<tr>';
-        tr += '<td>' + row.clientnumber + '</td>';
-        tr += '<td>' + row.checkservicenumber + '</td>';
-        tr += '<td>' + row.childname + '</td>';
-        tr += '<td class="noprint infoweek">' + row.presencedetails + '</td>';
-        tr += '<td class="noprint infoweek">' + row.planneddetails + '</td>';
-        tr += '<td>' + row.reference + '</td>';
-        //tr += '<td class="alignright totalwidth'+ (((pconfig.hidden_columns) && (pconfig.hidden_columns.indexOf('monthtotalhourcosts') != -1))?" noprint colhidden":"") +'">' + row.monthtotalhourcosts + '€</td>';
-        //tr += '<td class="alignright totalwidth'+ (((pconfig.hidden_columns) && (pconfig.hidden_columns.indexOf('monthtotallunchcosts') != -1))?" noprint colhidden":"") +'">' + row.monthtotallunchcosts + '€</td>';
-        //tr += '<td class="alignright totalwidth'+ (((pconfig.hidden_columns) && (pconfig.hidden_columns.indexOf('monthtotalcosts') != -1))?" noprint colhidden":"") +'">' + row.monthtotalcosts + '€</td>';
-        tr += '<td class="alignright ">' + row.invoiced + '</td>';
-        tr += '<td class="alignright ">' + row.payement + '</td>';
-        tr += '<td class="alignright totalwidth ">' + row.benefitamount + '</td>';
-        tr += '<td class="noprint">' + row.act + '</td></tr>';
-        $("#tbl_accounting").append(tr);
-
-    }
-    
-  $("#tbl_accounting").append("</tbody>");
-  
-
-  tblacc = $("#tbl_accounting").dataTable({
-        "language": {
-          "url": "../../web/js/locale/datatable_fr.json"
-        },
-        "paging":   false,
-        "ordering": true,
-        "bAutoWidth": false,
-        "scrollY": winh + "px",
-        "scrollCollapse": true,
-        "info":     false,
-        "filter": true,
-        "destroy": true,
-        "footerCallback": function ( row, data, start, end, display ) {
-         var api = this.api(), data;
-
-            var intVal = function ( i ) {
-                return typeof i === 'string' ?
-                    i.substring(0,i.indexOf("\€"))*1 :
-                    typeof i === 'number' ?
-                        i : 0;
-            };
-            
-            //hTotal = api
-            //    .column( 2, { page: 'current'} )
-            //    .data()
-            //    .reduce( function (a, b) {
-            //        return intVal(a) + intVal(b);
-            //    }, 0 );
-            
-            //lTotal = api
-            //    .column( 3, { page: 'current'} )
-            //    .data()
-            //    .reduce( function (a, b) {
-            //        return intVal(a) + intVal(b);
-            //    }, 0 );
-            fTotal =  api
-                .column( 6, { page: 'current'} )
-                .data()
-                .reduce( function (a, b) {
-                    return intVal(a) + intVal(b);
-                }, 0 );
-            pTotal =  api
-                .column( 7, { page: 'current'} )
-                .data()
-                .reduce( function (a, b) {
-                    return intVal(a) + intVal(b);
-                }, 0 );
-            bTotal =  api
-                .column( 8, { page: 'current'} )
-                .data()
-                .reduce( function (a, b) {
-                    return intVal(a) + intVal(b);
-                }, 0 );
-            //pageTotal = api
-            //    .column( 4, { page: 'current'} )
-            //    .data()
-            //    .reduce( function (a, b) {
-            //        return intVal(a) + intVal(b);
-            //    }, 0 );
- 
-            // Update footer
-            $( api.column( 6 ).footer() ).html(
-                ''+fTotal.toFixed(2) +' €' 
-            );
-            $( api.column( 7 ).footer() ).html(
-                ''+pTotal.toFixed(2) +' €' 
-            );
-            $( api.column( 8 ).footer() ).html(
-                ''+bTotal.toFixed(2) +' €' 
-            );
-            //$( api.column( 4 ).footer() ).html(
-            //    ''+pageTotal.toFixed(2) +' €' 
-            //);
-            // $( api.column( 3 ).footer() ).html(
-            //    ''+lTotal.toFixed(2) +' €' 
-            //);
-            //$( api.column( 2 ).footer() ).html(
-            //    ''+hTotal.toFixed(2) +' €' 
-            //);
-        }
-      });
-
-//  $('#tbl_accounting').on( 'search.dt', function () {
-//    
-//    pconfig.filter = tblacc.api().search();
-//
-//    apppref.setpreference("pageconfig.accounting",pconfig);
-//  } );
-
-  $('#tbl_accounting').on( 'order.dt', function () {
-    pconfig.order= tblacc.fnSettings().aaSorting;
- 
-    apppref.setpreference("pageconfig.accounting",pconfig);
-    
-  } );
-  
-//  if (pconfig.filter) {
-//    tblacc.fnFilter(pconfig.filter);
-//  }
-  if (pconfig.order) {
-    //tblacc.fnDraw();
-    tblacc.fnSort(pconfig.order);
-  }
-  //tblacc.fnAdjustColumnSizing();
-  
-  
-
-$('#tbl_accounting tbody').on( 'click', 'tr', function () {
-        if ( $(this).hasClass('selected') ) {
-            //$(this).removeClass('selected');
-        }
-        else {
-            tblacc.$('tr.selected').removeClass('selected');
-            $(this).addClass('selected');
-        }
-    } );
- 
-}
-
-function getdaterangesql(xmonthmin,xmonthmax){
-	  var adays = [];
-	  
-	  var bdate = new Date(xmonthmin);
-	  var bend = new Date(xmonthmax);
-	  for (var cdt = bdate; cdt <= bend; cdt.setDate(cdt.getDate() + 1)) {
-	    if ((cdt.getDay() !== 0) ){
-	      adays.push("select date('" + cdt.toLocaleFormat('%Y-%m-%d') + "') as daydate");
-	    }
-	    
-	  }
-	  return adays.join(" UNION ");
-	}
-
-
-function set_accmonth(){
-  pconfig.accmonth = $('#accmonth').val();
-
-  apppref.setpreference("pageconfig.accounting",pconfig);
-      globelreq.send_request({
-            page: 'accounting',
-            module: 'accounting',
-            data: null,
-            header: 'Décompte par mois'
-      });
-}
-
-function confirm_delete_accounting(duuid) {
-  delacc.uuid = duuid;
-  $('#confirm_delete_accounting').modal('show');
-}
-
-function delete_accounting() {
-  var xsql = "DELETE FROM accounting where uuid='"+ delacc.uuid+"';";
-
-  appdb.dbexec(xsql);
-  load_accounting_table();
-  delacc ={};
-  
-  $('#confirm_delete_accounting').modal('hide');
-}
-
-function dlg_accounting(myuuid){
-  
-  //alert("TEST");
-  var acc1sql = "SELECT acc.uuid,acc.accmonth,ch.uuid as childuuid,COALESCE( ch.prename, '' ) || ' ' || COALESCE( ch.surname, '' ) || '(' || ch.checkservicenumber || ')' AS childname,case when acc.invoicedate is not null then strftime('%d.%m.%Y',acc.invoicedate) else null end as invoicedate, case when acc.payeddate is not null then strftime('%d.%m.%Y',acc.payeddate) else null end as payeddate, payedamount, invoiceamount,benefitamount, replace(acc.reference,'NOCHECKSERVICE:','') as reference, instr(acc.reference,'NOCHECKSERVICE:') as ischeckservice, case when acc.reminderdate1 is not null then strftime('%d.%m.%Y',acc.reminderdate1) else null end as reminderdate1, case when acc.reminderdate2 is not null then strftime('%d.%m.%Y',acc.reminderdate2) else null end as reminderdate2, case when acc.reminderdate3 is not null then strftime('%d.%m.%Y',acc.reminderdate3) else null end as reminderdate3, case when acc.invoicefile is not null and acc.invoicefile != '' then '"+ importpath.path + system.sep() +"' || acc.invoicefile else null end as invoicefile,'upd' as action FROM accounting acc join childs ch on (ch.uuid=acc.childuuid) where acc.uuid = '"+ myuuid+"';";
- 
-  //jsdump(acc1sql);
-  var acc1data = appdb.dbquery(acc1sql);
-  
-  if (!acc1data.sqldata) {
-    return false;
-    //acc1sql = "SELECT '0' as uuid,'"+ childuuid+"' as childuuid, 1 as ischeckservice, null as invoicedate, null as payeddate, null as payedamount, null as invoiceamount, null as reference,null as benefitamount, null as reminderdate1, null as reminderdate2, null as reminderdate3, null as invoicefile, 'ins' as action;";
-    //acc1data = appdb.dbquery(acc1sql);
-  }
-  acc1data = acc1data.sqldata[0];
-  $("#frmeditaccounting #uuid").val(acc1data.uuid);
-  if (acc1data.ischeckservice > 0){
-    $("#frmeditaccounting #nocheckservice").prop("checked",true);
-  } else {
-    $("#frmeditaccounting #nocheckservice").prop("checked",false);
-  }
-  for (var a in acc1data){
-
-    if ($("#frmeditaccounting #" +a)) {
- 
-      $("#frmeditaccounting #"+a).val(acc1data[a]);
-    }
-  }
-  $("#edit_accounting").modal('show');
-  
-}
-
-function save_accounting(){
-
-  var sql2 = new Array();
-  //var type = 'upd';
-  // if (type == 'ins'){
-  //   sql1.push('"accmonth"');
-  //   sql2.push("'" + initdate.toLocaleFormat('%Y-%m-%d') +"'");
-  // }
-  $("#frmeditaccounting :input").each(function(){
-    var input = $(this);
-    if (input.attr("id") ){
-      // if ((type == 'ins') && (input.attr("id") != 'action')) {
-      //   sql1.push('"' + input.attr("id") + '"');
-      //   if (input.attr("type") == "file") {
-      //     if (!system.fileexists(importpath.path)){
-      //       importpath.create(1,0755);
-      //     }
-      //     var newlocation= importpath.path + system.sep() + system.getFileName(input.val());
-      //     OS.File.copy(input.val(), newlocation);
-      //   }
-      //   var ival = encodeparam(input.val(),input.attr('type'));
-      //   sql2.push(ival);
-      // }
-     //else {
-        if ((input.attr("type") != 'hidden')  && (input.attr("id") != 'childname') && (input.attr("id") != 'ischeckservice'))  {
-          if (input.attr("type") == "file") {
-            if (system.getDirectory(input.val()) != importpath.path) {
-              var newlocation= importpath.path + system.sep() + system.getFileName(input.val());
-              OS.File.copy(input.val(), newlocation);
-            }
-          }
-          var ival = input.val();
-          if ((input.attr("id") == 'reference') && $("#frmeditaccounting #ischeckservice").is(":checked")){
-            ival = "NOCHECKSERVICE:" + ival;
-          }
-          
-          var ival = encodeparam(ival,input.attr('type'));
-          if (input.attr("id") == 'invoicedate'){
-            var newaccmonth = ival.replace(/'/g,"");
-            sql2.push('"accmonth"=\'' + newaccmonth.substring(0,4) + "-" + newaccmonth.substring(5,7) +"-01'");
-          }
-          sql2.push('"' + input.attr("id") +'"='+ ival);
-
-        }
-      }
-    });
-  var xsql = "UPDATE accounting SET "+sql2.join(',')+" where \"uuid\"='" + $("#frmeditaccounting #uuid").val() + "';";
-  //}
-  // else {
-  //   xsql = "INSERT INTO accounting ("+sql1.join(',')+") VALUES ("+sql2.join(',')+");"; 
-  // }
-
-  appdb.dbexec(xsql);
-  load_accounting_table();
-  $("#frmeditaccounting #uuid").val("0");
-  $("#edit_accounting").modal('hide');
-}
-
-function openfile(fi){
-  var ddir = system.getDirectory(appdb.dbFile.path);
-  var ff = system.openFile(ddir +  system.sep() + 'imports' + system.sep() + crecheuuid +system.sep() + fi);
-}
-
-function onnextmonth() {
-  pconfig.accmonth = $('#accmonth').val();
-
-  
-  var tmpmonth = new Date(encodeparam(pconfig.accmonth, 'month').replace(/'/g, ''));
-  var nmonth = new Date(tmpmonth.getFullYear(), tmpmonth.getMonth() + 1, tmpmonth.getDate());
-  pconfig.accmonth = nmonth.toLocaleFormat('%m.%Y');
-  apppref.setpreference("pageconfig.accounting",pconfig);
-      globelreq.send_request({
-            page: 'accounting',
-            module: 'accounting',
-            data: null,
-            header: 'Décompte par mois'
-      });
-}
-
-function onpreviousmonth() {
-  pconfig.accmonth = $('#accmonth').val();
-  var tmpmonth = new Date(encodeparam(pconfig.accmonth, 'month').replace(/'/g, ''));
-  var nmonth = new Date(tmpmonth.getFullYear(), tmpmonth.getMonth() - 1, tmpmonth.getDate());
-  pconfig.accmonth = nmonth.toLocaleFormat('%m.%Y');
-  apppref.setpreference("pageconfig.accounting",pconfig);
-      globelreq.send_request({
-            page: 'accounting',
-            module: 'accounting',
-            data: null,
-            header: 'Décompte par mois'
-      });
-}
-
-function generatecsv(){
-	var lastdir = '';
-	if (pconfig.lastdir){
-		lastdir = pconfig.lastdir;
-	}
-	var expfolder = system.selectdirectory(lastdir,"Sélection dossier!");
-	//dump("EXPFOLDER:" + expfolder);
-	if (!expfolder){
-		return;
-	}else {
-		pconfig.lastdir = expfolder.path;
-		apppref.setpreference("pageconfig.accounting",pconfig);
-	}
-	var val = $("#accmonth").val();
-	var cdate = new Date();
-	var accsql = "select planned.childuuid,planned.checkservicenumber,planned.pcalweek,replace(printf(\"%.2f\",COALESCE(planned.weekplantime,0.00)),'.',',') as weekplantime,d1.calweek,replace(printf(\"%.2f\",COALESCE(d1.durationweek,0.00)),'.',',') as durationweek,COALESCE(d1.lunchweek,0) as lunchweek from ( " +
-	  "select checkservicenumber || '-' || pcalweek as idjoin,childuuid,pcalweek, weekplantime,checkservicenumber from ("+
-	  "select pcalweek,childuuid,sum(monplantime) + sum(tueplantime) + sum(wedplantime) + sum(thuplantime) + sum(friplantime) as weekplantime,checkservicenumber from ("+
-	  "select strftime(\"%W\",dd.daydate) as pcalweek, dd.daydate, ch.uuid as childuuid, ch.checkservicenumber,";
-	  for (var d4 in aax){
-	  	  var dw4 = d4;dw4++;
-	  	  accsql += "case when strftime(\"%w\",dd.daydate) = '"+ dw4+"' then cast( ( strftime( \"%s\", "+ aax[d4]+"timeend )- strftime( \"%s\", "+ aax[d4]+"timebegin ) )/ 3600.0 AS REAL )+ case when "+ aax[d4]+"timebegin2 is not null then CAST( ( strftime( \"%s\", "+ aax[d4]+"timeend2 )- strftime( \"%s\", "+ aax[d4]+"timebegin2 ) )/ 3600.0 AS REAL ) else 0.0 end else 0.00 end as "+ aax[d4]+"plantime,";
-	  }
-	  	accsql += " null as nouse from childs ch join planning pl on ( ch.uuid = pl.childuuid ) JOIN( " ;
-	  	accsql += getdaterangesql(monthmin,monthmax);
-	  	accsql += ") dd on ( dd.daydate BETWEEN pl.datebegin AND pl.dateend ) ) group by childuuid,pcalweek ) group by childuuid,pcalweek) planned ";
-	 accsql += "left join ( " +
-	  "select checkservicenumber || '-' || calweek as idjoin,checkservicenumber,childuuid, calweek , durationweek  , lunchweek " +
-	  		" from (SELECT checkservicenumber,ttl.childuuid,calweek, sumdurationcalweek AS durationweek, sumlunchcalweek as lunchweek " +
-
-	
-	"FROM ( SELECT  pch.checkservicenumber, pch.childuuid, px.calweek, px.sumdurationcalweek, px.sumlunchcalweek " +
-	//"CASE WHEN px.sumdurationcalweek IS NOT NULL AND pch.checkservicenumber IS NOT NULL THEN ( SELECT coalesce(wc0.costsperhour,0.00) FROM costs wc0 WHERE wc0.startdate < date('"+yearmin+"','+' || 
-	"FROM ( SELECT ch.uuid AS childuuid,ch.checkservicenumber " +
-	"FROM childs ch JOIN planning pl ON ( ch.uuid=pl.childuuid) " +
-	"WHERE " +
-	"(( pl.datebegin <= DATE('"+monthmin+"') AND pl.dateend >= DATE('"+monthmax+"')) OR pl.datebegin BETWEEN '"+monthmin+"' AND '"+monthmax+"' OR pl.dateend BETWEEN '"+monthmin+"' AND '"+monthmax+"')) pch " +
-	"LEFT JOIN ( "+
-	"SELECT childuuid,calweek,case when strftime('%w',date(calyear ||'-01-01')) in ('1','2','3','4') then (cast(calweek as int)*7)-7 else (cast(calweek as int)*7) end as caldays ,"+
-	"sumlunchcalweek, coalesce(sum(monduration + tueduration + wedduration + thuduration + friduration),0.0) as sumdurationcalweek " +
-	"FROM ( SELECT childuuid, daydate,calyear, case when strftime('%w',date(calyear ||'-01-01')) in ('1','2','3','4') then case when calweek < '10' then '0' else '' end || cast(calweek as int) else calweek end as calweek," +
-	"max(monlunch) + max(tuelunch) + max(wedlunch) + max(thulunch) + max(frilunch) AS sumlunchcalweek, " +
-	"MAX(monduration) + MAX(monduration2) AS monduration, " +
-	"MAX(tueduration) + MAX(tueduration2) AS tueduration, " +
-	"MAX(wedduration) + MAX(wedduration2) AS wedduration, " +
-	"MAX(thuduration) + MAX(thuduration2) AS thuduration, " +
-	"MAX(friduration) + MAX(friduration2) AS friduration " +
-	"FROM ( "+
-	"SELECT childuuid, daydate, strftime('%Y',daydate) as calyear," +
-	"case when strftime('%w',daydate)='0' then strftime('%W',date(daydate,'-6 days')) else strftime('%W',date(date(daydate),'-' || strftime('%w',date(daydate)) || ' days','+1 day')) end as calweek, ";
-
-	for (var d1 in aax){
-	  var dw = d1;dw++;
-	  accsql += "CASE WHEN lunch=1 AND status IN (1,5) AND strftime('%w',daydate) = '"+dw+"' THEN 1 ELSE 0 END AS "+aax[d1]+"lunch,";
-	}
-
-	for (var d2 in aax){
-	  var dw2 = d2;dw2++;
-	  accsql += "CASE WHEN xx.status IS NOT NULL AND strftime('%w',xx.daydate) = '"+dw2+"' AND xx.daydate BETWEEN xx.datebegin AND xx.dateend THEN  CAST(( (( CAST(SUBSTR(xx."+ aax[d2]+"timeend,1,2) AS INT) *3600)+( CAST(SUBSTR(xx."+ aax[d2]+"timeend,4,2) AS INT) *60))-  ((CAST(SUBSTR(xx."+ aax[d2]+"timebegin,1,2) AS INT) *3600)+( CAST(SUBSTR(xx."+ aax[d2]+"timebegin,4,2) AS INT) *60)) ) / 3600 AS REAL)  ELSE 0.0 END AS "+ aax[d2]+"duration,";
-	}
-
-
-	for (var d3 in aax){
-	  var dw3 = d3;dw3++;
-	  accsql += "CASE WHEN xx.status IS NOT NULL AND strftime('%w',xx.daydate) = '1' AND xx.daydate BETWEEN xx.datebegin AND xx.dateend AND xx."+ aax[d3]+"timebegin2 IS NOT NULL AND xx."+ aax[d3]+"timeend2 IS NOT NULL THEN CAST(( (( CAST(SUBSTR(xx."+ aax[d3]+"timeend2,1,2) AS INT) *3600)+( CAST(SUBSTR(xx."+ aax[d3]+"timeend2,4,2) AS INT) *60))-  ((CAST(SUBSTR(xx."+ aax[d3]+"timebegin2,1,2) AS INT) *3600)+( CAST(SUBSTR(xx."+ aax[d3]+"timebegin2,4,2) AS INT) *60)) ) / 3600 AS REAL)  ELSE 0.0 END AS "+ aax[d3]+"duration2,";
-	}
-
-	accsql += "null as nouse FROM (" +
-	" select vacancydate as daydate, CAST('0' as boolean) as lunch,1 as status,pl.* from vacancy va " +
-	" left join planning pl on (va.vacancydate between pl.datebegin and pl.dateend) " + 
-	" where va.vacancydateto is null and va.vacancydate BETWEEN '"+monthmin+"' AND '"+monthmax+"' AND strftime('%w',va.vacancydate) not in ('0','6') " +
-	" group by va.vacancydate,pl.childuuid " +
-	" union " + 
-	" select pr.daydate,pr.lunch,pr.status,pl.* FROM presence pr " +
-	" JOIN planning pl ON ( pr.childuuid=pl.childuuid) WHERE pr.daydate BETWEEN '"+monthmin+"' AND '"+monthmax+"' "+
-	") xx " +
-	"WHERE xx.daydate BETWEEN '"+monthmin+"' AND '"+monthmax+"') GROUP BY childuuid,calweek) GROUP BY childuuid,calweek) px " +
-	"ON ( pch.childuuid=px.childuuid) GROUP BY pch.childuuid,px.calweek ) ttl " +
-	"LEFT JOIN accounting acc ON ( ttl.childuuid = acc.childuuid AND acc.accmonth='"+ initdate.toLocaleFormat("%Y-%m-%d")+ "') where calweek is not null) group by childuuid,calweek) d1 ";
-	accsql +=  " on (d1.idjoin=planned.idjoin) order by planned.childuuid,planned.pcalweek;";
-
-	 dump("EXPSQL:" + accsql + "\n");
-	
-	var expdbdata = appdb.dbquery(accsql);
-	//dump(JSON.stringify(expdbdata));
-	numchilds = $("#tbl_accounting tbody tr").length -1;
-	var idchkserv = ccreche.sqldata[0].idcheckservice;
-	dump(JSON.stringify(cweeks) + "\n");
-	var wlen = cweeks.length;
-	var expdata = "E;"+ val.substring(3,7) + ";" + parseInt(val.substring(0,2)) + ";" + wlen + ";" + numchilds + ";" + cdate.toLocaleFormat('%d%m%Y') + ";;;;;;;;;;;;\r\n";
-	//expdata += "P;"+ ccreche.sqldata[0].idcheckservice +";"+";;;;;;;;;;;;;;;";
-	var minweek = cweeks[0].cw;
-	var expchild = "";
-	var cntweek = 0;
-	var objrow = {};
-	var allobjects = []
-	for (var r in expdbdata.sqldata){
-		var row = expdbdata.sqldata[r];
-		if (expchild != row.childuuid){
-			if (expchild != ""){
-				allobjects.push(objrow);
-
-			}
-			objrow = new Object();
-			objrow["cs"] = row.checkservicenumber;
-			objrow["weeks"] = {};
-			for (var w in cweeks){
-				objrow["weeks"][cweeks[w].cw] = {"time":"0,00","lunch":"0"};
-			}
-			expchild = row.childuuid;
-//			if (r != numchilds-1){
-//				expdata += "P;" + idchkserv + ";" + row.checkservicenumber + ";";
-//			}
-		}
-		
-		objrow["weeks"][row.pcalweek]["time"] = ((row.durationweek == '' || row.weekplantime > row.durationweek)?row.weekplantime:row.durationweek);
-		objrow["weeks"][row.pcalweek]["lunch"] = ((row.lunchweek == '')?0:row.lunchweek); 
-//		
-		
-	
-		
-		//expdata += "P;"+ ccreche.sqldata[0].idcheckservice +";"+";;;;;;;;;;;;;;;";
-	}
-	for (var o in allobjects){
-		var obj = allobjects[o];
-		expdata += "P;" + idchkserv + ";"+ obj.cs + ";";
-		for (var w in obj.weeks){
-			expdata += obj.weeks[w].time + ";" + obj.weeks[w].lunch + ";"; 
-		} 
-		if (wlen == 3){
-			expdata += "0,00;0;0,00;0;";
-		}
-		if (wlen == 4){
-			expdata += "0,00;0;";
-		}
-		expdata += "0,00;;0,00;0,00;0,00\r\n";
-		//dump(key(allobjects[0]) + "\n");
-	}
-	//dump(JSON.stringify(allobjects) + "\n");
-	system.WriteTextFile(expdata,expfolder.path + system.sep() + val + "_export_checkservice.csv");
-	//dump(expdata);
-}
-
-function openmonthlypdf(){
-	  dump("PDF to Open: " + mpdffile + "\n");
-	  var ff = system.openFile(mpdffile);
-}
-
diff --git a/modules/accounting/js/accountingchild.js b/modules/accounting/js/accountingchild.js
deleted file mode 100644
index f77193a..0000000
--- a/modules/accounting/js/accountingchild.js
+++ /dev/null
@@ -1,633 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg ) 
-
-var pconfig = {};
-var winh= window.innerHeight -170;
-var tblacc = null;
-var curchilduuid = '';
-var crecheuuid = null;
-var importpath = null;
-var delacc = {};
-//var lictype = apppref.getpreference("support.lictype");
-
-function initdata(){
-  curcfg.loadconfig(apppref.getpreference("support.database.currentdb.num"));
-  load_helpers();
-  var configdata = apppref.getpreference("pageconfig.accountingchild");
-  if (configdata != '') {
-    pconfig = JSON.parse(configdata);
-  }
-  if (!pconfig.printlayout) {
-    pconfig.printlayout = 'list';
-    apppref.setpreference("pageconfig.accountingchild",pconfig);
-  }
-  var ccreche = appdb.dbquery("select uuid from creche LIMIT 1;");
-  crecheuuid = ccreche.sqldata[0].uuid;
-  importpath = FileUtils.File(curcfg.path.local  + system.sep() +"imports" + system.sep() + crecheuuid);
-  //check_accountingtable();
-  load_childlist();
-  if (pconfig.accchild) {
-  //  
-
-    $("#accchild").val(pconfig.accchild);
-  }else {
-    $("#accchild").val($("#accchild option:first").val());
-    pconfig.accchild=$("#accchild option:first").val();
-  }
-  if (!pconfig.accyear){
-    pconfig.accyear=new Date().toLocaleFormat("%Y");
-    apppref.setpreference("pageconfig.accountingchild",pconfig);
-  }
-  //if (lictype != "free"){
-  //  $("#mnuacc").css({"position":"absolute","z-index":"1000"});
-  //}
-  set_selectyears();
-  ////cdate = initdate.toLocaleFormat('%Y-%m-%d');
-  set_infoheader($("#accchild option:selected").text() + " Année:" + pconfig.accyear);
-  //load_column_selection();
-  load_accounting_table();
-  
-}
-
-
-
-function load_accounting_table(){
-  //dump("accountingchild: " + JSON.stringify(pconfig) + "\n");
-  // var daterangesql = "select case when strftime('%Y',date(yeardaybegin)) == '"+pconfig.accyear+"' then yeardaybegin else strftime('%Y-%m-%d',date(date(yeardaybegin),'+7 days')) end as yeardaybegin,"+
-  // "strftime('%Y-%m-%d',date(date(yeardayend),'+6 days')) as yeardayend "+
-  // "from ( " +
-  // "select case when strftime('%w','"+pconfig.accyear+"-01-01') = '1' then strftime('%Y-%m-%d','"+pconfig.accyear+"-01-01') else strftime('%Y-%m-%d', date(date('"+pconfig.accyear+"-01-01','-7 days'),'weekday 1')) end as yeardaybegin, "+
-  // "case when strftime('%w','"+pconfig.accyear+"-12-31') = '1' then strftime('%Y-%m-%d','"+pconfig.accyear+"-12-31') else strftime('%Y-%m-%d', date(date('"+pconfig.accyear+"-12-31','-7 days'),'weekday 1')) end as yeardayend "+
-  // ");";
-  // var daterange = appdb.dbquery(daterangesql);
-  // daterange = daterange.sqldata[0];
-  // var yearmin = daterange.yeardaybegin;
-  // var yearmax = daterange.yeardayend;
-  
-  
-  // var chbornes = appdb.dbquery("select min(daydate) as mindate,max(daydate) as maxdate from presence where strftime('%Y',daydate)='" + pconfig.accyear + "' and childuuid='" + pconfig.accchild + "';");
-  
-  // var monthmin= chbornes.sqldata[0].mindate;
-  // var monthmax= chbornes.sqldata[0].maxdate;
-  var accsql = "select strftime('%m.%Y', acc.accmonth) as calmonth," +
-  "case when nocheckservice = '1' then '<span style=\"color: red;\">(facture non check-service)</span><br/>' else '' end || acc.reference as reference, "+
-   " case when acc.invoiceamount is not null then printf(\"%.2f\",  COALESCE(acc.invoiceamount,  0.00)) || '€' || " +
-    " case  when acc.invoicedate is not null then '<br/>(' || strftime('%d.%m.%Y', acc.invoicedate) || ')' || " +
-   " CASE  WHEN acc.reminderdate1 IS NOT NULL THEN '<br/>R1:' || strftime('%d.%m.%Y', acc.reminderdate1)  ELSE '' END || "+
-   " CASE WHEN acc.reminderdate2 IS NOT NULL THEN '<br/>R2:' || strftime('%d.%m.%Y', acc.reminderdate2)  ELSE ''  END || "+
-   "  CASE  WHEN acc.reminderdate3 IS NOT NULL THEN '<br/>R3:' || strftime('%d.%m.%Y', acc.reminderdate3) ELSE '' END else '' end  else '' end as invoiced,"+
-   " case  when acc.payedamount is not null then printf(\"%.2f\", COALESCE(acc.payedamount,  0.00)) || '€' || "+
-   " case  when acc.payeddate is not null then '<br/>(' || strftime('%d.%m.%Y', acc.payeddate) || ')' else '' end else '' end as payement, "+
-   " case when acc.benefitamount is not null then printf(\"%.2f\",COALESCE(acc.benefitamount,0.00)) || '€' else '' end as benefitamount," +
-   " '<button type=\"button\" class=\"btn btn-primary\" onclick=\"dlg_accounting(''' || acc.uuid || ''');\" title=\"editer\"><span class=\"glyphicon glyphicon-pencil\"></span></button>' || " +
-   " CASE WHEN acc.invoicefile IS NOT NULL and acc.invoicefile != '' THEN '<button type=\"button\" class=\"btn btn-primary\" onclick=\"openfile(''' || acc.invoicefile || ''');\"  title=\"editer\"><span class=\"glyphicon glyphicon-open\"></span>' else '' end || CASE WHEN acc.childuuid IS NOT NULL AND acc.accmonth IS NOT NULL THEN '<button type=\"button\" class=\"btn btn-danger\" onclick=\" confirm_delete_accounting(''' || acc.uuid || ''');\" title=\"supprimer\"><span class=\"glyphicon glyphicon-remove\"></span></button>' ELSE '' END AS act " +
-  " from accounting acc where childuuid='"+ pconfig.accchild+"' and strftime('%Y',acc.accmonth) = '" + pconfig.accyear +"' order by accmonth;";
-  
-//   var accsql = "select strftime( '%m.%Y',acc.accmonth) as calmonth,'' as weekdetails, '' as monthtotalhourcosts,'' as monthtotallunchcosts, '' as monthtotalcosts,replace(acc.reference,'NOCHECKSERVICE:','<span style=\"color: red;\">(facture non check-service)</span><br/>') as reference, " +
-//   "case when acc.invoiceamount is not null then printf(\"%.2f\",COALESCE(acc.invoiceamount,0.00)) || '€' || case when acc.invoicedate is not null then '<br/>(' || strftime('%d.%m.%Y',acc.invoicedate) || ')' || CASE WHEN acc.reminderdate1 IS NOT NULL THEN '<br/>R1:' || strftime('%d.%m.%Y',acc.reminderdate1) ELSE '' END || CASE WHEN acc.reminderdate2 IS NOT NULL THEN '<br/>R2:' || strftime('%d.%m.%Y',acc.reminderdate2) ELSE '' END || CASE WHEN acc.reminderdate3 IS NOT NULL THEN '<br/>R3:' || strftime('%d.%m.%Y',acc.reminderdate3) ELSE '' END else '' end else '' end  as invoiced, " +
-// "case when acc.payedamount is not null then printf(\"%.2f\",COALESCE(acc.payedamount,0.00)) || '€' || case when acc.payeddate is not null then '<br/>(' || strftime('%d.%m.%Y',acc.payeddate) || ')' else '' end else '' end as payement," +
-// "'' as benefitamount," +
-// "'<button type=\"button\" class=\"btn btn-primary\" onclick=\"dlg_accounting(''' || acc.uuid || ''');\" title=\"editer\"><span class=\"glyphicon glyphicon-pencil\"></span></button>' || CASE WHEN acc.invoicefile IS NOT NULL and acc.invoicefile != '' THEN '<button type=\"button\" class=\"btn btn-primary\" onclick=\"openfile(''' || acc.invoicefile ||  ''');\" title=\"editer\"><span class=\"glyphicon glyphicon-open\"></span>'  else '' end || CASE WHEN acc.childuuid IS NOT NULL AND acc.accmonth IS NOT NULL THEN '<button type=\"button\" class=\"btn btn-danger\" onclick=\" confirm_delete_accounting(''' || acc.uuid || ''');\" title=\"supprimer\"><span class=\"glyphicon glyphicon-remove\"></span></button>' ELSE '' END AS act  " +
-// " from accounting acc where acc.childuuid='"+ pconfig.accchild +"' and strftime( '%Y',acc.accmonth)='"+pconfig.accyear+"' and acc.reference LIKE 'NOCHECKSERVICE:%' "
-//   //|| ' (' || weekhourcosts || '€/h)' -- || ' (' || weeklunchcosts || '€/déj.)
-//   accsql += "UNION SELECT calmonth, " +
-//   "group_concat( '<span class=\"glyphicon glyphicon-calendar\"></span>:' || calweek || '&nbsp;<span class=\"glyphicon glyphicon-time\"></span>: ' || durationweek  || '&nbsp;h&nbsp;<span class=\"glyphicon glyphicon-cutlery\"></span>: ' || lunchweek ,'<br/>')   AS weekdetails, " +
-//   "printf(\"%.2f\",SUM(weektotalhourcosts)) AS monthtotalhourcosts, " +
-//   "printf(\"%.2f\",SUM(weektotallunchcosts)) AS monthtotallunchcosts, " +
-//   "printf(\"%.2f\",SUM(weektotalhourcosts + weektotallunchcosts)) AS monthtotalcosts, " +
-//   "reference, " +
-//   "invoiced,payement,benefitamount,act FROM ( " +
-//   "SELECT childname,ttl.childuuid,printf(\"%02d\",calweek) AS calweek,calmonth, " +
-//   "printf(\"%.2f\",sumdurationcalweek) AS durationweek, " +
-//   "sumlunchcalweek AS lunchweek, " +
-//   "printf(\"%.2f\",weekhourcosts) AS weekhourcosts, " +
-//   "printf(\"%.2f\",weeklunchcosts) AS weeklunchcosts, " +
-//   "sumdurationcalweek * weekhourcosts AS weektotalhourcosts, " +
-//   "sumlunchcalweek * weeklunchcosts   AS weektotallunchcosts, " +
-//   "REPLACE(acc.reference,'NOCHECKSERVICE:','') as reference," +
-//   "case when acc.invoiceamount is not null then printf(\"%.2f\",COALESCE(acc.invoiceamount,0.00)) || '€' || case when acc.invoicedate is not null then '<br/>(' || strftime('%d.%m.%Y',acc.invoicedate) || ')' || CASE WHEN acc.reminderdate1 IS NOT NULL THEN '<br/>R1:' || strftime('%d.%m.%Y',acc.reminderdate1) ELSE '' END || CASE WHEN acc.reminderdate2 IS NOT NULL THEN '<br/>R2:' || strftime('%d.%m.%Y',acc.reminderdate2) ELSE '' END || CASE WHEN acc.reminderdate3 IS NOT NULL THEN '<br/>R3:' || strftime('%d.%m.%Y',acc.reminderdate3) ELSE '' END else '' end else '' end  as invoiced, " +
-//   "case when acc.payedamount is not null then printf(\"%.2f\",COALESCE(acc.payedamount,0.00)) || '€' || case when acc.payeddate is not null then '<br/>(' || strftime('%d.%m.%Y',acc.payeddate) || ')' else '' end else '' end as payement," +
-//   "case when acc.benefitamount is not null then printf(\"%.2f\",COALESCE(acc.benefitamount,0.00)) || '€' else '' end as benefitamount," +
-//   "'<button type=\"button\" class=\"btn btn-primary\" onclick=\"dlg_accounting(''' || acc.uuid || ''');\" title=\"editer\"><span class=\"glyphicon glyphicon-pencil\"></span></button>' || CASE WHEN acc.invoicefile IS NOT NULL and acc.invoicefile != '' THEN '<button type=\"button\" class=\"btn btn-primary\" onclick=\"openfile(''' || acc.invoicefile ||  ''');\" title=\"editer\"><span class=\"glyphicon glyphicon-open\"></span>'  else '' end || CASE WHEN acc.childuuid IS NOT NULL AND acc.accmonth IS NOT NULL THEN '<button type=\"button\" class=\"btn btn-danger\" onclick=\" confirm_delete_accounting(''' || acc.uuid || ''');\" title=\"supprimer\"><span class=\"glyphicon glyphicon-remove\"></span></button>' ELSE '' END AS act  " +
-//   "FROM ( SELECT pch.childname, pch.childuuid, px.calweek, px.calmonth, px.sumdurationcalweek, px.sumlunchcalweek, " +
-//   "CASE WHEN px.sumdurationcalweek IS NOT NULL AND pch.checkservicenumber IS NOT NULL THEN ( SELECT coalesce(wc0.costsperhour,0.00) FROM costs wc0 WHERE wc0.startdate < date('"+yearmin+"','+' || caldays || ' days') and wc0.weeklyhourslimit <= px.sumdurationcalweek ORDER BY wc0.startdate DESC,wc0.weeklyhourslimit DESC LIMIT 1 ) WHEN px.sumdurationcalweek IS NOT NULL AND pch.checkservicenumber IS NULL THEN ( SELECT coalesce(wc0.costperhourfallback,0.00) FROM costs wc0 WHERE wc0.startdate < date('"+yearmin+"','+' || caldays || ' days') and wc0.weeklyhourslimit <= px.sumdurationcalweek ORDER BY wc0.startdate DESC,wc0.weeklyhourslimit DESC LIMIT 1 ) ELSE NULL END AS weekhourcosts,"+
-  
-//   "CASE WHEN px.sumlunchcalweek IS NOT NULL  THEN ( SELECT coalesce(wc0.dailylunchcosts,0.00) FROM costs wc0 WHERE wc0.startdate < date('"+yearmin+"','+' || caldays || ' days') and wc0.weeklyhourslimit <= px.sumdurationcalweek ORDER BY wc0.startdate DESC,wc0.weeklyhourslimit DESC LIMIT 1) ELSE NULL END AS weeklunchcosts " +
-//   "FROM ( SELECT COALESCE(ch.prename,'') || ' ' || COALESCE(ch.surname,'') || '<br>(' || " +
-//   "COALESCE(ch.checkservicenumber,'') || ')' AS childname,ch.uuid AS childuuid,ch.checkservicenumber " +
-//   "FROM childs ch JOIN planning pl ON ( ch.uuid=pl.childuuid) WHERE childuuid='"+pconfig.accchild+"' ) pch " +
-//   "LEFT JOIN ( SELECT childuuid, calweek, case when strftime('%w',date(calyear ||'-01-01')) in ('1','2','3','4') then (cast(calweek as int)*7)-7 else (cast(calweek as int)*7) end as caldays ,calmonth, sumlunchcalweek, COALESCE(SUM(monduration + tueduration + wedduration + thuduration + friduration),0.0) AS sumdurationcalweek FROM " +
-//   "( SELECT childuuid, daydate, calyear,"
-//   +"case when strftime('%w',date(calyear ||'-01-01')) in ('1','2','3','4') then case when calweek < '10' then '0' else '' end || cast(calweek as int)+1 else calweek end as calweek,"
-//   +"calmonth, MAX(monlunch) + MAX(tuelunch) + MAX(wedlunch) + MAX(thulunch) + MAX(frilunch) AS sumlunchcalweek, MAX(monduration) + MAX(monduration2) AS monduration, MAX(tueduration) + MAX(tueduration2) AS tueduration, MAX(wedduration) + MAX(wedduration2) AS wedduration, MAX(thuduration) + MAX(thuduration2) AS thuduration, MAX(friduration) + MAX(friduration2) AS friduration FROM " +
-//   "( SELECT xx.childuuid, xx.daydate,strftime('%Y',xx.daydate) as calyear, " +
-//   "case when strftime('%w',xx.daydate)='0' then strftime('%W',date(xx.daydate,'-6 days')) else strftime('%W',date(date(xx.daydate),'-' || strftime('%w',date(xx.daydate)) || ' days','+1 day')) end as calweek, " +
-//   "case when strftime('%w',xx.daydate)='0' then strftime('%m.%Y',date(xx.daydate,'-6 days')) else strftime('%m.%Y',date(date(xx.daydate),'-' || strftime('%w',date(xx.daydate)) || ' days','+1 day')) end as calmonth, ";
-//   var aax = ['mon','tue','wed','thu','fri','sat'];
-//   for (var d1 in aax){
-//     var dw = d1;dw++;
-//     accsql += "CASE WHEN lunch=1 AND status IN (1,5) AND strftime('%w',daydate) = '"+dw+"' THEN 1 ELSE 0 END AS "+aax[d1]+"lunch,";
-//   }
-  
-//   for (var d2 in aax){
-//     var dw2 = d2;dw2++;
-//     accsql += "CASE WHEN xx.status IS NOT NULL AND strftime('%w',xx.daydate) = '"+dw2+"' AND xx.daydate BETWEEN xx.datebegin AND xx.dateend THEN  CAST(( (( CAST(SUBSTR(xx."+ aax[d2]+"timeend,1,2) AS INT) *3600)+( CAST(SUBSTR(xx."+ aax[d2]+"timeend,4,2) AS INT) *60))-  ((CAST(SUBSTR(xx."+ aax[d2]+"timebegin,1,2) AS INT) *3600)+( CAST(SUBSTR(xx."+ aax[d2]+"timebegin,4,2) AS INT) *60)) ) / 3600 AS REAL)  ELSE 0.0 END AS "+ aax[d2]+"duration,";
-//   }
-  
-  
-//   for (var d3 in aax){
-//     var dw3 = d3;dw3++;
-//     accsql += "CASE WHEN xx.status IS NOT NULL AND strftime('%w',xx.daydate) = '"+dw3+"' AND xx.daydate BETWEEN xx.datebegin AND xx.dateend AND xx."+ aax[d3]+"timebegin2 IS NOT NULL AND xx."+ aax[d3]+"timeend2 IS NOT NULL THEN CAST(( (( CAST(SUBSTR(xx."+ aax[d3]+"timeend2,1,2) AS INT) *3600)+( CAST(SUBSTR(xx."+ aax[d3]+"timeend2,4,2) AS INT) *60))-  ((CAST(SUBSTR(xx."+ aax[d3]+"timebegin2,1,2) AS INT) *3600)+( CAST(SUBSTR(xx."+ aax[d3]+"timebegin2,4,2) AS INT) *60)) ) / 3600 AS REAL)  ELSE 0.0 END AS "+ aax[d3]+"duration2,";
-//   }
-  
-//   accsql += "null as nouse FROM (" +
-//   " select vacancydate as daydate, CAST('0' as boolean) as lunch,1 as status,pl.* from vacancy va " +
-//   " left join planning pl on (va.vacancydate between pl.datebegin and pl.dateend and pl.childuuid='"+pconfig.accchild+"') " + 
-//   " where va.vacancydateto is null and va.vacancydate BETWEEN '"+monthmin+"' AND '"+monthmax+"' AND strftime('%w',va.vacancydate) not in ('0') " +
-//   " group by va.vacancydate,pl.childuuid " +
-//   " union " + 
-//   " select pr.daydate,pr.lunch,pr.status,pl.* FROM presence pr " +
-//   " JOIN planning pl ON ( pr.childuuid=pl.childuuid and pr.childuuid='"+pconfig.accchild+"') WHERE pr.daydate BETWEEN '"+monthmin+"' AND '"+monthmax+"' "+
-//   ") xx " +
-//   "WHERE xx.daydate BETWEEN '"+monthmin+"' AND '"+monthmax+"') GROUP BY calweek) GROUP BY calweek) px " +
-//   "ON ( pch.childuuid=px.childuuid) GROUP BY px.calweek ) ttl LEFT JOIN accounting acc ON (ttl.childuuid = acc.childuuid AND  ttl.calmonth=strftime('%m.%Y',acc.accmonth) AND acc.reference NOT LIKE 'NOCHECKSERVICE:%') WHERE calweek IS NOT NULL) group by calmonth ORDER BY calmonth; ";var accsql = "select strftime( '%m.%Y',acc.accmonth) as calmonth,'' as weekdetails, '' as monthtotalhourcosts,'' as monthtotallunchcosts, '' as monthtotalcosts,replace(acc.reference,'NOCHECKSERVICE:','<span style=\"color: red;\">(facture non check-service)</span><br/>') as reference, " +
-//   "case when acc.invoiceamount is not null then printf(\"%.2f\",COALESCE(acc.invoiceamount,0.00)) || '€' || case when acc.invoicedate is not null then '<br/>(' || strftime('%d.%m.%Y',acc.invoicedate) || ')' || CASE WHEN acc.reminderdate1 IS NOT NULL THEN '<br/>R1:' || strftime('%d.%m.%Y',acc.reminderdate1) ELSE '' END || CASE WHEN acc.reminderdate2 IS NOT NULL THEN '<br/>R2:' || strftime('%d.%m.%Y',acc.reminderdate2) ELSE '' END || CASE WHEN acc.reminderdate3 IS NOT NULL THEN '<br/>R3:' || strftime('%d.%m.%Y',acc.reminderdate3) ELSE '' END else '' end else '' end  as invoiced, " +
-// "case when acc.payedamount is not null then printf(\"%.2f\",COALESCE(acc.payedamount,0.00)) || '€' || case when acc.payeddate is not null then '<br/>(' || strftime('%d.%m.%Y',acc.payeddate) || ')' else '' end else '' end as payement," +
-// "'' as benefitamount," +
-// "'<button type=\"button\" class=\"btn btn-primary\" onclick=\"dlg_accounting(''' || acc.uuid || ''');\" title=\"editer\"><span class=\"glyphicon glyphicon-pencil\"></span></button>' || CASE WHEN acc.invoicefile IS NOT NULL and acc.invoicefile != '' THEN '<button type=\"button\" class=\"btn btn-primary\" onclick=\"openfile(''' || acc.invoicefile ||  ''');\" title=\"editer\"><span class=\"glyphicon glyphicon-open\"></span>'  else '' end || CASE WHEN acc.childuuid IS NOT NULL AND acc.accmonth IS NOT NULL THEN '<button type=\"button\" class=\"btn btn-danger\" onclick=\" confirm_delete_accounting(''' || acc.uuid || ''');\" title=\"supprimer\"><span class=\"glyphicon glyphicon-remove\"></span></button>' ELSE '' END AS act  " +
-// " from accounting acc where acc.childuuid='"+ pconfig.accchild +"' and strftime( '%Y',acc.accmonth)='"+pconfig.accyear+"' and acc.reference LIKE 'NOCHECKSERVICE:%' "
-//   //|| ' (' || weekhourcosts || '€/h)' -- || ' (' || weeklunchcosts || '€/déj.)
-//   accsql += "UNION SELECT calmonth, " +
-//   "group_concat( '<span class=\"glyphicon glyphicon-calendar\"></span>:' || calweek || '&nbsp;<span class=\"glyphicon glyphicon-time\"></span>: ' || durationweek  || '&nbsp;h&nbsp;<span class=\"glyphicon glyphicon-cutlery\"></span>: ' || lunchweek ,'<br/>')   AS weekdetails, " +
-//   "printf(\"%.2f\",SUM(weektotalhourcosts)) AS monthtotalhourcosts, " +
-//   "printf(\"%.2f\",SUM(weektotallunchcosts)) AS monthtotallunchcosts, " +
-//   "printf(\"%.2f\",SUM(weektotalhourcosts + weektotallunchcosts)) AS monthtotalcosts, " +
-//   "reference, " +
-//   "invoiced,payement,benefitamount,act FROM ( " +
-//   "SELECT childname,ttl.childuuid,printf(\"%02d\",calweek) AS calweek,calmonth, " +
-//   "printf(\"%.2f\",sumdurationcalweek) AS durationweek, " +
-//   "sumlunchcalweek AS lunchweek, " +
-//   "printf(\"%.2f\",weekhourcosts) AS weekhourcosts, " +
-//   "printf(\"%.2f\",weeklunchcosts) AS weeklunchcosts, " +
-//   "sumdurationcalweek * weekhourcosts AS weektotalhourcosts, " +
-//   "sumlunchcalweek * weeklunchcosts   AS weektotallunchcosts, " +
-//   "REPLACE(acc.reference,'NOCHECKSERVICE:','') as reference," +
-//   "case when acc.invoiceamount is not null then printf(\"%.2f\",COALESCE(acc.invoiceamount,0.00)) || '€' || case when acc.invoicedate is not null then '<br/>(' || strftime('%d.%m.%Y',acc.invoicedate) || ')' || CASE WHEN acc.reminderdate1 IS NOT NULL THEN '<br/>R1:' || strftime('%d.%m.%Y',acc.reminderdate1) ELSE '' END || CASE WHEN acc.reminderdate2 IS NOT NULL THEN '<br/>R2:' || strftime('%d.%m.%Y',acc.reminderdate2) ELSE '' END || CASE WHEN acc.reminderdate3 IS NOT NULL THEN '<br/>R3:' || strftime('%d.%m.%Y',acc.reminderdate3) ELSE '' END else '' end else '' end  as invoiced, " +
-//   "case when acc.payedamount is not null then printf(\"%.2f\",COALESCE(acc.payedamount,0.00)) || '€' || case when acc.payeddate is not null then '<br/>(' || strftime('%d.%m.%Y',acc.payeddate) || ')' else '' end else '' end as payement," +
-//   "case when acc.benefitamount is not null then printf(\"%.2f\",COALESCE(acc.benefitamount,0.00)) || '€' else '' end as benefitamount," +
-//   "'<button type=\"button\" class=\"btn btn-primary\" onclick=\"dlg_accounting(''' || acc.uuid || ''');\" title=\"editer\"><span class=\"glyphicon glyphicon-pencil\"></span></button>' || CASE WHEN acc.invoicefile IS NOT NULL and acc.invoicefile != '' THEN '<button type=\"button\" class=\"btn btn-primary\" onclick=\"openfile(''' || acc.invoicefile ||  ''');\" title=\"editer\"><span class=\"glyphicon glyphicon-open\"></span>'  else '' end || CASE WHEN acc.childuuid IS NOT NULL AND acc.accmonth IS NOT NULL THEN '<button type=\"button\" class=\"btn btn-danger\" onclick=\" confirm_delete_accounting(''' || acc.uuid || ''');\" title=\"supprimer\"><span class=\"glyphicon glyphicon-remove\"></span></button>' ELSE '' END AS act  " +
-//   "FROM ( SELECT pch.childname, pch.childuuid, px.calweek, px.calmonth, px.sumdurationcalweek, px.sumlunchcalweek, " +
-//   "CASE WHEN px.sumdurationcalweek IS NOT NULL AND pch.checkservicenumber IS NOT NULL THEN ( SELECT coalesce(wc0.costsperhour,0.00) FROM costs wc0 WHERE wc0.startdate < date('"+yearmin+"','+' || caldays || ' days') and wc0.weeklyhourslimit <= px.sumdurationcalweek ORDER BY wc0.startdate DESC,wc0.weeklyhourslimit DESC LIMIT 1 ) WHEN px.sumdurationcalweek IS NOT NULL AND pch.checkservicenumber IS NULL THEN ( SELECT coalesce(wc0.costperhourfallback,0.00) FROM costs wc0 WHERE wc0.startdate < date('"+yearmin+"','+' || caldays || ' days') and wc0.weeklyhourslimit <= px.sumdurationcalweek ORDER BY wc0.startdate DESC,wc0.weeklyhourslimit DESC LIMIT 1 ) ELSE NULL END AS weekhourcosts,"+
-  
-//   "CASE WHEN px.sumlunchcalweek IS NOT NULL  THEN ( SELECT coalesce(wc0.dailylunchcosts,0.00) FROM costs wc0 WHERE wc0.startdate < date('"+yearmin+"','+' || caldays || ' days') and wc0.weeklyhourslimit <= px.sumdurationcalweek ORDER BY wc0.startdate DESC,wc0.weeklyhourslimit DESC LIMIT 1) ELSE NULL END AS weeklunchcosts " +
-//   "FROM ( SELECT COALESCE(ch.prename,'') || ' ' || COALESCE(ch.surname,'') || '<br>(' || " +
-//   "COALESCE(ch.checkservicenumber,'') || ')' AS childname,ch.uuid AS childuuid,ch.checkservicenumber " +
-//   "FROM childs ch JOIN planning pl ON ( ch.uuid=pl.childuuid) WHERE childuuid='"+pconfig.accchild+"' ) pch " +
-//   "LEFT JOIN ( SELECT childuuid, calweek, case when strftime('%w',date(calyear ||'-01-01')) in ('1','2','3','4') then (cast(calweek as int)*7)-7 else (cast(calweek as int)*7) end as caldays ,calmonth, sumlunchcalweek, COALESCE(SUM(monduration + tueduration + wedduration + thuduration + friduration),0.0) AS sumdurationcalweek FROM " +
-//   "( SELECT childuuid, daydate, calyear,"
-//   +"case when strftime('%w',date(calyear ||'-01-01')) in ('1','2','3','4') then case when calweek < '10' then '0' else '' end || cast(calweek as int)+1 else calweek end as calweek,"
-//   +"calmonth, MAX(monlunch) + MAX(tuelunch) + MAX(wedlunch) + MAX(thulunch) + MAX(frilunch) AS sumlunchcalweek, MAX(monduration) + MAX(monduration2) AS monduration, MAX(tueduration) + MAX(tueduration2) AS tueduration, MAX(wedduration) + MAX(wedduration2) AS wedduration, MAX(thuduration) + MAX(thuduration2) AS thuduration, MAX(friduration) + MAX(friduration2) AS friduration FROM " +
-//   "( SELECT xx.childuuid, xx.daydate,strftime('%Y',xx.daydate) as calyear, " +
-//   "case when strftime('%w',xx.daydate)='0' then strftime('%W',date(xx.daydate,'-6 days')) else strftime('%W',date(date(xx.daydate),'-' || strftime('%w',date(xx.daydate)) || ' days','+1 day')) end as calweek, " +
-//   "case when strftime('%w',xx.daydate)='0' then strftime('%m.%Y',date(xx.daydate,'-6 days')) else strftime('%m.%Y',date(date(xx.daydate),'-' || strftime('%w',date(xx.daydate)) || ' days','+1 day')) end as calmonth, ";
-//   var aax = ['mon','tue','wed','thu','fri','sat'];
-//   for (var d1 in aax){
-//     var dw = d1;dw++;
-//     accsql += "CASE WHEN lunch=1 AND status IN (1,5) AND strftime('%w',daydate) = '"+dw+"' THEN 1 ELSE 0 END AS "+aax[d1]+"lunch,";
-//   }
-  
-//   for (var d2 in aax){
-//     var dw2 = d2;dw2++;
-//     accsql += "CASE WHEN xx.status IS NOT NULL AND strftime('%w',xx.daydate) = '"+dw2+"' AND xx.daydate BETWEEN xx.datebegin AND xx.dateend THEN  CAST(( (( CAST(SUBSTR(xx."+ aax[d2]+"timeend,1,2) AS INT) *3600)+( CAST(SUBSTR(xx."+ aax[d2]+"timeend,4,2) AS INT) *60))-  ((CAST(SUBSTR(xx."+ aax[d2]+"timebegin,1,2) AS INT) *3600)+( CAST(SUBSTR(xx."+ aax[d2]+"timebegin,4,2) AS INT) *60)) ) / 3600 AS REAL)  ELSE 0.0 END AS "+ aax[d2]+"duration,";
-//   }
-  
-  
-//   for (var d3 in aax){
-//     var dw3 = d3;dw3++;
-//     accsql += "CASE WHEN xx.status IS NOT NULL AND strftime('%w',xx.daydate) = '"+dw3+"' AND xx.daydate BETWEEN xx.datebegin AND xx.dateend AND xx."+ aax[d3]+"timebegin2 IS NOT NULL AND xx."+ aax[d3]+"timeend2 IS NOT NULL THEN CAST(( (( CAST(SUBSTR(xx."+ aax[d3]+"timeend2,1,2) AS INT) *3600)+( CAST(SUBSTR(xx."+ aax[d3]+"timeend2,4,2) AS INT) *60))-  ((CAST(SUBSTR(xx."+ aax[d3]+"timebegin2,1,2) AS INT) *3600)+( CAST(SUBSTR(xx."+ aax[d3]+"timebegin2,4,2) AS INT) *60)) ) / 3600 AS REAL)  ELSE 0.0 END AS "+ aax[d3]+"duration2,";
-//   }
-  
-//   accsql += "null as nouse FROM (" +
-//   " select vacancydate as daydate, CAST('0' as boolean) as lunch,1 as status,pl.* from vacancy va " +
-//   " left join planning pl on (va.vacancydate between pl.datebegin and pl.dateend and pl.childuuid='"+pconfig.accchild+"') " + 
-//   " where va.vacancydateto is null and va.vacancydate BETWEEN '"+monthmin+"' AND '"+monthmax+"' AND strftime('%w',va.vacancydate) not in ('0') " +
-//   " group by va.vacancydate,pl.childuuid " +
-//   " union " + 
-//   " select pr.daydate,pr.lunch,pr.status,pl.* FROM presence pr " +
-//   " JOIN planning pl ON ( pr.childuuid=pl.childuuid and pr.childuuid='"+pconfig.accchild+"') WHERE pr.daydate BETWEEN '"+monthmin+"' AND '"+monthmax+"' "+
-//   ") xx " +
-//   "WHERE xx.daydate BETWEEN '"+monthmin+"' AND '"+monthmax+"') GROUP BY calweek) GROUP BY calweek) px " +
-//   "ON ( pch.childuuid=px.childuuid) GROUP BY px.calweek ) ttl LEFT JOIN accounting acc ON (ttl.childuuid = acc.childuuid AND  ttl.calmonth=strftime('%m.%Y',acc.accmonth) AND acc.reference NOT LIKE 'NOCHECKSERVICE:%') WHERE calweek IS NOT NULL) group by calmonth ORDER BY calmonth; ";
-   //jsdump("accsql");
- //jsdump(accsql);
-  
-  var accdata = appdb.dbquery(accsql);
-  jsdump("accchildsql");
-  jsdump(accsql);
-  var headerdata = getlabels("calmonth,reference,invoiced,payement,benefitamount,act");
- //,monthtotalhourcosts,monthtotallunchcosts,monthtotalcosts
-  
-
-  $("#tbl_accounting").html("");
-  
-  //var hrow = headerdata;
-  //var tdclass= new Array();
-  var tblheader = '<tr>';
-
-  for (var h in headerdata){
-    if ((headerdata[h].keyname == 'act') && (headerdata[h].class.indexOf('action1btn') == -1)){
-      headerdata[h].class +=" action1btn";
-    }
-    //if ((pconfig.hidden_columns) && (pconfig.hidden_columns.indexOf(headerdata[h].keyname) != -1)) {
-    //  if (headerdata[h].class.indexOf('colhidden') == -1) {
-    //    headerdata[h].class += " colhidden"; 
-    //  }
-    //}else {
-      headerdata[h].class.replace("colhidden","");
-    //}
-    tblheader += '<th class="' + headerdata[h].class +'">'+ headerdata[h].title+'</th>';
-
-  }
-  tblheader += '</tr>';
-
-  
-  $("#tbl_accounting").append("<thead>" + tblheader + "</thead>");
-  $("#tbl_accounting").append("<tfoot>" + tblheader + "</tfoot>");
-  $("#tbl_accounting").append("<tbody>");
- 
-  var curchld = "";
-
-  for (var i in accdata.sqldata){
-    var row = accdata.sqldata[i];
-        var tr = '<tr><td>' + row.calmonth + '</td>';
-        //tr += '<td class="infoweek noprint '+ (((pconfig.hidden_columns) && (pconfig.hidden_columns.indexOf('weekdetails') != -1))?" colhidden":"") +'">' + row.weekdetails + '</td>';
-        //tr += '<td class="alignright totalwidth '+ (((pconfig.hidden_columns) && (pconfig.hidden_columns.indexOf('monthtotalhourcosts') != -1))?" colhidden":"") +'">' + row.monthtotalhourcosts + '€</td>';
-        //tr += '<td class="alignright totalwidth '+ (((pconfig.hidden_columns) && (pconfig.hidden_columns.indexOf('monthtotallunchcosts') != -1))?" colhidden":"") +'">' + row.monthtotallunchcosts + '€</td>';
-        //tr += '<td class="alignright totalwidth '+ (((pconfig.hidden_columns) && (pconfig.hidden_columns.indexOf('monthtotalcosts') != -1))?" colhidden":"") +'">' + row.monthtotalcosts + '€</td>';
-        tr += '<td>'+row.reference+'</td>';
-        tr += '<td class="alignright '+ (((pconfig.hidden_columns) && (pconfig.hidden_columns.indexOf('invoiced') != -1))?" colhidden":"") +'">' + row.invoiced + '</td>';
-        tr += '<td class="alignright '+ (((pconfig.hidden_columns) && (pconfig.hidden_columns.indexOf('payement') != -1))?" colhidden":"") +'">' + row.payement + '</td>';
-        tr += '<td class="alignright totalwidth '+ (((pconfig.hidden_columns) && (pconfig.hidden_columns.indexOf('benefitamount') != -1))?" colhidden":"") +'">' + row.benefitamount + '</td>';
-        tr += '<td class="noprint">' + row.act + '</td></tr>';
-        $("#tbl_accounting").append(tr);
-    }
-    
-  $("#tbl_accounting").append("</tbody>");
-
-
-  tblacc = $("#tbl_accounting").dataTable({
-        "language": {
-          "url": "../../web/js/locale/datatable_fr.json"
-        },
-        "paging":   false,
-        "ordering": true,
-        "bAutoWidth": false,
-        "scrollY": winh + "px",
-        "scrollCollapse": true,
-        "info":     false,
-        "filter": true,
-        "destroy": true,
-        "footerCallback": function ( row, data, start, end, display ) {
-            var api = this.api(), data;
-
-            var intVal = function ( i ) {
-                return typeof i === 'string' ?
-                    i.substring(0,i.indexOf("\€"))*1 :
-                    typeof i === 'number' ?
-                        i : 0;
-            };
-            
-            //hTotal = api
-            //    .column( 2, { page: 'current'} )
-            //    .data()
-            //    .reduce( function (a, b) {
-            //        return intVal(a) + intVal(b);
-            //    }, 0 );
-            
-            //lTotal = api
-            //    .column( 3, { page: 'current'} )
-            //    .data()
-            //    .reduce( function (a, b) {
-            //        return intVal(a) + intVal(b);
-            //    }, 0 );
-            fTotal =  api
-                .column( 2, { page: 'current'} )
-                .data()
-                .reduce( function (a, b) {
-                    return intVal(a) + intVal(b);
-                }, 0 );
-            pTotal =  api
-                .column( 3, { page: 'current'} )
-                .data()
-                .reduce( function (a, b) {
-                    return intVal(a) + intVal(b);
-                }, 0 );
-            bTotal =  api
-                .column( 4, { page: 'current'} )
-                .data()
-                .reduce( function (a, b) {
-                    return intVal(a) + intVal(b);
-                }, 0 );
-            //pageTotal = api
-            //    .column( 4, { page: 'current'} )
-            //    .data()
-            //    .reduce( function (a, b) {
-            //        return intVal(a) + intVal(b);
-            //    }, 0 );
- 
-            // Update footer
-            $( api.column( 2 ).footer() ).html(
-                ''+fTotal.toFixed(2)  +' €' 
-            );
-            $( api.column( 3 ).footer() ).html(
-                ''+pTotal.toFixed(2)  +' €' 
-            );
-            $( api.column( 4 ).footer() ).html(
-                ''+bTotal.toFixed(2) +' €' 
-            );
-            //$( api.column( 4 ).footer() ).html(
-            //    ''+pageTotal.toFixed(2)  +' €' 
-            //);
-            // $( api.column( 3 ).footer() ).html(
-            //    ''+lTotal.toFixed(2)  +' €' 
-            //);
-            //$( api.column( 2 ).footer() ).html(
-            //    ''+hTotal.toFixed(2)  +' €' 
-            //);
-        }
-      });
-  
-//  $('#tbl_accounting').on( 'search.dt', function () {
-//    pconfig.filter = tblacc.api().search();
-//    apppref.setpreference("pageconfig.accountingchild",pconfig);
-//  } );
-
-  $('#tbl_accounting').on( 'order.dt', function () {
-    pconfig.order= tblacc.fnSettings().aaSorting;
-    apppref.setpreference("pageconfig.accountingchild",pconfig);
- 
-  } );
-//  if (pconfig.filter) {
-//    tblacc.fnFilter(pconfig.filter);
-//  }
-  if (pconfig.order) {
-  
-    tblacc.fnSort(pconfig.order);
-  }
-  
-  
-
-$('#tbl_accounting tbody').on( 'click', 'tr', function () {
-        if ( $(this).hasClass('selected') ) {
-           // $(this).removeClass('selected');
-        }
-        else {
-            tblacc.$('tr.selected').removeClass('selected');
-            $(this).addClass('selected');
-        }
-    } );
-}
-
-function set_accchild(){
-  pconfig.accchild = $('#accchild').val();
-  apppref.setpreference("pageconfig.accountingchild",pconfig);
-      globelreq.send_request({
-            page: 'accountingchild',
-            module: 'accounting',
-            data: null,
-            header: 'Décompte par enfant'
-      });
-}
-
-function load_childlist() {
-
-  var chlst = appdb.dbquery("select pr.childuuid,COALESCE(ch.prename,'') || ' ' || COALESCE(ch.surname,'') || ' (' || COALESCE(ch.checkservicenumber,'') || ')' AS childname from childs ch left join presence pr on (ch.uuid=pr.childuuid) where pr.childuuid is not null group by ch.uuid order by childname");
-  chlst = chlst.sqldata;
-  for (c in chlst){
-    $("#accchild").append('<option value="'+ chlst[c].childuuid+'">'+ chlst[c].childname +'</option>');
-  }
-}
-
-
-function dlg_accounting(myuuid){
-  $("#frmeditaccounting #action").val("upd");
-  $("#head_invoice").html("Editer facture");
-  $("#frmeditaccounting #childname").val($("#accchild  option:selected").text());
-  
-  var acc1sql = "SELECT uuid,accmonth,childuuid,case when invoicedate is not null then strftime('%d.%m.%Y',invoicedate) else null end as invoicedate, case when payeddate is not null then strftime('%d.%m.%Y',payeddate) else null end as payeddate, payedamount, benefitamount,invoiceamount, reference, nocheckservice, case when reminderdate1 is not null then strftime('%d.%m.%Y',reminderdate1) else null end as reminderdate1, case when reminderdate2 is not null then strftime('%d.%m.%Y',reminderdate2) else null end as reminderdate2, case when reminderdate3 is not null then strftime('%d.%m.%Y',reminderdate3) else null end as reminderdate3,case when invoicefile is not null  and invoicefile != '' then '"+ importpath.path + system.sep() +"' || invoicefile else null end as invoicefile,'upd' as action FROM accounting where uuid='" + myuuid +"';";
-  
-  var acc1data = appdb.dbquery(acc1sql);
-  
-  if (acc1data.sqldata.length == 0) {
- 
-    acc1sql = "SELECT '0' as uuid,"+ accmonth.substring(3) + "-" + accmonth.substring(0,2) +"-01' as accmonth,'"+ pconfig.accchild+"' as childuuid, null as invoicedate, null as payeddate, null as payedamount, null as invoiceamount,1 as ischeckservice, null as reference, null as reminderdate1, null as reminderdate2, null as reminderdate3,null as benefitamount ,null as invoicefile, 'ins' as action;";
-    acc1data = appdb.dbquery(acc1sql);
-  }
-  acc1data = acc1data.sqldata[0];
-  if (acc1data.nocheckservice == 1){
-    $("#frmeditaccounting #nocheckservice").prop("checked",true);
-  } else {
-    $("#frmeditaccounting #nocheckservice").prop("checked",false);
-  }
-  for (var a in acc1data){
-  
-    if ($("#frmeditaccounting #" +a)) {
-  
-      $("#frmeditaccounting #"+a).val(acc1data[a]);
-    }
-  }
-  $("#edit_accounting").modal('show');
-  
-}
-
-function newinvoice(){
-  if ($("#accchild").val() == ""){
-    alert("Vous devez d'abort selectionner un enfant!");
-    return;
-  }
-  $("#frmeditaccounting :input").each(function(){
-    var input = $(this);
-    input.val("");
-  });
-  $("#frmeditaccounting #nocheckservice").prop("checked",true);
-  $("#frmeditaccounting #action").val("ins");
-  $("#frmeditaccounting #uuid").val("0");
-  $("#frmeditaccounting #childuuid").val($("#accchild").val());
-  $("#head_invoice").html("Ajouter une facture");
-
-  
-  $("#frmeditaccounting #childname").val($("#accchild  option:selected").text());
-  $("#edit_accounting").modal('show');
-}
-
-function save_accounting(){
-        var sql1 = new Array();
-        var sql2 = new Array();
-        // var cntnum = "01"; 
-        var type = $("#frmeditaccounting #action").val();
-        if (type == 'ins'){
-          sql1.push('childuuid');
-          sql2.push("'"+ pconfig.accchild +"'");
-          
-        }
-        
-        $("#frmeditaccounting :input").each(function(){
-          var input = $(this);
-          if (input.attr("id") ){
-            if ((type == 'ins') && (input.attr("type") != 'hidden') && (input.attr("id") != 'accmonth') && (input.attr("id") != 'childname')  && (input.attr("id") != 'ischeckservice')) {
-              
-              sql1.push('"' + input.attr("id") + '"');
-              if (input.attr("type") == "file") {
-                var newlocation= importpath.path + system.sep() + system.getFileName(input.val());
-                if (!system.fileexists(importpath.path)){
-                  importpath.create(1,0755);
-                }
-                OS.File.copy(input.val(), newlocation);
-              }
-              var ival = input.val();
-              if ((input.attr("id") == 'reference') && $("#frmeditaccounting #ischeckservice").is(":checked")){
-                sql1.push("nocheckservice");
-                sql2.push("'1'");
-              }
-              var ival = encodeparam(input.val(),input.attr('type'));
-              sql2.push(ival);
-              if (input.attr("id") == 'invoicedate'){
-                sql1.push('"accmonth"');
-                
-                var newaccmonth = ival.replace(/'/g,"");
-                // var cntx = appdb.dbquery("select count(accmonth)+1 as cnt from accounting where childuuid = '"+ pconfig.accchild +"' and accmonth between date('"+newaccmonth.substring(0,4) + "-" + newaccmonth.substring(5,7)+"-01') and date('"+newaccmonth.substring(0,4) + "-" + newaccmonth.substring(5,7)+"-01','+1 month','-1 day'); ");
-                // cntnum = cntx.sqldata[0].cntx;
-                // if (cntnum < 10){ cntnum = "0" + cntnum;}
-                sql2.push('\'' + newaccmonth.substring(0,4) + "-" + newaccmonth.substring(5,7) +"-01'");
-              }
-            }else {
-              if ((input.attr("type") != 'hidden') &&  (input.attr("id") != 'childname')  && (input.attr("id") != 'ischeckservice')) {
-                if (input.attr("type") == "file") {
-                  if (system.getDirectory(input.val()) != importpath.path) {
-                    var newlocation= importpath.path + system.sep() + system.getFileName(input.val());
-                    OS.File.copy(input.val(), newlocation);
-                  }
-                }
-                var ival = input.val();
-                if ((input.attr("id") == 'reference') && $("#frmeditaccounting #ischeckservice").is(":checked")){
-                  sql2.push("nocheckservice='1'");
-                }
-                var ival = encodeparam(ival,input.attr('type'));
-                sql2.push('"' + input.attr("id") +'"='+ ival);
-                if (input.attr("id") == 'invoicedate'){
-                  var newaccmonth = ival.replace(/'/g,"");
-                //   var cntx = appdb.dbquery("select count(accmonth)+1 as cnt from accounting where childuuid = '"+ pconfig.accchild +"' and accmonth between date('"+newaccmonth.substring(0,4) + "-" + newaccmonth.substring(5,7)+"-01') and date('"+newaccmonth.substring(0,4) + "-" + newaccmonth.substring(5,7)+"-01','+1 month','-1 day'); ");
-                // cntnum = cntx.sqldata[0].cntx;
-                // if (cntnum < 10){ cntnum = "0" + cntnum;}
-                  sql2.push('"accmonth"=\'' + newaccmonth.substring(0,4) + "-" + newaccmonth.substring(5,7) +"-01'");
-                }
-                
-              }
-            }
-          }
-
-        });
-        var xsql = "";
-        if (type == 'upd') {
-          xsql = "UPDATE accounting SET "+sql2.join(',')+" where \"uuid\"='" + $("#frmeditaccounting #uuid").val() +"';";
-        }else {
-          sql1.push("uuid");
-          sql2.push("'" + appdb.generate_uuid() + "'");
-          xsql = "INSERT INTO accounting ("+sql1.join(',')+") VALUES ("+sql2.join(',')+");"; 
-        }
-        //jsdump(xsql);
-        appdb.dbexec(xsql);
-        load_accounting_table();
-        $("#frmeditaccounting #uuid").val("0");
-        $("#edit_accounting").modal('hide');
-      }
-
-function print_list(){
-  globelreq.send_request({page:'preview2',data:{page: 'accountingchild'}});
-}
-
-function openfile(fi){
-  var ddir = system.getDirectory(appdb.dbFile.path);
-  var ff = system.openFile(ddir + system.sep() + 'imports' + system.sep() + crecheuuid +system.sep() + fi);
-}
-
-function set_accyear(){
-  pconfig.accyear = $('#accyear').val();
-  apppref.setpreference("pageconfig.accountingchild",pconfig);
-      globelreq.send_request({
-            page: 'accountingchild',
-            module: 'accounting',
-            data: null,
-            header: 'Décompte par enfant'
-      });
-}
-
-function set_selectyears() {
-  var years = appdb.dbquery("select strftime('%Y',min(entrydate)) as minyear,strftime('%Y',max(leavedate)) as maxyear from childs;");
-  var minyear = parseInt(years.sqldata[0].minyear);
-  var maxyear = parseInt(years.sqldata[0].maxyear);
-  for (var y=minyear;y<=maxyear;y++){
-    var sel = "";
-    if (y == pconfig.accyear) {
-      sel=' selected="1" ';
-    }
-    $("#accyear").append("<option value=\""+y+"\""+sel+">"+y+"</option>");
-  }
-  
-}
-
-function confirm_delete_accounting(myuuid) {
-  delacc.uuid = uuid;
-  $('#confirm_delete_accounting').modal('show');
-}
-
-function delete_accounting() {
-  var xsql = "DELETE FROM accounting where uuid='"+ delacc.uuid+"';";
-
-  appdb.dbexec(xsql);
-  load_accounting_table();
-  delacc ={};
-  
-  $('#confirm_delete_accounting').modal('hide');
-}
-
-function load_column_selection() {
-  var columns = 'weekdetails,monthtotalhourcosts,monthtotallunchcosts,monthtotalcosts,invoiced,payement,benefitamount';
-  var head = getlabelswithkey(columns);
-  var hidden_columns = [];
-  //if (pconfig.hidden_columns) {
-  //  hidden_columns = JSON.parse(columns);
-  //}
-  for (var h=0;h<head.length;h++){
-    $('#hidden_columns').append('<option value="'+ head[h].keyname +'" >&lt;span &gt;' +head[h].description+ '&lt;/span&gt;</option>');
-  }
-  $('#hidden_columns').multiselect({enableHTML: true,numberDisplayed:1,nonSelectedText:"Aucune",allSelectedText: 'Tous',nSelectedText: ' selections'});  
-  if (pconfig.hidden_columns) {
-    //$('#hidden_columns' + objid).multiselect({enableHTML: true,numberDisplayed:3,nonSelectedText:"Tous",allSelectedText: 'Tous',nSelectedText: ' selections'});
-    $('#hidden_columns').multiselect('select',pconfig.hidden_columns);
-  } 
-}
-
-function onhidecolumn(coltohide) {
-  pconfig.hidden_columns = $('#hidden_columns').val();//(()?$('#' + objid).val().split(','):null);
-  apppref.setpreference("pageconfig.accountingchild",pconfig);
-  //dump(JSON.stringify(pconfig) + "\n");
-   globelreq.send_request({
-            page: 'accountingchild',
-            module: 'accounting',
-            data: null,
-            header: 'Décompte par enfant'
-      });
-  //dump("Hide column " + coltohide + "\n");
-}
-
-// function check_accountingtable(){
-//   var cols = appdb.dbquery("SELECT type, name,tbl_name,sql FROM sqlite_master where tbl_name='accounting';");
-//   //jsdump(JSON.stringify(cols));
-//   if (cols.sqldata[0].sql.indexOf("nocheckservice") == -1){
-//     //jsdump("Install missing column! ALTER TABLE accounting add column nocheckservice integer");
-//     appdb.dbexec("ALTER TABLE accounting add column nocheckservice integer;");
-//   }
-//   // else {
-//   //   jsdump("missing column found!");
-//   // }
-// }
diff --git a/modules/accounting/js/accountingopeninvoice.js b/modules/accounting/js/accountingopeninvoice.js
deleted file mode 100644
index 30cdcbd..0000000
--- a/modules/accounting/js/accountingopeninvoice.js
+++ /dev/null
@@ -1,284 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg ) 
-
-var pconfig = {};
-var winh= window.innerHeight -140;
-var tblacc = null;
-var gpaccchild = null;
-var crecheuuid = null;
-var importpath = null;
-//var lictype = apppref.getpreference("support.lictype"); 
-
-function initdata(){
-  curcfg.loadconfig(apppref.getpreference("support.database.currentdb.num"));
-  load_helpers();
-  var configdata = apppref.getpreference("pageconfig.accountingopeninvoice");
-
-  if (configdata != '') {
-    pconfig = JSON.parse(configdata);
-  }
-  if (!pconfig.printlayout) {
-    pconfig.printlayout = 'list';
-    apppref.setpreference("pageconfig.accountingopeninvoice",pconfig);
-  }
-  var ccreche = appdb.dbquery("select uuid from creche LIMIT 1;");
-  crecheuuid = ccreche.sqldata[0].uuid;
-  importpath = FileUtils.File(curcfg.path.local  + system.sep() +"imports" + system.sep() + crecheuuid);
-
-  set_infoheader("");
-  load_accounting_table();  
-}
-
-function load_accounting_table(){
-  var xsql = "DELETE from accounting where accmonth='' or accmonth is null;";
-  appdb.dbexec(xsql);
-  var accsql = "select strftime('%m.%Y',acc.accmonth) as calmonth,ch.clientnumber, "  +
-"COALESCE(ch.prename,'') || ' ' || COALESCE(ch.surname,'')  AS childname,ch.checkservicenumber, acc.reference as reference, "  +
-"CASE WHEN acc.invoiceamount IS NOT NULL THEN printf(\"%.2f\",COALESCE(acc.invoiceamount,0.00)) || '€' || CASE WHEN acc.invoicedate IS NOT NULL THEN '<br/>(' || strftime('%d.%m.%Y',acc.invoicedate) || ')' || CASE WHEN acc.reminderdate1 IS NOT NULL THEN '<br/>R1:' || strftime('%d.%m.%Y',acc.reminderdate1) ELSE '' END || CASE WHEN acc.reminderdate2 IS NOT NULL THEN '<br/>R2:' || strftime('%d.%m.%Y',acc.reminderdate2) ELSE '' END || CASE WHEN acc.reminderdate3 IS NOT NULL THEN '<br/>R3:' || strftime('%d.%m.%Y',acc.reminderdate3) ELSE '' END ELSE '' END ELSE '' END AS invoiced, "  +
-"CASE WHEN acc.payedamount IS NOT NULL THEN printf(\"%.2f\",COALESCE(acc.payedamount,0.00)) || '€' || CASE WHEN acc.payeddate IS NOT NULL THEN '<br/>(' || strftime('%d.%m.%Y',acc.payeddate) || ')' ELSE '' END ELSE '' END AS payement, "  +
-"'<button type=\"button\" class=\"btn btn-primary\" onclick=\"dlg_accounting(''' ||  acc.uuid || ''');\" title=\"editer\"><span class=\"glyphicon glyphicon-pencil\"></span></button>' || case when acc.invoicefile is not null and acc.invoicefile != '' then '<button type=\"button\" class=\"btn btn-primary\" onclick=\"openfile(''' || acc.invoicefile || ''');\" title=\"editer\"><span class=\"glyphicon glyphicon-open\"></span></button>' else '' end AS act "  +
-"from accounting acc join childs ch on (acc.childuuid=ch.uuid) "  +
-"where (acc.invoiceamount is not null and acc.payedamount is null) or (acc.payedamount < acc.invoiceamount) order by acc.accmonth desc;";
-
-  
-  var accdata = appdb.dbquery(accsql);
-  var headerdata = getlabels("calmonth,clientnumber,childname,checkservicenumber,reference,invoiced,payement,act");
-  
-
-  $("#tbl_accounting").html("");
-  
-  var hrow = headerdata;
-  var tdclass= new Array();
-  var tblheader = '<tr>';
-
-  for (var h=0;h<hrow.length;h++){
-    if (hrow[h] == 'act') {
-      headerdata[h].class =headerdata[h].class + " action1btn";
-    }
-
-    tdclass.push(headerdata[h].class);
-
-    tblheader += '<th class="' + headerdata[h].class +'">'+ headerdata[h].title+'</th>';
-
-  }
-  tblheader += '</tr>';
-  
-  $("#tbl_accounting").append("<thead>" + tblheader + "</thead>");
-  $("#tbl_accounting").append("<tfoot>" + tblheader + "</tfoot>");
-  $("#tbl_accounting").append("<tbody>");
- 
-  var curchld = "";
-  for (var i in accdata.sqldata){
-    var row = accdata.sqldata[i];
-        var tr = '<tr><td>' + row.calmonth + '</td>';
-        tr += '<td>' + row.clientnumber + '</td>';
-        tr += '<td>' + row.childname + '</td>';
-        tr += '<td>' + row.checkservicenumber + '</td>';
-        tr += '<td>' + row.reference + '</td>';
-        tr += '<td class="alignright">' + row.invoiced + '</td>';
-        tr += '<td class="alignright">' + row.payement + '</td>';
-        tr += '<td class="noprint">' + row.act + '</td></tr>';
-        $("#tbl_accounting").append(tr);
-    }
-    
-  $("#tbl_accounting").append("</tbody>");
-  tblacc = $("#tbl_accounting").dataTable({
-        "language": {
-          "url": "../../web/js/locale/datatable_fr.json"
-        },
-        "paging":   false,
-        "ordering": true,
-        "bAutoWidth": false,
-        "scrollY": winh + "px",
-        "scrollCollapse": true,
-        "info":     false,
-        "filter": true,
-        "destroy": true,
-        "footerCallback": function ( row, data, start, end, display ) {
-            var api = this.api(), data;
-
-            var intVal = function ( i ) {
-                return typeof i === 'string' ?
-                    i.substring(0,i.indexOf("\€"))*1 :
-                    typeof i === 'number' ?
-                        i : 0;
-            };
-            
-            fTotal =  api
-                .column( 5, { page: 'current'} )
-                .data()
-                .reduce( function (a, b) {
-                    return intVal(a) + intVal(b);
-                }, 0 );
-            pTotal =  api
-                .column( 6, { page: 'current'} )
-                .data()
-                .reduce( function (a, b) {
-                    return intVal(a) + intVal(b);
-                }, 0 );
-  
-            // Update footer
-            $( api.column( 5 ).footer() ).html(
-                ''+fTotal.toFixed(2)  +' €' 
-            );
-            $( api.column( 6 ).footer() ).html(
-                ''+pTotal.toFixed(2)  +' €' 
-            );
-            
-        }
-      });
-  
-//  $('#tbl_accounting').on( 'search.dt', function () {
-//    pconfig.filter = tblacc.api().search();
-//    apppref.setpreference("pageconfig.accountingopeninvoice",pconfig);
-//  } );
-
-  $('#tbl_accounting').on( 'order.dt', function () {
-    pconfig.order= tblacc.fnSettings().aaSorting;
-    apppref.setpreference("pageconfig.accountingopeninvoice",pconfig);
- 
-  } );
-//  if (pconfig.filter) {
-//    tblacc.fnFilter(pconfig.filter);
-//  }
-  if (pconfig.order) {
-   
-    tblacc.fnSort(pconfig.order);
-  }
-  
-  
-
-$('#tbl_accounting tbody').on( 'click', 'tr', function () {
-        if ( $(this).hasClass('selected') ) {
-
-        }
-        else {
-            tblacc.$('tr.selected').removeClass('selected');
-            $(this).addClass('selected');
-        }
-    } );
-}
-
-
-function dlg_accounting(myuuid){
-
-  
-  var acc1sql = "SELECT acc.uuid as uuid,acc.accmonth,ch.prename || ' ' || ch.surname as childname,acc.nocheckservice,acc.childuuid,case when acc.invoicedate is not null then strftime('%d.%m.%Y',acc.invoicedate) else null end as invoicedate, case when acc.payeddate is not null then strftime('%d.%m.%Y',acc.payeddate) else null end as payeddate, acc.payedamount,acc.benefitamount, acc.invoiceamount, acc.reference, case when acc.reminderdate1 is not null then strftime('%d.%m.%Y',acc.reminderdate1) else null end as reminderdate1, case when acc.reminderdate2 is not null then strftime('%d.%m.%Y',acc.reminderdate2) else null end as reminderdate2, case when acc.reminderdate3 is not null then strftime('%d.%m.%Y',acc.reminderdate3) else null end as reminderdate3,case when acc.invoicefile is not null and acc.invoicefile != '' then '"+ importpath.path + system.sep() +"' || acc.invoicefile else null end as invoicefile,'upd' as action FROM accounting acc join childs ch on (acc.childuuid=ch.uuid) where acc.uuid='"+myuuid+"';";
-  
-  //jsdump("acc1sql");
-  //jsdump(acc1sql);
-  var acc1data = appdb.dbquery(acc1sql);
- 
-  if (!acc1data.sqldata) {
- 
-    return false;
-  }
-  acc1data = acc1data.sqldata[0];
-  
-  for (var a in acc1data){
-    if (a == "nocheckservice"){
-      if (acc1data[a] == 1){
-        $("#frmeditaccounting #nocheckservice").prop("checked",true);
-      } else {
-        $("#frmeditaccounting #nocheckservice").prop("checked",false);
-      }
-    }
-    if ($("#frmeditaccounting #" +a)) {
-
-      $("#frmeditaccounting #"+a).val(acc1data[a]);
-    }
-  }
-  $("#edit_accounting").modal('show');
-  
-}
-
-function save_accounting(){
-  var sql1 = new Array();
-  var sql2 = new Array();
-  // var cntnum = "01"; 
-  var type = $("#frmeditaccounting #action").val();
-  if (type == 'ins'){
-    sql1.push('childuuid');
-    sql2.push("'"+ pconfig.accchild +"'");
-    
-  }
-  
-  $("#frmeditaccounting :input").each(function(){
-    var input = $(this);
-    if (input.attr("id") ){
-      if ((type == 'ins') && (input.attr("type") != 'hidden') && (input.attr("id") != 'accmonth') && (input.attr("id") != 'childname')  && (input.attr("id") != 'ischeckservice')) {
-        
-        sql1.push('"' + input.attr("id") + '"');
-        if (input.attr("type") == "file") {
-          var newlocation= importpath.path + system.sep() + system.getFileName(input.val());
-          if (!system.fileexists(importpath.path)){
-            importpath.create(1,0755);
-          }
-          OS.File.copy(input.val(), newlocation);
-        }
-        var ival = input.val();
-        if ((input.attr("id") == 'reference') && $("#frmeditaccounting #ischeckservice").is(":checked")){
-          sql1.push("nocheckservice");
-          sql2.push("'1'");
-        }
-        var ival = encodeparam(input.val(),input.attr('type'));
-        sql2.push(ival);
-        if (input.attr("id") == 'invoicedate'){
-          sql1.push('"accmonth"');
-          
-          var newaccmonth = ival.replace(/'/g,"");
-          // var cntx = appdb.dbquery("select count(accmonth)+1 as cnt from accounting where childuuid = '"+ pconfig.accchild +"' and accmonth between date('"+newaccmonth.substring(0,4) + "-" + newaccmonth.substring(5,7)+"-01') and date('"+newaccmonth.substring(0,4) + "-" + newaccmonth.substring(5,7)+"-01','+1 month','-1 day'); ");
-          // cntnum = cntx.sqldata[0].cntx;
-          // if (cntnum < 10){ cntnum = "0" + cntnum;}
-          sql2.push('\'' + newaccmonth.substring(0,4) + "-" + newaccmonth.substring(5,7) +"-01'");
-        }
-      }else {
-        if ((input.attr("type") != 'hidden') &&  (input.attr("id") != 'childname')  && (input.attr("id") != 'ischeckservice')) {
-          if (input.attr("type") == "file") {
-            if (system.getDirectory(input.val()) != importpath.path) {
-              var newlocation= importpath.path + system.sep() + system.getFileName(input.val());
-              OS.File.copy(input.val(), newlocation);
-            }
-          }
-          var ival = input.val();
-          if ((input.attr("id") == 'reference') && $("#frmeditaccounting #ischeckservice").is(":checked")){
-            sql2.push("nocheckservice='1'");
-          }
-          var ival = encodeparam(ival,input.attr('type'));
-          sql2.push('"' + input.attr("id") +'"='+ ival);
-          if (input.attr("id") == 'invoicedate'){
-            var newaccmonth = ival.replace(/'/g,"");
-          //   var cntx = appdb.dbquery("select count(accmonth)+1 as cnt from accounting where childuuid = '"+ pconfig.accchild +"' and accmonth between date('"+newaccmonth.substring(0,4) + "-" + newaccmonth.substring(5,7)+"-01') and date('"+newaccmonth.substring(0,4) + "-" + newaccmonth.substring(5,7)+"-01','+1 month','-1 day'); ");
-          // cntnum = cntx.sqldata[0].cntx;
-          // if (cntnum < 10){ cntnum = "0" + cntnum;}
-            sql2.push('"accmonth"=\'' + newaccmonth.substring(0,4) + "-" + newaccmonth.substring(5,7) +"-01'");
-          }
-          
-        }
-      }
-    }
-
-  });
-  var xsql = "";
-  if (type == 'upd') {
-    xsql = "UPDATE accounting SET "+sql2.join(',')+" where \"uuid\"='" + $("#frmeditaccounting #uuid").val() +"';";
-  }else {
-    sql1.push("uuid");
-    sql2.push("'" + appdb.generate_uuid() + "'");
-    xsql = "INSERT INTO accounting ("+sql1.join(',')+") VALUES ("+sql2.join(',')+");"; 
-  }
-  //jsdump(xsql);
-  appdb.dbexec(xsql);
-  load_accounting_table();
-  $("#frmeditaccounting #uuid").val("0");
-  $("#edit_accounting").modal('hide');
-}
-
-function print_list(){
-  globelreq.send_request({page:'preview2',data:{page: 'accountingopeninvoice'}});
-}
-
-function openfile(fi){
-  var ddir = system.getDirectory(appdb.dbFile.path);
-  var ff = system.openFile(ddir + system.sep() + 'imports' + system.sep() + crecheuuid +system.sep() + fi);
-}
-
diff --git a/modules/accounting/js/accountingyear.js b/modules/accounting/js/accountingyear.js
deleted file mode 100644
index 5abcad1..0000000
--- a/modules/accounting/js/accountingyear.js
+++ /dev/null
@@ -1,501 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg ) 
-
-var pconfig = {};
-var cdate = null;
-var initdate = new Date();
-initdate.setDate(1);
-var winh= window.innerHeight -120;
-var tblacc = null;
-var curchilduuid = '';
-var crecheuuid = null;
-var importpath = null;
-//var lictype = apppref.getpreference("support.lictype"); 
-//var amonth = ['','Janvier','Février','Mars','Avril','Mai','Juin','Juillet','Aôut','Septembre','Novembre','Décembre'];
-//var amonth = ['','Janv','Févr','Mars','Avril','Mai','Juin','Juil','Aôut','Sept','Nov','Déc'];
-var defamountcolors ={ "invoiced":"#003300","payed":"#660066","benefit":"#663300","openinvoices":"#cc0000","income":"#000000"};
-//"preview":"#ff6600","calculated":"#003366",
-var defamounttitles ={
-  //"calculated":"calculées",
-      "invoiced":"facturées",
-      "payed":"payées",
-      "benefit":"prestations",
-      "openinvoices":"factures ouverts",
-      "income":"revenu (facturées + prestations)"
-      //"preview":"prévision"
-      };
-      
-function initdata(){
-  load_helpers();
-  var configdata = apppref.getpreference("pageconfig.accountingyear");
-  if (configdata != '') {
-    pconfig = JSON.parse(configdata);
-  }
-  if (!pconfig.printlayout) {
-    pconfig.printlayout = 'list';
-    apppref.setpreference("pageconfig.accountingyear",pconfig);
-  }
-  if (!pconfig.amountcolors) {
-    pconfig.amountcolors = defamountcolors;
-  }
-  if (!pconfig.filteramount) {
-    pconfig.filteramount = ["calculated","openinvoices","income"];
-  }
-  if ((!pconfig) || (!pconfig.accyear)){
-    pconfig.accyear=new Date().toLocaleFormat("%Y");
-    apppref.setpreference("pageconfig.accountingyear",pconfig);
-  }
-  //if (lictype != "free"){
-  //  $("#mnuacc").css({"position":"absolute","z-index":"1000"});
-  //}
-  set_selectyears();
-  load_amount_selection("filter_amounts");
-
-  
-  set_infoheader( "Année " + pconfig.accyear);
-  load_accounting_table();
-  
-}
-
-function print_list(){
-  globelreq.send_request({page:'preview2',data:{page: 'accounting'}});
-}
-
-function load_accounting_table(){
- 
-  
-  var daterangesql = "select case when strftime('%Y',date(yeardaybegin)) == '"+pconfig.accyear+"' then yeardaybegin else strftime('%Y-%m-%d',date(date(yeardaybegin),'+7 days')) end as yeardaybegin,"+
-  "strftime('%Y-%m-%d',date(date(yeardayend),'+6 days')) as yeardayend "+
-  "from ( " +
-  "select case when strftime('%w','"+pconfig.accyear+"-01-01') = '1' then strftime('%Y-%m-%d','"+pconfig.accyear+"-01-01') else strftime('%Y-%m-%d', date(date('"+pconfig.accyear+"-01-01','-7 days'),'weekday 1')) end as yeardaybegin, "+
-  "case when strftime('%w','"+pconfig.accyear+"-12-31') = '1' then strftime('%Y-%m-%d','"+pconfig.accyear+"-12-31') else strftime('%Y-%m-%d', date(date('"+pconfig.accyear+"-12-31','-7 days'),'weekday 1')) end as yeardayend "+
-  ");";
-  var daterange = appdb.dbquery(daterangesql);
-  daterange = daterange.sqldata[0];
-  var ydaybegin = daterange.yeardaybegin;
-  var ydayend = daterange.yeardayend;
-  
-  var accsql = "SELECT childname, CAST(substr(calmonth,1,2) as int) as calmonth, substr(calmonth,4) as calyear, ";
-  //if ((pconfig.filteramount.indexOf("calculated") != -1)  ){
-  //  accsql += "case when substr(calmonth,4) || substr(calmonth,1,2) <= strftime('%Y%m',date('now')) then printf(\"%.2f\",SUM(weektotalhourcosts + weektotallunchcosts)) else null end AS calculatedamount, ";
-  //}
-  //if ((pconfig.filteramount.indexOf("preview") != -1)  ){
-  //  accsql += "case when substr(calmonth,4) || substr(calmonth,1,2) > strftime('%Y%m',date('now')) then printf(\"%.2f\",SUM(weektotalhourcosts + weektotallunchcosts))  else null end AS previewamount, ";
-  //}
-  if (pconfig.filteramount.indexOf("invoiced") != -1) {
-    accsql += "case when invoiceamount is not null then printf(\"%.2f\",invoiceamount) else null end as invoicedamount, ";
-  }
-  if (pconfig.filteramount.indexOf("payed") != -1) {
-    accsql += "case when payedamount is not null then printf(\"%.2f\",payedamount) else null end as payedamount, ";
-  }
-  if (pconfig.filteramount.indexOf("benefit") != -1) {
-    accsql += "case when benefitamount is not null then printf(\"%.2f\",benefitamount) else null end as benefitamount, ";
-  }
-  if (pconfig.filteramount.indexOf("openinvoices") != -1) {
-    accsql += "case when invoiceamount is not null and (payedamount is null or payedamount < invoiceamount) is not null then printf(\"%.2f\",invoiceamount - coalesce(payedamount,0.00)) else null end as openinvoicesamount, ";
-  }
-  if (pconfig.filteramount.indexOf("income") != -1) {
-    accsql += "case when benefitamount is not null or invoiceamount is not null then printf(\"%.2f\",coalesce(benefitamount,0.00) + coalesce(invoiceamount,0.00)) else null end as incomeamount, ";
-  }
-
-accsql += "null as nouse FROM ( SELECT childname, ttl.childuuid, calmonth, sumdurationcalweek * weekhourcosts AS weektotalhourcosts, sumlunchcalweek * weeklunchcosts AS weektotallunchcosts, acc.invoiceamount, acc.payedamount, benefitamount " +
-"FROM ( SELECT pch.childname, pch.childuuid, px.calweek, px.calmonth, px.sumdurationcalweek, px.sumlunchcalweek, " +
-
-"CASE WHEN px.sumdurationcalweek IS NOT NULL AND pch.checkservicenumber IS NOT NULL THEN ( SELECT coalesce(wc0.costsperhour,0.00) FROM costs wc0 WHERE wc0.startdate < date('"+ydaybegin+"','+' || caldays || ' days') and wc0.weeklyhourslimit <= px.sumdurationcalweek ORDER BY wc0.startdate DESC,wc0.weeklyhourslimit DESC LIMIT 1 ) WHEN px.sumdurationcalweek IS NOT NULL AND pch.checkservicenumber IS NULL THEN ( SELECT coalesce(wc0.costperhourfallback,0.00) FROM costs wc0 WHERE wc0.startdate < date('"+ydaybegin+"','+' || caldays || ' days') and wc0.weeklyhourslimit <= px.sumdurationcalweek ORDER BY wc0.startdate DESC,wc0.weeklyhourslimit DESC LIMIT 1 ) ELSE NULL END AS weekhourcosts,"+
-
-"CASE WHEN px.sumlunchcalweek IS NOT NULL  THEN ( SELECT coalesce(wc0.dailylunchcosts,0.00) FROM costs wc0 WHERE wc0.startdate < date('"+ydaybegin+"','+' || caldays || ' days') and wc0.weeklyhourslimit <= px.sumdurationcalweek ORDER BY wc0.startdate DESC,wc0.weeklyhourslimit DESC LIMIT 1) ELSE NULL END AS weeklunchcosts " +
-
-"FROM ( SELECT COALESCE(ch.prename,'') || ' ' || COALESCE(ch.surname,'') || '<br>(' || COALESCE(ch.checkservicenumber,'') || ')' AS childname, ch.uuid AS childuuid,ch.checkservicenumber FROM childs ch JOIN planning pl ON ( ch.uuid=pl.childuuid) ) pch " +
-"LEFT JOIN ( SELECT childuuid, calweek,case when strftime('%w',date(calyear ||'-01-01')) in ('1','2','3','4') then (cast(calweek as int)*7)-7 else (cast(calweek as int)*7) end as caldays, calmonth, sumlunchcalweek, " +
-"COALESCE(SUM(monduration + tueduration + wedduration + thuduration + friduration),0.0) AS sumdurationcalweek " +
-"FROM ( SELECT childuuid, daydate,calmonth,calyear, " +
-"CASE WHEN strftime('%w',DATE(calyear ||'-01-01')) IN ('1', '2', '3', '4') THEN CASE WHEN calweek < '10' THEN '0' ELSE '' END || CAST(calweek AS INT)+1 ELSE calweek END AS calweek, " +
-"MAX(monlunch) + MAX(tuelunch) + MAX(wedlunch) + MAX(thulunch) + MAX(frilunch) AS sumlunchcalweek, " +
-"MAX(monduration) + MAX(monduration2) AS monduration, " +
-"MAX(tueduration) + MAX(tueduration2) AS tueduration, " +
-"MAX(wedduration) + MAX(wedduration2) AS wedduration, " +
-"MAX(thuduration) + MAX(thuduration2) AS thuduration, " +
-"MAX(friduration) + MAX(friduration2) AS friduration " +
-"FROM ( SELECT xx.childuuid, xx.daydate, strftime('%Y',xx.daydate) AS calyear, " +
-"CASE WHEN strftime('%w',xx.daydate)='0' THEN strftime('%W',DATE(xx.daydate,'-6 days')) ELSE strftime('%W',DATE(DATE(xx.daydate),'-' || strftime('%w',DATE(xx.daydate)) || ' days', '+1 day')) END AS calweek, " +
-"CASE WHEN strftime('%w',xx.daydate)='0' THEN strftime('%m.%Y',DATE(xx.daydate,'-6 days')) ELSE strftime('%m.%Y',DATE(DATE(xx.daydate),'-' || strftime('%w',DATE(xx.daydate)) || ' days', '+1 day')) END AS calmonth, " +
-"CASE WHEN lunch=1 AND status IN (1,5) AND strftime('%w',daydate) = '1' THEN 1 ELSE 0 END AS monlunch, " +
-"CASE WHEN lunch=1 AND status IN (1,5) AND strftime('%w',daydate) = '2' THEN 1 ELSE 0 END AS tuelunch, " +
-"CASE WHEN lunch=1 AND status IN (1,5) AND strftime('%w',daydate) = '3' THEN 1 ELSE 0 END AS wedlunch, " +
-"CASE WHEN lunch=1 AND status IN (1,5) AND strftime('%w',daydate) = '4' THEN 1 ELSE 0 END AS thulunch, " +
-"CASE WHEN lunch=1 AND status IN (1,5) AND strftime('%w',daydate) = '5' THEN 1 ELSE 0 END AS frilunch, " +
-"CASE WHEN xx.status IS NOT NULL AND strftime('%w',xx.daydate) = '1' AND xx.daydate BETWEEN xx.datebegin AND xx.dateend THEN CAST(( (( CAST(SUBSTR(xx.montimeend,1,2) AS INT) *3600)+( CAST(SUBSTR(xx.montimeend,4,2) AS INT) *60))- ((CAST(SUBSTR(xx.montimebegin,1,2) AS INT) *3600)+( CAST(SUBSTR(xx.montimebegin,4, 2) AS INT) *60)) ) / 3600 AS REAL) ELSE 0.0 END AS monduration, " +
-"CASE WHEN xx.status IS NOT NULL AND strftime('%w',xx.daydate) = '2' AND xx.daydate BETWEEN xx.datebegin AND xx.dateend THEN CAST(( (( CAST(SUBSTR(xx.tuetimeend,1,2) AS INT) *3600)+( CAST(SUBSTR(xx.tuetimeend,4,2) AS INT) *60))- ((CAST(SUBSTR(xx.tuetimebegin,1,2) AS INT) *3600)+( CAST(SUBSTR(xx.tuetimebegin,4, 2) AS INT) *60)) ) / 3600 AS REAL) ELSE 0.0 END AS tueduration, " +
-"CASE WHEN xx.status IS NOT NULL AND strftime('%w',xx.daydate) = '3' AND xx.daydate BETWEEN xx.datebegin AND xx.dateend THEN CAST(( (( CAST(SUBSTR(xx.wedtimeend,1,2) AS INT) *3600)+( CAST(SUBSTR(xx.wedtimeend,4,2) AS INT) *60))- ((CAST(SUBSTR(xx.wedtimebegin,1,2) AS INT) *3600)+( CAST(SUBSTR(xx.wedtimebegin,4, 2) AS INT) *60)) ) / 3600 AS REAL) ELSE 0.0 END AS wedduration, " +
-"CASE WHEN xx.status IS NOT NULL AND strftime('%w',xx.daydate) = '4' AND xx.daydate BETWEEN xx.datebegin AND xx.dateend THEN CAST(( (( CAST(SUBSTR(xx.thutimeend,1,2) AS INT) *3600)+( CAST(SUBSTR(xx.thutimeend,4,2) AS INT) *60))- ((CAST(SUBSTR(xx.thutimebegin,1,2) AS INT) *3600)+( CAST(SUBSTR(xx.thutimebegin,4, 2) AS INT) *60)) ) / 3600 AS REAL) ELSE 0.0 END AS thuduration, " +
-"CASE WHEN xx.status IS NOT NULL AND strftime('%w',xx.daydate) = '5' AND xx.daydate BETWEEN xx.datebegin AND xx.dateend THEN CAST(( (( CAST(SUBSTR(xx.fritimeend,1,2) AS INT) *3600)+( CAST(SUBSTR(xx.fritimeend,4,2) AS INT) *60))- ((CAST(SUBSTR(xx.fritimebegin,1,2) AS INT) *3600)+( CAST(SUBSTR(xx.fritimebegin,4, 2) AS INT) *60)) ) / 3600 AS REAL) ELSE 0.0 END AS friduration, " +
-"CASE WHEN xx.status IS NOT NULL AND strftime('%w',xx.daydate) = '1' AND xx.daydate BETWEEN xx.datebegin AND xx.dateend AND xx.montimebegin2 IS NOT NULL AND xx.montimeend2 IS NOT NULL THEN CAST(( (( CAST(SUBSTR(xx.montimeend2,1,2) AS INT) *3600)+( CAST(SUBSTR(xx.montimeend2,4,2) AS INT) *60))- ((CAST(SUBSTR(xx.montimebegin2,1 ,2) AS INT) *3600)+( CAST(SUBSTR (xx.montimebegin2,4,2) AS INT) *60)) ) / 3600 AS REAL) ELSE 0.0 END AS monduration2, " +
-"CASE WHEN xx.status IS NOT NULL AND strftime('%w',xx.daydate) = '1' AND xx.daydate BETWEEN xx.datebegin AND xx.dateend AND xx.tuetimebegin2 IS NOT NULL AND xx.tuetimeend2 IS NOT NULL THEN CAST(( (( CAST(SUBSTR(xx.tuetimeend2,1,2) AS INT) *3600)+( CAST(SUBSTR(xx.tuetimeend2,4,2) AS INT) *60))- ((CAST(SUBSTR(xx.tuetimebegin2,1 ,2) AS INT) *3600)+( CAST(SUBSTR (xx.tuetimebegin2,4,2) AS INT) *60)) ) / 3600 AS REAL) ELSE 0.0 END AS tueduration2, " +
-"CASE WHEN xx.status IS NOT NULL AND strftime('%w',xx.daydate) = '1' AND xx.daydate BETWEEN xx.datebegin AND xx.dateend AND xx.wedtimebegin2 IS NOT NULL AND xx.wedtimeend2 IS NOT NULL THEN CAST(( (( CAST(SUBSTR(xx.wedtimeend2,1,2) AS INT) *3600)+( CAST(SUBSTR(xx.wedtimeend2,4,2) AS INT) *60))- ((CAST(SUBSTR(xx.wedtimebegin2,1 ,2) AS INT) *3600)+( CAST(SUBSTR (xx.wedtimebegin2,4,2) AS INT) *60)) ) / 3600 AS REAL) ELSE 0.0 END AS wedduration2, " +
-"CASE WHEN xx.status IS NOT NULL AND strftime('%w',xx.daydate) = '1' AND xx.daydate BETWEEN xx.datebegin AND xx.dateend AND xx.thutimebegin2 IS NOT NULL AND xx.thutimeend2 IS NOT NULL THEN CAST(( (( CAST(SUBSTR(xx.thutimeend2,1,2) AS INT) *3600)+( CAST(SUBSTR(xx.thutimeend2,4,2) AS INT) *60))- ((CAST(SUBSTR(xx.thutimebegin2,1 ,2) AS INT) *3600)+( CAST(SUBSTR (xx.thutimebegin2,4,2) AS INT) *60)) ) / 3600 AS REAL) ELSE 0.0 END AS thuduration2, " +
-"CASE WHEN xx.status IS NOT NULL AND strftime('%w',xx.daydate) = '1' AND xx.daydate BETWEEN xx.datebegin AND xx.dateend AND xx.fritimebegin2 IS NOT NULL AND xx.fritimeend2 IS NOT NULL THEN CAST(( (( CAST(SUBSTR(xx.fritimeend2,1,2) AS INT) *3600)+( CAST(SUBSTR(xx.fritimeend2,4,2) AS INT) *60))- ((CAST(SUBSTR(xx.fritimebegin2,1 ,2) AS INT) *3600)+( CAST(SUBSTR (xx.fritimebegin2,4,2) AS INT) *60)) ) / 3600 AS REAL) ELSE 0.0 END AS friduration2, " +
-"NULL AS nouse FROM ( " +
-"SELECT vacancydate AS daydate, CAST('0' AS BOOLEAN) AS lunch, 1 AS status, pl.* FROM vacancy va LEFT JOIN planning pl ON ( va.vacancydate BETWEEN pl.datebegin AND pl.dateend) WHERE va.vacancydateto is null and va.vacancydate BETWEEN '"+ydaybegin+"' AND '"+ydayend+"' AND strftime('%w',va.vacancydate) NOT IN ('0', '6') GROUP BY va.vacancydate, pl.childuuid " +
-"UNION " +
-"SELECT pr.daydate, pr.lunch, pr.status, pl.* FROM presence" +
-" pr JOIN planning pl ON ( pr.childuuid=pl.childuuid) WHERE pr.daydate BETWEEN '"+ydaybegin+"' AND ";
-
-if (pconfig.filteramount.indexOf("preview") != -1) {
-  accsql += "(select max(zz.daydate)  from presence zz where strftime('%Y-%m',zz.daydate) = strftime('%Y-%m',date('now')))"
-  accsql += " UNION " +
-"SELECT tmp.daydate, CASE WHEN pa.monlunch='1' AND strftime('%w',tmp.daydate) = '1' THEN 1 " +
-"WHEN pa.tuelunch='1' AND strftime('%w',tmp.daydate) = '2' THEN 1 " +
-"WHEN pa.wedlunch='1' AND strftime('%w',tmp.daydate) = '3' THEN 1 " +
-"WHEN pa.thulunch='1' AND strftime('%w',tmp.daydate) = '4' THEN 1 " +
-"WHEN pa.frilunch='1' AND strftime('%w',tmp.daydate) = '5' THEN 1 else 0 end as lunch, 1 as status , pa.*  " +
-"FROM (select daydate from ( ";
- accsql += getsqldaterange(ydaybegin,ydayend);
- accsql += ") dd where dd.daydate not in (select vacancydate from vacancy where vacancydateto is null) and dd.daydate > (select max(yy.daydate)  from presence yy where strftime('%Y-%m',yy.daydate) = strftime('%Y-%m',date('now'))   ) and strftime('%w',dd.daydate) not in ('0','6') ) tmp  " +
-"LEFT JOIN planning pa ON ( tmp.daydate BETWEEN pa.datebegin AND pa.dateend) ";
-  
-}else {
-  accsql += "'"+ydayend+"'";
-}
-accsql += ") xx " +
-"WHERE xx.daydate BETWEEN '"+ydaybegin+"' AND '"+ydayend+"' ";
-if (pconfig.filteramount.indexOf("preview") == -1) {
-  accsql += " and strftime('%Y-%m',xx.daydate) <= strftime('%Y-%m',date('now')) ";
-}
-accsql += ") GROUP BY childuuid,calweek) GROUP BY childuuid,calweek) px    " +
-"ON ( pch.childuuid=px.childuuid) GROUP BY px.childuuid,px.calweek ) ttl " +
-"LEFT JOIN accounting acc ON ( ttl.childuuid = acc.childuuid AND ttl.calmonth=strftime('%m.%Y',acc.accmonth)) WHERE calweek IS NOT NULL) " +
-"GROUP BY childname,calmonth ORDER BY childname,calmonth;";
-
-  var accdata = appdb.dbquery(accsql);
-  //dump(accsql + "\n");
-  var headerdata = getlabels("childname,jan,feb,mar,apr,may,jun,jul,aug,sep,oct,nov,dec,total");
-  $("#tbl_accounting").html("");
-  
-  var hrow = headerdata;
-  var tdclass= new Array();
-  var tblheader = '<tr>';
-
-  for (var h=0;h<hrow.length;h++){
-    tdclass.push(headerdata[h].class);
-    tblheader += '<th class="' + headerdata[h].class +'">'+ headerdata[h].title+'</th>';
-  }
-  tblheader += '</tr>';
-  
-  $("#tbl_accounting").append("<thead>" + tblheader + "</thead>");
-  $("#tbl_accounting").append("<tfoot>" + tblheader + "</tfoot>");
-  $("#tbl_accounting").append("<tbody>");
- 
-  var curchild = "";
-  
-  var tbody = "";
-  var trcells = [];
-  var colmonthsum = new Array(12);
-  for (var i in accdata.sqldata){
-    var row = accdata.sqldata[i];
-    if (curchild != row.childname) {
-      if (i != 0) {
-        var cells = [];
-  
-        for (var t in trcells){
-          if (trcells.length > 0) {
-            if (t == 12) {
-              for (var s in trcells[t]){
-                if (trcells[t][s] == 0) {
-                  trcells[t][s] = '';
-                } else {
-                  trcells[t][s] = '<span style="color:' + defamountcolors[pconfig.filteramount[s]] + ';">' + trcells[t][s].toFixed(2) + "</span>";  
-                }
-              }
-            }
-            cells[t] = trcells[t].join("<br/>");
-          }else {
-            cells[t] = "";
-          }
-        }
-
-        tbody += "<td class=\"alignright\">" + cells.join("</td><td class=\"alignright\">") +'</td></tr>';
-      }
-      tbody += '<tr><td>' + row.childname + '</td>';
-      trcells = [[],[],[],[],[],[],[],[],[],[],[],[],[]];
-      
-    }
-    var cmon = parseInt(row.calmonth)-1;
-    for (var x in pconfig.filteramount){
-  
-      trcells[cmon][x] = ((row[pconfig.filteramount[x] + "amount"] != '')?'<span style="color:' + defamountcolors[pconfig.filteramount[x]] + ';">' +row[pconfig.filteramount[x] + "amount"] + "</span>":"");
-      if (!trcells[12][x]) {
-        trcells[12][x] = 0;
-      }
-      trcells[12][x] = trcells[12][x] + ((row[pconfig.filteramount[x] + "amount"] != '')?parseFloat(row[pconfig.filteramount[x] + "amount"]):0.00);  
-    }
-    
-    curchild = row.childname;
-  }
-  var cells = [];
-      
-        for (var t in trcells){
-          if (trcells.length > 0) {
-            if (t == 12) {
-              for (var s in trcells[t]){
-                if (trcells[t][s] == 0) {
-                  trcells[t][s] = '';
-                } else {
-                  trcells[t][s] = '<span style="color:' + defamountcolors[pconfig.filteramount[s]] + ';">' + trcells[t][s].toFixed(2) + "</span>";  
-                }
-              }
-            }
-            cells[t] = trcells[t].join("<br/>");
-          }else {
-            cells[t] = "";
-          }
-        }
-      
-        tbody += "<td class=\"alignright\">" + cells.join("</td><td class=\"alignright\">") +'</td></tr>';
-  $("#tbl_accounting").append(tbody); 
-  $("#tbl_accounting").append("</tbody>");
- 
-  winh = window.innerHeight -130 - ((pconfig.filteramount.length == 0)? 80:pconfig.filteramount.length*16);
-  tblacc = $("#tbl_accounting").dataTable({
-        "language": {
-          "url": "../../web/js/locale/datatable_fr.json"
-        },
-        "paging":   false,
-        "ordering": true,
-        "bAutoWidth": false,
-        "scrollY": winh + "px",
-        "scrollCollapse": true,
-        "info":     false,
-        "filter": true,
-        "destroy": true,
-        "footerCallback": function ( row, data, start, end, display ) {
-         var api = this.api(), data;
-            
-            var formatfootercell = function(r){
-              var afil = 0;
-              var dspa = new Array();
-              //dump(r + "\n");
-              for (var x=0;x<r.length;x++){
-                
-                if (r[x] != 0) {
-                  
-                  dspa.push('<span style="color:' + defamountcolors[pconfig.filteramount[x]] + ';">' + r[x].toFixed(2)+ "</span>");
-                  afil++;
-                }
-              }
-              return dspa.join('<br/>');
-            }
-            //var emptarray
-            var nospan = /\d+\.\d+/g;
-            var intVal = function ( i ) {
-                var spl = [];
-                
-                if ((!i) || (i == '') ) {
-                  for (var x = 0;x<pconfig.filteramount.length;x++){
-                    spl.push(0);
-                  }
-                }
-                if (typeof i === 'string') {
-                 
-                  i= i.replace(/<span style="color:#\w+;">/g,'').replace(/<span>/g,'');
-                  spl = i.split("<br>");
-                 
-                  if (!spl) {
-                    spl =new Array();
-                  }
-                  for (var x = spl.length;x<pconfig.filteramount.length;x++){
-                    spl.push(0);
-                  }
-                  for (var x in spl){
-                    if(spl[x] == ''){
-                      spl[x] = 0;
-                    }
-                  }
-                }
-                if (typeof i === 'object') {
-                  spl = i;
-                }
-              
-                return spl;
-            };
-            retvals = function(c,d){
-              var nr = [];
-              
-              for (var s=0;s<pconfig.filteramount.length;s++){
-                if (!c[s]) { c[s] = 0;}
-                if (!d[s]) { d[s] = 0;}
-                nr.push(parseFloat(c[s]) + parseFloat(d[s]));
-              }
-              
-              return nr;
-            }
-            jantotal = api.column( 1, { page: 'current'} ).data().reduce( function (a, b) {
-                    
-                    return retvals(intVal(a),intVal(b));
-                }, 0 );
-            febtotal = api.column( 2, { page: 'current'} ).data().reduce( function (a, b) {
-                    return retvals(intVal(a),intVal(b));
-                }, 0 );
-            martotal = api.column( 3, { page: 'current'} ).data().reduce( function (a, b) {
-                    return retvals(intVal(a),intVal(b));
-                }, 0 );
-            aprtotal = api.column( 4, { page: 'current'} ).data().reduce( function (a, b) {
-                    return retvals(intVal(a),intVal(b));
-                }, 0 );
-            maytotal = api.column( 5, { page: 'current'} ).data().reduce( function (a, b) {
-                    return retvals(intVal(a),intVal(b));
-                }, 0 );
-            juntotal = api.column( 6, { page: 'current'} ).data().reduce( function (a, b) {
-                    return retvals(intVal(a),intVal(b));
-                }, 0 );
-            jultotal = api.column( 7, { page: 'current'} ).data().reduce( function (a, b) {
-                    return retvals(intVal(a),intVal(b));
-                }, 0 );
-            augtotal = api.column( 8, { page: 'current'} ).data().reduce( function (a, b) {
-                    return retvals(intVal(a),intVal(b));
-                }, 0 );
-            septotal = api.column( 9, { page: 'current'} ).data().reduce( function (a, b) {
-                    return retvals(intVal(a),intVal(b));
-                }, 0 );
-            octtotal = api.column( 10, { page: 'current'} ).data().reduce( function (a, b) {
-                    
-                    return retvals(intVal(a),intVal(b));
-                }, 0 );
-            novtotal = api.column( 11, { page: 'current'} ).data().reduce( function (a, b) {
-                    return retvals(intVal(a),intVal(b));
-                }, 0 );
-            dectotal = api.column( 12, { page: 'current'} ).data().reduce( function (a, b) {
-                    return retvals(intVal(a),intVal(b));
-                }, 0 );
-            alltotal = api.column( 13, { page: 'current'} ).data().reduce( function (a, b) {
-                    return retvals(intVal(a),intVal(b));
-                }, 0 );
-            $( api.column( 0).footer() ).html("Totaux");
-            $( api.column( 1 ).footer() ).html(formatfootercell(jantotal));
-            $( api.column( 1 ).footer() ).addClass("alignright aligntop");
-            $( api.column( 2 ).footer() ).html(formatfootercell(febtotal));
-            $( api.column( 2 ).footer() ).addClass("alignright aligntop");
-            $( api.column( 3 ).footer() ).html(formatfootercell(martotal));
-            $( api.column( 3 ).footer() ).addClass("alignright aligntop");
-            $( api.column( 4 ).footer() ).html(formatfootercell(aprtotal));
-            $( api.column( 4 ).footer() ).addClass("alignright aligntop");
-            $( api.column( 5 ).footer() ).html(formatfootercell(maytotal));
-            $( api.column( 5 ).footer() ).addClass("alignright aligntop");
-            $( api.column( 6 ).footer() ).html(formatfootercell(juntotal));
-            $( api.column( 6 ).footer() ).addClass("alignright aligntop");
-            $( api.column( 7 ).footer() ).html(formatfootercell(jultotal));
-            $( api.column( 7 ).footer() ).addClass("alignright aligntop");
-            $( api.column( 8 ).footer() ).html(formatfootercell(augtotal));
-            $( api.column( 8 ).footer() ).addClass("alignright aligntop");
-            $( api.column( 9 ).footer() ).html(formatfootercell(septotal));
-            $( api.column( 9 ).footer() ).addClass("alignright aligntop");
-            $( api.column( 10 ).footer() ).html(formatfootercell(octtotal));
-            $( api.column( 10 ).footer() ).addClass("alignright aligntop");
-            $( api.column( 11 ).footer() ).html(formatfootercell(novtotal));
-            $( api.column( 11 ).footer() ).addClass("alignright aligntop");
-            $( api.column( 12 ).footer() ).html(formatfootercell(dectotal));
-            $( api.column( 12 ).footer() ).addClass("alignright aligntop");
-            $( api.column( 13 ).footer() ).html(formatfootercell(alltotal));
-            $( api.column( 13 ).footer() ).addClass("alignright aligntop");
-        }
-      });
-//  $('#tbl_accounting').on( 'search.dt', function () {
-//    
-//    pconfig.filter = tblacc.api().search();
-//    
-//    apppref.setpreference("pageconfig.accountingyear",pconfig);
-//  } );
-
-  $('#tbl_accounting').on( 'order.dt', function () {
-    pconfig.order= tblacc.fnSettings().aaSorting;
-    
-    apppref.setpreference("pageconfig.accountingyear",pconfig);
-    
-  } );
-  
-//  if (pconfig.filter) {
-//    tblacc.fnFilter(pconfig.filter);
-//  }
-  if (pconfig.order) {
-   
-    tblacc.fnSort(pconfig.order);
-  }
-  
-  
-
-$('#tbl_accounting tbody').on( 'click', 'tr', function () {
-        if ( $(this).hasClass('selected') ) {
-          
-        }
-        else {
-            tblacc.$('tr.selected').removeClass('selected');
-            $(this).addClass('selected');
-        }
-    } );
- 
-}
-
-function getsqldaterange(ydb,yde) {
-  var dtydb = new Date(ydb);
-  
-  var dtyde = new Date(yde);
- 
-  var sday = new Array();
-  for (var cdate=dtydb;cdate<=dtyde;cdate.setDate(cdate.getDate() +1)){
-            if ((cdate.getDay() != 0) && (cdate.getDay() != 6)){
-                sday.push("select date('" + cdate.toLocaleFormat('%Y-%m-%d') +"') as daydate");
-            }
-  }
-  
-  return sday.join(" UNION ");
-}
-
-function set_selectyears() {
-  var years = appdb.dbquery("select strftime('%Y',min(entrydate)) as minyear,strftime('%Y',max(leavedate)) as maxyear from childs;");
-  var minyear = parseInt(years.sqldata[0].minyear);
-  var maxyear = parseInt(years.sqldata[0].maxyear);
-  for (var y=minyear;y<=maxyear;y++){
-    var sel = "";
-    if (y == pconfig.accyear) {
-      sel=' selected="1" ';
-    }
-    $("#accyear").append("<option value=\""+y+"\""+sel+">"+y+"</option>");
-  }
-  
-}
-
-function load_amount_selection(objid) {
-  for (var s in defamounttitles){
-    $('#' + objid).append('<option value="'+ s +'">&lt;span style="color: '+defamountcolors[s]+';" &gt;' +defamounttitles[s]+ '&lt;/span&gt;</option>');
-  }
-  
-  if (pconfig.filteramount) {
-    $('#' + objid).multiselect({enableHTML: true,numberDisplayed:8,nonSelectedText:"Tous",allSelectedText: 'Tous'});
-    $('#' + objid).multiselect('select',pconfig.filteramount);
-  } else {
-    $('#' + objid).multiselect({enableHTML: true,numberDisplayed:8,nonSelectedText:"Tous",allSelectedText: 'Tous'});  
-  }
-}
-
-function onselamount() {
-  if ($('#filter_amounts').val()) {
-    pconfig.filteramount = $('#filter_amounts').val();
-  }else {
-    pconfig.filteramount = ["invoiced","payed","openinvoices","income","benefit"];
-  }
-  apppref.setpreference("pageconfig.accountingyear",pconfig);
-  load_accounting_table();
-}
-
-function set_accyear(){
-  pconfig.accyear = $('#accyear').val();
-  apppref.setpreference("pageconfig.accountingyear",pconfig);
-      globelreq.send_request({
-            page: 'accountingyear',
-            module: 'accounting',
-            data: null,
-            header: 'Bilan annuelle'
-      });
-}
-
-
-
-
diff --git a/modules/accounting/js/checkservice.js b/modules/accounting/js/checkservice.js
deleted file mode 100644
index 4d372a2..0000000
--- a/modules/accounting/js/checkservice.js
+++ /dev/null
@@ -1,137 +0,0 @@
-function initdata(){
-	curcfg.loadconfig(apppref.getpreference("support.database.currentdb.num"));
-	load_helpers();
-//  //var importpath = {path : apppref.curcfg.dbpath + '/' +apppref.curcfg.db.substring(0,-6) +'/import/' };
-//
-////    pconfig.printlayout = 'list';
-//  var ccreche = appdb.dbquery("select uuid from creche LIMIT 1;");
-//  crecheuuid = ccreche.sqldata[0].uuid;
-//
-//  
-//  if ((apppref.curcfg.pageconfig.data) && (apppref.curcfg.pageconfig.data.accmonth)) {
-//    
-//    initdate = new Date(apppref.curcfg.pageconfig.data.accmonth);
-//    
-//  }
-//  $("#accmonth").val(formatMonthYearDate(initdate));
-//  apppref.setpreference("data","accmonth",formatisodate(initdate));
-//  cdate = initdate.toISOString().substring(0,10);
-//
-//  load_accounting_table();
-//  var bfile = appdb.dbquery("select benefitfile from accounting where accmonth = date('"+apppref.curcfg.pageconfig.data.accmonth+"') group by benefitfile LIMIT 1;");
-//  
-//  if ((bfile.sqldata) && (bfile.sqldata.length == 1)) {
-//    $('#mnuacc').append("<button type=\"button\" class=\"btn btn-primary\" onclick=\"openfile('"+ bfile.sqldata[0].benefitfile +"');\" title=\"editer\"><span class=\"glyphicon glyphicon-open\"></span> fichier des prestations</button>");
-//  }
-//  $("#accmonth").on("change", function (e) {
-//    set_accmonth();
-//  });
- 
-}
-
-function loadinvoicepdf(){
-	var lastdir = apppref.getpreference("support.lastfiledir");
-    var nsIFilePicker = Components.interfaces.nsIFilePicker;
-    var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
-    fp.init(window, "selectionner fichier PDF", nsIFilePicker.modeOpen);
-    fp.appendFilter("PDF", "*.pdf");
-    if (lastdir != '') {
-      var nsILocalFile= Components.interfaces.nsILocalFile;
-      var f = Components.classes["@mozilla.org/file/local;1"].createInstance(nsILocalFile);
-      f.initWithPath(lastdir);
-      fp.displayDirectory = f;
-    }
-    var res = fp.show();
-    if (res != nsIFilePicker.returnCancel) {
-      var pdffile = fp.file.path;
-      dump("PDF File Selected: " + pdffile + "\n");
-      apppref.setpreference("support.lastfiledir",system.getDirectory(pdffile));
-      $("#importfileinvoice").val(pdffile);
-    }
-}
-
-function loadinvoicexml(){
-	var lastdir = apppref.getpreference("support.lastfiledir");
-    var nsIFilePicker = Components.interfaces.nsIFilePicker;
-    var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
-    fp.init(window, "selectionner fichier XML", nsIFilePicker.modeOpen);
-    fp.appendFilter("XML", "*.xml");
-    if (lastdir != '') {
-      var nsILocalFile= Components.interfaces.nsILocalFile;
-      var f = Components.classes["@mozilla.org/file/local;1"].createInstance(nsILocalFile);
-      f.initWithPath(lastdir);
-      fp.displayDirectory = f;
-    }
-    var res = fp.show();
-    if (res != nsIFilePicker.returnCancel) {
-      var xmlfile = fp.file.path;
-      dump("XML File Selected: " + xmlfile + "\n");
-      apppref.setpreference("support.lastfiledir",system.getDirectory(xmlfile));
-      $('#importfilexml').val(xmlfile);
-    }
-}
-
-function importfiles(){
-	$("#btnimportfiles").hide();
-	$("#importresult").hide();
-	$("#importprogress").show();
-	
-	OS.File.remove(system.profiledir+ system.sep() + 'lastimport.json',{ignoreAbsent:true});
-	var cname = appdb.dbquery("select uuid from creche LIMIT 1;");
-    cruuid = cname.sqldata[0].uuid;
-    dump(curcfg.path.local  + system.sep() +"imports" + system.sep() + cruuid + "\n");
-    var importpath = FileUtils.File(curcfg.path.local  + system.sep() +"imports" + system.sep() + cruuid);
-    var args = ["-db",'"' + appdb.dbFile.path + '"',"-p",'"' +$("#importfileinvoice").val() + '"',"-o",'"' + importpath.path + '"',"-t",'"' + system.toolsdir() + '"',"-l", '"' + system.profiledir()+ system.sep() + 'lastimport.json'];
-    if ($('#importfilexml').val() != ""){
-    	args.push("-x");
-    	args.push('"' + $('#importfilexml').val() + '"');
-    }
-    
-    var binpdf = system.toolsdir() + system.sep() + "pdfextract.exe";
-    if (system.os != "WINNT") {
-      binpdf = system.toolsdir() + system.sep() + "pdfextract";
-    }
-    //dump(binpdf + " " +JSON.stringify(args) + "\n");
-    //system.popup("Import Factures!","Import du PDF '"+ pdffile.path +"' en cours!\n");
-    system.runcmdline(binpdf,args,setresult);
-
-}
-
-function setresult(data){
-    var strx = apppref.getpreference("pageconfig.lastpage");
-    var strjresult = system.readLocalTextFile(system.profiledir()+ system.sep() + 'lastimport.json');
-    var strx = apppref.getpreference("pageconfig.lastpage");
-    var x = JSON.parse(strx);
-    
-    if (x.module == 'accounting') {
-    	$("#tbl_importresult > tbody").html("");
-    	var tblx = sortByKey(JSON.parse(strjresult));
-    	for (var i in tblx){
-    		dump(i + "\n" + JSON.stringify(tblx[i][1]) + "\n-\n");
-    		var xd = '<tr>';
-    		xd += '<td>'+tblx[i][1].reference+'</td>';
-    		xd += '<td>'+tblx[i][1].checkservice+'</td>';
-    		xd += '<td>'+tblx[i][1].sqlresult+'</td>';
-    		xd += '</tr>';
-    		$("#tbl_importresult > tbody").append(xd);	
-    	}
-    	$("#importresult").html();
-    	$("#importprogress").hide();
-    	$("#btnimportfiles").show();
-    	$("#importresult").show();
-    }
-    
-  }
-
-function sortByKey(jsObj){
-    var sortedArray = [];
-
-    // Push each JSON Object entry in array by [key, value]
-    for(var i in jsObj)
-    {
-        sortedArray.push([i, jsObj[i]]);
-    }
-
-    // Run native sort function and returns sorted array.
-    return sortedArray.sort();
-}
diff --git a/modules/dashboard/index.js b/modules/dashboard/index.js
deleted file mode 100644
index ab68dc1..0000000
--- a/modules/dashboard/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-function initpage(){
-
-}
-// var lastpageopened = {};
-
-// function initdata(){
-//   set_infoheader("");
-// }
-
-// var strlp = apppref.getpreference("pageconfig.lastpage");
-// if (strlp !== '') {
-//   lastpageopened = JSON.parse(strlp);
-// }
-
-// if ((lastpageopened) && (lastpageopened.view != "")  && (lastpageopened.view != "home")){
-//   globelreq.send_request({page:lastpageopened.view,module:lastpageopened.module,header:lastpageopened.header},null);
-// }
diff --git a/modules/forms/forms.html b/modules/forms/forms.html
deleted file mode 100644
index 52753ab..0000000
--- a/modules/forms/forms.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-
-  <title>Creorga - Creche</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="cache-control" content="max-age=0" />
-  <meta http-equiv="cache-control" content="no-cache" />
-  <meta http-equiv="expires" content="0" />
-  <meta http-equiv="expires" content="Tue, 01 Jan 1970 1:00:00 GMT" />
-  <meta http-equiv="pragma" content="no-cache" />
-  <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-  <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-  <link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/dataTables.bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css">
-  <!-- <link href="../../web/css/bootstrap-timepicker.min.css" rel="stylesheet" type="text/css"> -->
-  <link href="../../web/css/glyphicons.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/creorga.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-    <div class="container-fluid" style="padding-top: 5px;">
-        <!--<span class="pagehead" id="pagehead">Formulaires</span>&nbsp;-->
-        <button  onclick="dlg_addform();" id="btnadd" class="btn btn-primary" type="button">
-  <span class="glyphicon glyphicon-plus"></span>
-</button>
-  
-   
-    <!--<button onclick="return globelreq.send_request({foo: 1}, something.callback)">send {foo: 1} with callback</button>-->
-    <!--<button onclick="return globelreq.send_request({baz: 3}, something.callback)">send {baz: 3} with callback</button>-->
-    <table id="tbl_forms" class="table table-striped">
-      
-    </table>
-    
-      </div>
-    <div class="modal fade" id="edit_forms">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title">Ajouter/Remplacer Fichier</h4>
-              </div>
-              <div class="modal-body">
-
-                <div id="frmeditforms">
-                  <input type="hidden" value="0" id="uuid" />
-                  
-                  
-                  <div class="form-group">
-                    <label for="name">Fichier</label>
-                    <input type="file" value="" id="file"  nullable="true" class="form-control">
-                  </div>
-                  <!--<div class="form-group">
-                    <label for="phone">Description</label>
-                    <input type="text" value="" id="description"  nullable="true" class="form-control">
-                  </div>-->
-                </div>
-                </div>
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Annuler</button> <button onclick="save_forms();" class="btn btn-primary">OK</button>
-              </div>
-              </div>
-
-              
-            </div>
-          </div>
-        </div>
-      
-      <div class="modal fade" id="confirm_delete_forms">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-
-                <h4 class="modal-title">Supprimer</h4>
-              </div><!-- dialog contents -->
-
-              <div class="modal-body">
-                Êtes vous sûre de supprimer ce fichier?
-
-                
-              </div><!-- dialog buttons -->
-
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Non</button> <button onclick="delete_forms();" class="btn btn-primary">Oui</button>
-              </div>
-            </div>
-          </div>
-        </div>  
-  <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/navigation.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/system.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-
-<script src="../../web/js/creorga.js" type="text/javascript"></script>
-<script src="../../web/js/labels.js" type="text/javascript"></script>
-<script src="js/forms.js" type="text/javascript"></script>
-  </body>
-</html>
-
diff --git a/modules/forms/forms.xul b/modules/forms/forms.xul
deleted file mode 100644
index 54eeef0..0000000
--- a/modules/forms/forms.xul
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE overlay PUBLIC "-//MOZILLA//DTD XUL V1.0//EN"
-"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<overlay id="ov_forms" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <toolbar id="co_maintoolbar" style="-moz-appearance: none;">
-    <toolbarbutton class="btn btn-default" id="tbb_forms" insertbefore="tbb_space" label="Formulaires" image="modules/forms/img/doc.png" orient="vertical" oncommand="navigation.load_appview('forms','forms',null,'Formulaires');"/>
-  </toolbar>
-</overlay>
\ No newline at end of file
diff --git a/modules/forms/img/doc.png b/modules/forms/img/doc.png
deleted file mode 100644
index 32dbbec46c44effdb3c8a4f490c6cd47b7d717f4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 761
zcmV<V0tWqwP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;0hTGGB|Nrq#XbN0)|OM
zK~z}7?Up}i6hRcme|xz^MZq+}XraMMNEK`)!Ab=SK|ydj(+PrwFtJfYj0}RUL`)$#
zjUXr@qA{075kvx77(EWbXmk_{MRMNdE_XI>VOer}|2CY350>3GyqW#po9}%y0TDA!
z)#=U_fn&fy;IY;IWwQwx(zhzG6PPtl4fg^7zzVPhm@`g|bPAvdyaQe*JoCWn8gm1A
zZv!40r}oJf2l2pc0)RYl1}Ff14Pt%*AA!Myb+!YyjZ-JB_PKTd>;|k<B4`j(0XDBO
z-XHUK35ap4{i9X^l!4EZWsndv8u4pD9hi}-Rb%m^K+6C=025aGLK2CLQ^$b~;tl~5
zz_``^PAhB;Qr3Z{X0;F6slYVwHKALUftw9@(2`}F^ztWRc_RS78?<360KzV)CdAZ4
zaMlID+mv*mV*o?IMcHTC)PYn03<6{8-4z*nY}pp$YQpxQ7XV7YJs=kYk%@e-MuaUB
z8;i%b4d9a1eo~Zjzi53KcxAP($oQCy=dJc$#zugxVMkf*zjq4Yt}M7ws_;v)y9Qh~
zPE7)5fp5Tqaq0+g0Jtu3Rp2~ut5X2sK@*-6=YT!HVdK<Q`S}gtzHHSna1>aO*gwEh
zw<IJ2q5y0H_KIHuzQ_%!E*V#VAHclTekIK|3`7<CA{7bO$*!?>Hf<fKOLo=B+(7)Y
ze1}g>4z#WTWMUO~Dg>O9E_eW3k&?dw-UBa$h!x{h-8gl+8x9;YPUWrkMdQ>d$#w~t
zl?%oR<5W(#@Wg7r3``lP7J(g7wddX3h&(U_JQGHTVlxn_PEp<ik)%qp4dErVAE;aH
rXWFfR0xqPezQI3r82ty(a{zw<F51q<eff3O00000NkvXXu0mjfTlP7A

diff --git a/modules/forms/img/form.png b/modules/forms/img/form.png
deleted file mode 100644
index 0de6475326bacc3d88a40d7b440257e8968bca8e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 333
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&kwgg;PjgQgFFV08r?br;B4q#NoHsY_pggCD<MuSDB#X
z-l4FBE24Antr?Rm*jLX{j^z^wddBdrs(AwUjoFtrdOEnP7M7K}%n)arCR?^Yy)D1~
z#(9S97U5$NN$dFL%wDJ(%*VJ&tbPsGidp3)t98^=dJ0Sa%Ipnsk!_GD6g!~5sM^or
z029CEYy&^}{EX*JHL{L13xxgeTnYJ7_PV0u`ikGo?+gwW3)_BZdcA9#0qcie&3FE~
z*Q}U4PIAqU`1kQsWfs?jEiYvH6TkHbGKx5W(SfJTv;N3){AcWua%!1h{XT{Hduxqf
Uh@jzCpf4FbUHx3vIVCg!0F%jhxc~qF

diff --git a/modules/forms/js/forms.js b/modules/forms/js/forms.js
deleted file mode 100644
index 5ca9c3a..0000000
--- a/modules/forms/js/forms.js
+++ /dev/null
@@ -1,93 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg )
-
-var wh= window.screen.height -400;
-var myfiles = null;
-var delform = null;
-var cruuid = null;
-var candelete = 0;
-function initdata(){
-      curcfg.loadconfig(apppref.getpreference("support.database.currentdb.num"));
-      load_table_forms();
-      set_infoheader("");
-      if (system.appinfo().ID.indexOf("director")){
-        candelete = 1;
-      }
-    }
-
-function load_table_forms(){
-      var cname = appdb.dbquery("select uuid from creche LIMIT 1;");
-      cruuid = cname.sqldata[0].uuid;
-
-      myfiles = system.getReports(cruuid);
-      var atbody = new Array();
-      for (var i=0;i<myfiles.length;i++){
-    	
-        var fname = system.getFileName(myfiles[i].path);
-        if (!fname.startsWith('.')){
-        	var row = new Array();
-          var btndelete = "";  
-            //if (candelete == 1){
-              btndelete = '<button onclick="delete_report('+i+');" class="btn btn-danger"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></button>';
-            //}
-            row.push('<button onclick="preview_report(' + i +');" class="btn btn-primary"><span class="glyphicon glyphicon-open" aria-hidden="true"></span></button>' + btndelete);
-            row.push(fname);
-            atbody.push(row);
-        }
-        
-  }
-
-  $("#tbl_forms").html("");
- 
-      
-
-      var headerdata = getlabels("action,description");
-      $("#tbl_forms").html("");
-      $("#tbl_forms").dataTable({
-        "language": {
-          "url": "js/locale/datatable_fr.json"
-        },
-        "data": atbody,
-        "columns": headerdata,
-        "paging":   false,
-        "scrollY": wh + "px",
-        "scrollCollapse": true,
-        "ordering": true,
-        "info":     false,
-        "filter": false,
-        "destroy": true
-      });
-}
-
-function preview_report(fi){
-  var ff = system.openFile(myfiles[fi].path);
-}
-
-
-function delete_report(fi) {
-  delform = fi;
-  confirm_delete_forms();
-}
-
-function dlg_addform(){
-      $("#edit_forms").modal('show');
-}
-    
-function confirm_delete_forms(){
-  $("#confirm_delete_forms").modal('show');
-  return false;
-}
-  
-function delete_forms(){
-  OS.File.remove(myfiles[delform].path);
-  setTimeout(function(){load_table_forms();$("#confirm_delete_forms").modal('hide');},3000);
-  delform = null;
-  return false;
-}
-  
-function save_forms(){
-  var file = $("#frmeditforms #file").val();
-  var path = FileUtils.File(curcfg.path.local  + system.sep() +"reports" + system.sep() + cruuid);
-  var newlocation= path.path + system.sep() + system.getFileName(file);
-  OS.File.copy(file, newlocation);
-  setTimeout(function(){load_table_forms();$("#edit_forms").modal('hide');},3000);
-}
diff --git a/modules/logbook/img/logbook.png b/modules/logbook/img/logbook.png
deleted file mode 100644
index a8c991455d6c00e6b00d7eb33aa3f811f8d05611..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 466
zcmV;@0WJQCP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;0hlM2ru$Tpnm`W0bfZ(
zK~z}7?bp9cR#6<s@s}k;__XGQ5+R77!95V8EnFJX=_qaf3%4zr;_TWIAxL)(S_HQo
zYzV@^si95r6m8}ZQjg2I@%V^}KOUc<`++a_o_oHR&-;AOcQ|K2m&&S`#R6`)SS3Wf
zi6QOQAFp<qPhk;5E?zA>#@_hT*5|eNzxH6T!~7xM;TqZ)zy`MS`)Sq2%^bsdv2DD-
zPt5-VD668t>n`(kOvjMEops4&RouoH9$*%udFuHA0KCQh4)YZ}iy?hKPt9XUo7lv1
zSrxzW5?64m&Zz+=^Rq7X9W0eq;f&>%jb>s<DUUy43nQILgGc;)H^+JPv8;-T7}5{?
z$#ICXm%4`!c{^5fQ(r28+}O4L_5<L=Mri;VfCiueXaE|32H?L0*zOm=^=$sAUjSe5
zB!=|$q*HOP^eTq5bJ;!6>bR)v^rH#qj+^ZD7L3P`){aZq2YZQ8^|ZCu_y7O^07*qo
IM6N<$f~C*ZLjV8(

diff --git a/modules/logbook/js/logactivity.js b/modules/logbook/js/logactivity.js
deleted file mode 100644
index 9b0711d..0000000
--- a/modules/logbook/js/logactivity.js
+++ /dev/null
@@ -1,326 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg )
-var pconfig = {};
-var winh= window.innerHeight -170;
-var tbllog = null;
-var crecheuuid = null;
-var initdate = new Date();
-var deluuid = "";
-var amonth = ['', 'Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Aôut', 'Septembre', 'Octobre','Novembre', 'Décembre'];
-var myhostname = system.hostname();
-
-function initdata(){
-	
-  load_helpers();
-  var configdata = apppref.getpreference("pageconfig.logactivity");
-  //dump("cfdata:" + configdata +"\n");
-  if ((configdata) && (configdata !== '')){
-    pconfig = JSON.parse(configdata);
-  }
-  //dump("logactivity Page new loaded!\n");
-  //if (!pconfig.printlayout) {
-    pconfig.printlayout = 'book';
-    apppref.setpreference("pageconfig.logactivity",pconfig);
-  //}
-  var ccreche = appdb.dbquery("select uuid from creche LIMIT 1;");
-  crecheuuid = ccreche.sqldata[0].uuid;
-  var edith = 270;
-  loadtextareas(edith);
-  myhostname = system.hostname();
-   if (pconfig.logmonth) {
-
-    initdate = new Date(encodeparam(pconfig.logmonth, 'month').replace(/'/g, ''));
-    $("#logmonth").val(pconfig.logmonth);
-  } else {
-    $("#logmonth").val(initdate.toLocaleFormat('%m.%Y'));
-    
-    pconfig.logmonth=initdate.toLocaleFormat("%m.%Y");
-    apppref.setpreference("pageconfig.logactivity",pconfig);
-  }
-  var acttitle = "";
-  if (pconfig.activityuuid){
-    var chdata = appdb.dbquery("select logtitle from activitylog where uuid='"+ pconfig.activityuuid +"'");
-    if (chdata.sqldata.length > 0){
-      acttitle = chdata.sqldata[0].logtitle + " - "; 
-    }
-  }
-  //dump(JSON.stringify(pconfig) + "\n");
-  set_infoheader(acttitle + " Mois: " + amonth[parseInt(pconfig.logmonth.substring(0, 3))] + " " + pconfig.logmonth.substring(3, 8));
-  
-  $('#logmonth').on('dp.hide', function(e) {
-    set_logmonth();
-  });
-  $("#btnedit").hide();
-  $("#btnprotection").hide();
-  $("#btndelete").hide();
-  load_logactivity_table();
- 
-}
-
-
-
-function load_logactivity_table(){
-  var mins = initdate.getTimezoneOffset() * -1;//dump("cur timezoneoffset:" + + "\n");
-  if (mins > 0){
-    mins = '+' + mins;
-  }
-  var logsql = "SELECT uuid, logtitle, strftime('%d.%m.%Y',logdatefrom) as logdatefrom, strftime('%d.%m.%Y',logdateto) as logdateto,'<span style=\"display:none\">' || lastmodified || '</span>' || strftime('%d.%m.%Y %H:%M',lastmodified,'"+mins+" minutes') as lastmodified,editor  FROM activitylog where date(logdatefrom) between date('"+initdate.toLocaleFormat("%Y-%m")+"-01') and date('"+initdate.toLocaleFormat("%Y-%m")+"-01','+1 month','-1 day') or logdateto between date('"+initdate.toLocaleFormat("%Y-%m")+"-01') and date('"+initdate.toLocaleFormat("%Y-%m")+"-01','+1 month','-1 day');";
-  var logdata = appdb.dbquery(logsql);
-  var headerdata = getlabels("activity,lastmodified,editor");
-  $("#tbl_logactivity").html("");
-
-  var tblheader = '<tr>';
-
-  for (var h in headerdata){
-    if ((headerdata[h].keyname == 'act') && (headerdata[h].class.indexOf('action1btn') == -1)){
-      headerdata[h].class +=" action1btn";
-    }
-
-    tblheader += '<th class="' + headerdata[h].class +'">'+ headerdata[h].title+'</th>';
-
-  }
-  tblheader += '</tr>';
-
-  
-  $("#tbl_logactivity").append("<thead>" + tblheader + "</thead>");
-  $("#tbl_logactivity").append("<tfoot>" + tblheader + "</tfoot>");
-  $("#tbl_logactivity").append("<tbody>");
- 
-
-  for (var i in logdata.sqldata){
-    var sel = "";
-    var row = logdata.sqldata[i];
-    if (pconfig.activityuuid && row.uuid == pconfig.activityuuid) {
-      sel = "selected";
-      load_activitylog();
-    }
-        //<td><button type="button" class="btn btn-danger" onclick="confirm_delete_logactivity(\''+ row.uuid +'\');" title=\"supprimer\"><span class=\"glyphicon glyphicon-remove\"></span></button></td>
-    //!= '')?'<button class="btn btn-danger" id="btnprotection" onclick="confirm_delete_protection();" style="display: none;"><span class="glyphicon glyphicon-remove"></span></button>':'') +row.editor    
-    var tr = '<tr data-activity="'+ row.uuid+'" data-editor="'+row.editor+'" class="'+ sel+'"><td>' + row.logtitle + '<br/><i>' + row.logdatefrom +' - ' + row.logdateto + '</i></td>'+
-        '<td>'+ row.lastmodified+'</td>'+'<td>'+ row.editor +'</td>'+
-        '</tr>';
-        
-        $("#tbl_logactivity").append(tr);
-    }
-    
-  $("#tbl_logactivity").append("</tbody>");
-
-
-  tbllog = $("#tbl_logactivity").dataTable({
-        "language": {
-          "url": "../../web/js/locale/datatable_fr.json"
-        },
-        "paging":   false,
-        "ordering": true,
-        "bAutoWidth": false,
-        "scrollY": winh + "px",
-        "scrollCollapse": true,
-        "info":     false,
-        "filter": false,
-        "destroy": true,
-      });
-  
-
-
-  $('#tbl_logactivity').on( 'order.dt', function () {
-    pconfig.order= tbllog.fnSettings().aaSorting;
-    apppref.setpreference("pageconfig.logactivity",pconfig);
- 
-  } );
-
-  if (pconfig.order) {
-    
-    tbllog.fnSort(pconfig.order);
-  }
-  
-  $('#tbl_logactivity tbody').on( 'click', 'tr', function () {
-      //dump("select activity\n");
-      if ( $(this).hasClass('selected') ) {
-         // $(this).removeClass('selected');
-      }
-      else {
-          //dump("select activity\n");
-    	  $("#btnedit").hide();
-    	  $("#btnprotection").hide();
-    	  $("#btndelete").hide();
-          tbllog.$('tr.selected').removeClass('selected');
-          $(this).addClass('selected');
-          var curactivity = $(this).attr('data-activity');
-          pconfig.activityuuid = curactivity;
-          var actlogsql = "SELECT editor FROM activitylog where uuid='"+ pconfig.activityuuid+"';";
-          var adata = appdb.dbquery(actlogsql);
-          
-          if (adata.sqldata[0].editor == '' || adata.sqldata[0].editor == myhostname){
-      	    $("#btnedit").show();
-      	    $("#btndelete").show();
-      		}
-      		if (adata.sqldata[0].editor != '' && adata.sqldata[0].editor != myhostname){
-      			$("#btnprotection").show();
-      		}
-          //setforeigneditor($(this).attr('data-editor'));
-          apppref.setpreference("pageconfig.logactivity",pconfig);
-          load_activitylog();
-      }
-  } );
-  
-}
-
-
-
-function newlogactivity(){
-  var nuuid = appdb.generate_uuid();
-  var sql = "INSERT INTO activitylog (uuid,logtitle,logdatefrom,logdateto) VALUES ('"+nuuid+"','nouvelle Activité',date('"+initdate.toLocaleFormat('%Y-%m-%d')+"'),date('"+initdate.toLocaleFormat('%Y-%m-%d')+"'));";
-  appdb.dbexec(sql);
-  pconfig.activityuuid=nuuid;
-  apppref.setpreference("pageconfig.logactivity",pconfig);
-  edit_activitylog();
-  //load_logactivity_table();
-}
-
-function load_activitylog(){
-	  $("#btnedit").hide();
-	  $("#btnprotection").hide();
-	  $("#btndelete").hide();
-  var actlogsql = "SELECT uuid, strftime('%d.%m.%Y',logdatefrom) as logdatefrom, strftime('%d.%m.%Y',logdateto) as logdateto, logtitle, logmessage,editor FROM activitylog where uuid='"+ pconfig.activityuuid+"';";
-  var adata = appdb.dbquery(actlogsql);
-  var inftitle = "";
-  if (adata.sqldata.length > 0){
-    $("#activityloguuid").val(adata.sqldata[0].uuid);
-    $("#activitylogmessage").html(htmlUnescape(adata.sqldata[0].logmessage))
-    $("#activitylogtitle").html(adata.sqldata[0].logtitle);
-    $("#activitylogdatefrom").html(adata.sqldata[0].logdatefrom);
-    $("#activitylogdateto").html(adata.sqldata[0].logdateto);
-    if (adata.sqldata[0].editor == '' || adata.sqldata[0].editor == myhostname){
-	    $("#btnedit").show();
-	    $("#btndelete").show();
-	}
-	if (adata.sqldata[0].editor != '' && adata.sqldata[0].editor != myhostname){
-	    $("#btnprotection").show();
-	}
-
-    inftitle=adata.sqldata[0].logtitle;
-  }else {
-    $("#activityloguuid").val(0);
-    $("#activitylogmessage").html("");
-    $("#activitylogtitle").html('');
-    $("#activitylogdatefrom").html('');
-    $("#activitylogdateto").html('');
-  }
-  
-  set_infoheader(inftitle + " Mois: " + amonth[parseInt(pconfig.logmonth.substring(0, 3))] + " " + pconfig.logmonth.substring(3, 8));
-
-}
-
-function edit_activitylog(){
-	var actlogsql = "SELECT uuid, strftime('%d.%m.%Y',logdatefrom) as logdatefrom, strftime('%d.%m.%Y',logdateto) as logdateto, logtitle, logmessage,editor FROM activitylog where uuid='"+ pconfig.activityuuid+"';";
-	
-	var adata = appdb.dbquery(actlogsql);
-    //dump("EDIT: " + JSON.stringify(chdata) + "\n");
-    if ((adata.sqldata[0].editor != '') && (adata.sqldata[0].editor != myhostname)){
-	system.popup("cette activité est bloqué par l'editeur: " + adata.sqldata[0].editor);
-	load_logactivity_table();
-	return;
-    }
-	seteditorhost();
-    if (adata.sqldata.length > 0){
-	$('#frmeditactivitylog #loguuid').val(adata.sqldata[0].uuid);
-	$("#frmeditactivitylog #logtitle").val(adata.sqldata[0].logtitle);
-    $("#frmeditactivitylog #logdatefrom").val(adata.sqldata[0].logdatefrom);
-    $("#frmeditactivitylog #logdateto").val(adata.sqldata[0].logdateto);
-	$("#frmeditactivitylog #logmessage").summernote('reset');
-	$("#frmeditactivitylog #logmessage").summernote('code',htmlUnescape(adata.sqldata[0].logmessage));
-    }
-    $("#edit_activitylog").modal('show');
-}
-
-function save_activitylog(){
-    var lsql = "";
-    //dump($('#frmeditactivitylog #logdateto').val() + " - " + $('#frmeditactivitylog #logdatefrom').val() + "\n");
-	$("#activityloguuid").val($("#frmeditactivitylog #loguuid").val());
-	//var tmpdate = encodeparam(pconfig.logdate, 'date').replace(/'/g, '');
-	var dt = encodeparam($("#frmeditactivitylog #logdateto").val(),"date");
-	var df = encodeparam($("#frmeditactivitylog #logdatefrom").val(),"date");
-	var ltitle = encodeparam($('#frmeditactivitylog #logtitle').val(),"text");
-	var lmessage = encodeparam($('#frmeditactivitylog #logmessage').val(),"richtextarea");
-	var uid = $("#frmeditactivitylog #loguuid").val();
-	//dump(df + " - " + dt + "\n");
-	var lsql = "UPDATE activitylog set logtitle="+ltitle+
-	",logmessage="+lmessage+
-	",logdatefrom=date("+df+")"+
-	",logdateto=date("+dt+") where uuid='"+uid+"';";
-	//dump(lsql + "\n");
-    appdb.dbexec(lsql);
-    removeeditorhost();
-    load_logactivity_table();
-    //load_activitylog();
-    $("#edit_activitylog").modal('hide');
-}
-
-function confirm_delete_activity() {
-
-  deluuid = $("#activityloguuid").val();
-  $('#confirm_delete_logactivity').modal('show');
-}
-
-function delete_logactivity() {
-  appdb.dbexec("delete from activitylog where uuid='"+ deluuid+"';");
-  load_logactivity_table();
-  $('#confirm_delete_logactivity').modal('hide');
-}
-
-function onnextmonth() {
-  var tmpmonth = new Date(encodeparam(pconfig.logmonth, 'month').replace(/'/g, ''));
-  var nmonth = new Date(tmpmonth.getFullYear(), tmpmonth.getMonth() + 1, tmpmonth.getDate());
-  pconfig.logmonth = nmonth.toLocaleFormat('%m.%Y');
-  apppref.setpreference("pageconfig.logactivity", pconfig);
-  globelreq.send_request({
-    page: 'logactivity',
-    module: 'logbook',
-    header: 'Livret des activités'
-  }, null);
-}
-
-function onpreviousmonth() {
-  var tmpmonth = new Date(encodeparam(pconfig.logmonth, 'month').replace(/'/g, ''));
-  var nmonth = new Date(tmpmonth.getFullYear(), tmpmonth.getMonth() - 1, tmpmonth.getDate());
-  pconfig.logmonth = nmonth.toLocaleFormat('%m.%Y');
-  apppref.setpreference("pageconfig.logactivity", pconfig);
-  globelreq.send_request({
-    page: 'logactivity',
-    module: 'logbook',
-    header: 'Livret des activités'
-  }, null);
-}
-
-function set_logmonth(){
-      pconfig.logmonth =$("#logmonth").val();
-      apppref.setpreference("pageconfig.logactivity",pconfig);
-      globelreq.send_request({
-            page: 'logactivity',
-            module: 'logbook',
-            header: 'Livret des activités'
-      });
-}
-
-function seteditorhost(){
-	appdb.dbexec("UPDATE activitylog set editor=null where editor='"+myhostname+"';");
-	appdb.dbexec("UPDATE activitylog set editor='"+myhostname+"' where uuid='"+$('#activityloguuid').val()+"';");
-}
-
-function removeeditorhost(){
-	appdb.dbexec("UPDATE activitylog set editor=null where editor='"+myhostname+"';");
-}
-
-
-function confirm_delete_protection(){
-	$("#confirm_delete_protection").modal('show');
-}
-
-function delete_protection(){
-	appdb.dbexec("UPDATE activitylog set editor=null where uuid='"+$('#activityloguuid').val()+"';");
-	$('#editorhost').html('');
-	$('#btneditorhost').removeClass('btn-danger');
-	$('#btneditorhost').addClass('btn-default');
-	$('#btnprotection').hide();
-	load_logactivity_table();
-	$("#confirm_delete_protection").modal('hide');
-}
\ No newline at end of file
diff --git a/modules/logbook/js/logactivity_basic.js b/modules/logbook/js/logactivity_basic.js
deleted file mode 100644
index 887a475..0000000
--- a/modules/logbook/js/logactivity_basic.js
+++ /dev/null
@@ -1,282 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg )
-var pconfig = {};
-var winh= window.innerHeight -170;
-var tbllog = null;
-var crecheuuid = null;
-var initdate = new Date();
-var deluuid = "";
-var amonth = ['', 'Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Aôut', 'Septembre', 'Octobre','Novembre', 'Décembre'];
-var myhostname = system.hostname();
-
-function initdata(){
-	
-  load_helpers();
-  var configdata = apppref.getpreference("pageconfig.logactivity");
-  //dump("cfdata:" + configdata +"\n");
-  if ((configdata) && (configdata !== '')){
-    pconfig = JSON.parse(configdata);
-  }
-  //dump("logactivity Page new loaded!\n");
-  //if (!pconfig.printlayout) {
-    pconfig.printlayout = 'book';
-    apppref.setpreference("pageconfig.logactivity",pconfig);
-  //}
-  var ccreche = appdb.dbquery("select uuid from creche LIMIT 1;");
-  crecheuuid = ccreche.sqldata[0].uuid;
-  var edith = 270;
-  loadtextareas(edith);
-  myhostname = system.hostname();
-   if (pconfig.logmonth) {
-
-    initdate = new Date(encodeparam(pconfig.logmonth, 'month').replace(/'/g, ''));
-    $("#logmonth").val(pconfig.logmonth);
-  } else {
-    $("#logmonth").val(initdate.toLocaleFormat('%m.%Y'));
-    
-    pconfig.logmonth=initdate.toLocaleFormat("%m.%Y");
-    apppref.setpreference("pageconfig.logactivity",pconfig);
-  }
-  var acttitle = "";
-  if (pconfig.activityuuid){
-    var chdata = appdb.dbquery("select logtitle from activitylog where uuid='"+ pconfig.activityuuid +"'");
-    if (chdata.sqldata.length > 0){
-      acttitle = chdata.sqldata[0].logtitle + " - "; 
-    }
-  }
-  //dump(JSON.stringify(pconfig) + "\n");
-  set_infoheader(acttitle + " Mois: " + amonth[parseInt(pconfig.logmonth.substring(0, 3))] + " " + pconfig.logmonth.substring(3, 8));
-  
-  $('#logmonth').on('dp.hide', function(e) {
-    set_logmonth();
-  });
-  $("#btnedit").hide();
-
-  load_logactivity_table();
- 
-}
-
-
-
-function load_logactivity_table(){
-  var mins = initdate.getTimezoneOffset() * -1;//dump("cur timezoneoffset:" + + "\n");
-  if (mins > 0){
-    mins = '+' + mins;
-  }
-  var logsql = "SELECT uuid, logtitle, strftime('%d.%m.%Y',logdatefrom) as logdatefrom, strftime('%d.%m.%Y',logdateto) as logdateto,'<span style=\"display:none\">' || lastmodified || '</span>' || strftime('%d.%m.%Y %H:%M',lastmodified,'"+mins+" minutes') as lastmodified,editor  FROM activitylog where date(logdatefrom) between date('"+initdate.toLocaleFormat("%Y-%m")+"-01') and date('"+initdate.toLocaleFormat("%Y-%m")+"-01','+1 month','-1 day') or logdateto between date('"+initdate.toLocaleFormat("%Y-%m")+"-01') and date('"+initdate.toLocaleFormat("%Y-%m")+"-01','+1 month','-1 day');";
-  var logdata = appdb.dbquery(logsql);
-  var headerdata = getlabels("activity,lastmodified,editor");
-  $("#tbl_logactivity").html("");
-
-  var tblheader = '<tr>';
-
-  for (var h in headerdata){
-    if ((headerdata[h].keyname == 'act') && (headerdata[h].class.indexOf('action1btn') == -1)){
-      headerdata[h].class +=" action1btn";
-    }
-
-    tblheader += '<th class="' + headerdata[h].class +'">'+ headerdata[h].title+'</th>';
-
-  }
-  tblheader += '</tr>';
-
-  
-  $("#tbl_logactivity").append("<thead>" + tblheader + "</thead>");
-  $("#tbl_logactivity").append("<tfoot>" + tblheader + "</tfoot>");
-  $("#tbl_logactivity").append("<tbody>");
- 
-
-  for (var i in logdata.sqldata){
-    var sel = "";
-    var row = logdata.sqldata[i];
-    if (pconfig.activityuuid && row.uuid == pconfig.activityuuid) {
-      sel = "selected";
-      load_activitylog();
-    }
-       
-    var tr = '<tr data-activity="'+ row.uuid+'" data-editor="'+row.editor+'" class="'+ sel+'"><td>' + row.logtitle + '<br/><i>' + row.logdatefrom +' - ' + row.logdateto + '</i></td>'+
-        '<td>'+ row.lastmodified+'</td>'+'<td>'+ row.editor +'</td>'+
-        '</tr>';
-        
-        $("#tbl_logactivity").append(tr);
-    }
-    
-  $("#tbl_logactivity").append("</tbody>");
-
-
-  tbllog = $("#tbl_logactivity").dataTable({
-        "language": {
-          "url": "../../web/js/locale/datatable_fr.json"
-        },
-        "paging":   false,
-        "ordering": true,
-        "bAutoWidth": false,
-        "scrollY": winh + "px",
-        "scrollCollapse": true,
-        "info":     false,
-        "filter": false,
-        "destroy": true,
-      });
-  
-
-
-  $('#tbl_logactivity').on( 'order.dt', function () {
-    pconfig.order= tbllog.fnSettings().aaSorting;
-    apppref.setpreference("pageconfig.logactivity",pconfig);
- 
-  } );
-
-  if (pconfig.order) {
-    
-    tbllog.fnSort(pconfig.order);
-  }
-  
-  $('#tbl_logactivity tbody').on( 'click', 'tr', function () {
-      //dump("select activity\n");
-      if ( $(this).hasClass('selected') ) {
-         // $(this).removeClass('selected');
-      }
-      else {
-          //dump("select activity\n");
-    	  $("#btnedit").hide();
-          tbllog.$('tr.selected').removeClass('selected');
-          $(this).addClass('selected');
-          var curactivity = $(this).attr('data-activity');
-          var actlogsql = "SELECT editor FROM activitylog where uuid='"+ pconfig.activityuuid+"';";
-          var adata = appdb.dbquery(actlogsql);
-          pconfig.activityuuid = curactivity;
-          if (adata.sqldata[0].editor == '' || adata.sqldata[0].editor == myhostname){
-      	    $("#btnedit").show();
-      		}
-          //setforeigneditor($(this).attr('data-editor'));
-          apppref.setpreference("pageconfig.logactivity",pconfig);
-          load_activitylog();
-      }
-  } );
-  
-}
-
-
-
-function newlogactivity(){
-  var nuuid = appdb.generate_uuid();
-  var sql = "INSERT INTO activitylog (uuid,logtitle,logdatefrom,logdateto) VALUES ('"+nuuid+"','nouvelle Activité',date('"+initdate.toLocaleFormat('%Y-%m-%d')+"'),date('"+initdate.toLocaleFormat('%Y-%m-%d')+"'));";
-  appdb.dbexec(sql);
-  pconfig.activityuuid=nuuid;
-  apppref.setpreference("pageconfig.logactivity",pconfig);
-  edit_activitylog();
-  //load_logactivity_table();
-}
-
-function load_activitylog(){
-	  $("#btnedit").hide();
-  var actlogsql = "SELECT uuid, strftime('%d.%m.%Y',logdatefrom) as logdatefrom, strftime('%d.%m.%Y',logdateto) as logdateto, logtitle, logmessage,editor FROM activitylog where uuid='"+ pconfig.activityuuid+"';";
-  var adata = appdb.dbquery(actlogsql);
-  var inftitle = "";
-  if (adata.sqldata.length > 0){
-    $("#activityloguuid").val(adata.sqldata[0].uuid);
-    $("#activitylogmessage").html(htmlUnescape(adata.sqldata[0].logmessage))
-    $("#activitylogtitle").html(adata.sqldata[0].logtitle);
-    $("#activitylogdatefrom").html(adata.sqldata[0].logdatefrom);
-    $("#activitylogdateto").html(adata.sqldata[0].logdateto);
-    if (adata.sqldata[0].editor == '' || adata.sqldata[0].editor == myhostname){
-	    $("#btnedit").show();
-	}
-
-    inftitle=adata.sqldata[0].logtitle;
-  }else {
-    $("#activityloguuid").val(0);
-    $("#activitylogmessage").html("");
-    $("#activitylogtitle").html('');
-    $("#activitylogdatefrom").html('');
-    $("#activitylogdateto").html('');
-  }
-  
-  set_infoheader(inftitle + " Mois: " + amonth[parseInt(pconfig.logmonth.substring(0, 3))] + " " + pconfig.logmonth.substring(3, 8));
-
-}
-
-function edit_activitylog(){
-	var actlogsql = "SELECT uuid, strftime('%d.%m.%Y',logdatefrom) as logdatefrom, strftime('%d.%m.%Y',logdateto) as logdateto, logtitle, logmessage,editor FROM activitylog where uuid='"+ pconfig.activityuuid+"';";
-	var adata = appdb.dbquery(actlogsql);
-	if ((adata.sqldata[0].editor != '') && (adata.sqldata[0].editor != myhostname)){
-		system.popup("cette activité est bloqué par l'editeur: " + adata.sqldata[0].editor);
-		return;
-	    }
-    //dump("EDIT: " + JSON.stringify(chdata) + "\n");
-    seteditorhost();
-    if (adata.sqldata.length > 0){
-	$('#frmeditactivitylog #loguuid').val(adata.sqldata[0].uuid);
-	$("#frmeditactivitylog #logtitle").val(adata.sqldata[0].logtitle);
-    $("#frmeditactivitylog #logdatefrom").val(adata.sqldata[0].logdatefrom);
-    $("#frmeditactivitylog #logdateto").val(adata.sqldata[0].logdateto);
-	$("#frmeditactivitylog #logmessage").summernote('reset');
-	$("#frmeditactivitylog #logmessage").summernote('code',htmlUnescape(adata.sqldata[0].logmessage));
-    }
-    $("#edit_activitylog").modal('show');
-}
-
-function save_activitylog(){
-    var lsql = "";
-    //dump($('#frmeditactivitylog #logdateto').val() + " - " + $('#frmeditactivitylog #logdatefrom').val() + "\n");
-	$("#activityloguuid").val($("#frmeditactivitylog #loguuid").val());
-	//var tmpdate = encodeparam(pconfig.logdate, 'date').replace(/'/g, '');
-	var dt = encodeparam($("#frmeditactivitylog #logdateto").val(),"date");
-	var df = encodeparam($("#frmeditactivitylog #logdatefrom").val(),"date");
-	var ltitle = encodeparam($('#frmeditactivitylog #logtitle').val(),"text");
-	var lmessage = encodeparam($('#frmeditactivitylog #logmessage').val(),"richtextarea");
-	var uid = $("#frmeditactivitylog #loguuid").val();
-	//dump(df + " - " + dt + "\n");
-	var lsql = "UPDATE activitylog set logtitle="+ltitle+
-	",logmessage="+lmessage+
-	",logdatefrom=date("+df+")"+
-	",logdateto=date("+dt+") where uuid='"+uid+"';";
-	//dump(lsql + "\n");
-    appdb.dbexec(lsql);
-    removeeditorhost();
-    load_logactivity_table();
-    //load_activitylog();
-    $("#edit_activitylog").modal('hide');
-}
-
-function onnextmonth() {
-  var tmpmonth = new Date(encodeparam(pconfig.logmonth, 'month').replace(/'/g, ''));
-  var nmonth = new Date(tmpmonth.getFullYear(), tmpmonth.getMonth() + 1, tmpmonth.getDate());
-  pconfig.logmonth = nmonth.toLocaleFormat('%m.%Y');
-  apppref.setpreference("pageconfig.logactivity", pconfig);
-  globelreq.send_request({
-    page: 'logactivity_basic',
-    module: 'logbook',
-    header: 'Livret des activités'
-  }, null);
-}
-
-function onpreviousmonth() {
-  var tmpmonth = new Date(encodeparam(pconfig.logmonth, 'month').replace(/'/g, ''));
-  var nmonth = new Date(tmpmonth.getFullYear(), tmpmonth.getMonth() - 1, tmpmonth.getDate());
-  pconfig.logmonth = nmonth.toLocaleFormat('%m.%Y');
-  apppref.setpreference("pageconfig.logactivity", pconfig);
-  globelreq.send_request({
-    page: 'logactivity_basic',
-    module: 'logbook',
-    header: 'Livret des activités'
-  }, null);
-}
-
-function set_logmonth(){
-      pconfig.logmonth =$("#logmonth").val();
-      apppref.setpreference("pageconfig.logactivity",pconfig);
-      globelreq.send_request({
-            page: 'logactivity_basic',
-            module: 'logbook',
-            header: 'Livret des activités'
-      });
-}
-
-function seteditorhost(){
-	appdb.dbexec("UPDATE activitylog set editor=null where editor='"+myhostname+"';");
-	appdb.dbexec("UPDATE activitylog set editor='"+myhostname+"' where uuid='"+$('#loguuid').val()+"';");
-}
-
-function removeeditorhost(){
-	appdb.dbexec("UPDATE activitylog set editor=null where editor='"+myhostname+"';");
-}
diff --git a/modules/logbook/js/logchild.js b/modules/logbook/js/logchild.js
deleted file mode 100644
index 73f3284..0000000
--- a/modules/logbook/js/logchild.js
+++ /dev/null
@@ -1,359 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg )
-var pconfig = {};
-var winh= window.innerHeight -170;
-var tbllog = null;
-var crecheuuid = null;
-var initdate = new Date();
-var myhostname = system.hostname();
-
-function initdata(){
-
-  load_helpers();
-  var configdata = apppref.getpreference("pageconfig.logchild");
-
-  if ((configdata) && (configdata !== '')){
-    pconfig = JSON.parse(configdata);
-  }
-  //dump(JSON.stringify(pconfig) + "\n");
-  //if (!pconfig.printlayout) {
-    pconfig.printlayout = 'logchild';
-    apppref.setpreference("pageconfig.logchild",pconfig);
-  //}
-  var ccreche = appdb.dbquery("select uuid from creche LIMIT 1;");
-  crecheuuid = ccreche.sqldata[0].uuid;
-
-  loadtextareas(winh);
-  $("#logdate").on("dp.hide", function () {
-    set_logdate();
-  });
-  myhostname = system.hostname();
-  if (pconfig.logdate) {
-
-    initdate = new Date(encodeparam(pconfig.logdate, 'date').replace(/'/g, ''));
-    $("#logdate").val(pconfig.logdate);
-  } else {
-    $("#logdate").val(initdate.toLocaleFormat('%d.%m.%Y'));
-    pconfig.logdate = initdate.toLocaleFormat('%d.%m.%Y');
-  }
-  var childname = "";
-  if (pconfig.childuuid){
-    var chdata = appdb.dbquery("select prename || ' ' || surname AS childname from childs where uuid='"+ pconfig.childuuid +"'");
-    if (chdata.sqldata.length > 0){
-      childname = chdata.sqldata[0].childname + " - "; 
-    }
-  }
-  set_infoheader(childname + " Date du: " + pconfig.logdate);
-  load_logchild_table();
-  
-}
-
-
-
-
-
-function load_logchild_table(){
-  var mins = initdate.getTimezoneOffset() * -1;//dump("cur timezoneoffset:" + + "\n");
-  if (mins > 0){
-    mins = '+' + mins;
-  }
-  var sqlchilds = "select distinct(ch.uuid) as uuid, ch.prename || ' ' || ch.surname AS childname, ch.checkservicenumber,gr.grpname,'<span style=\"display:none\">' || cl.lastmodified || '</span>' || strftime('%d.%m.%Y %H:%M',cl.lastmodified,'"+mins+" minutes') as lastmodified,cl.editor as editor from childs ch left join planning pl on (ch.uuid=pl.childuuid) left join groups gr on (pl.groupuuid=gr.uuid) left join childslog cl on (ch.uuid=cl.childuuid and logdate=date('"+initdate.toLocaleFormat('%Y-%m-%d')+"')) where date('"+ initdate.toLocaleFormat('%Y-%m-%d')+"') between pl.datebegin and pl.dateend order by childname;"; 
-  //dump("SQLChilds:" + sqlchilds + "\n");
-  var logdata = appdb.dbquery(sqlchilds);  
-  //dump("load childs Log!\n");
-  var headerdata = getlabels("childname,grpname,lastmodified,editor");
-
-  $("#tbl_logchild").html("");
-  //if (tbllog) {tbllog.destroy();}
-  var tblheader = '<tr>';
-
-  for (var h in headerdata){
-    if ((headerdata[h].keyname == 'act') && (headerdata[h].class.indexOf('action1btn') == -1)){
-      headerdata[h].class +=" action1btn";
-    }
-    if ((pconfig.hidden_columns) && (pconfig.hidden_columns.indexOf(headerdata[h].keyname) != -1)) {
-      if (headerdata[h].class.indexOf('colhidden') == -1) {
-        headerdata[h].class += " colhidden"; 
-      }
-    }else {
-      headerdata[h].class.replace("colhidden","");
-    }
-    tblheader += '<th class="' + headerdata[h].class +'">'+ headerdata[h].title+'</th>';
-
-  }
-  tblheader += '</tr>';
-
-  
-  $("#tbl_logchild").append("<thead>" + tblheader + "</thead>");
-  $("#tbl_logchild").append("<tfoot>" + tblheader + "</tfoot>");
-  $("#tbl_logchild").append("<tbody>");
- 
-  //var curchld = "";
-
-  for (var i in logdata.sqldata){
-    var row = logdata.sqldata[i];
-    var sel = "";
-    if (pconfig.childuuid && row.uuid == pconfig.childuuid) {
-      sel = "selected";
-      load_childlog();
-    }
-        var tr = '<tr data-child="'+ row.uuid+'" class="'+ sel +'">';
-        //tr += '<td class="noprint"></td>';
-        tr += '<td>' + row.childname +'<br/>('+ row.checkservicenumber+ ')'+ "</td>";
-        tr += '<td>' + row.grpname + "</td>";
-        tr += '<td>' + row.lastmodified + "</td>";
-        tr += '<td>' + row.editor + "</td>";
-        tr += "</tr>";
-        $("#tbl_logchild").append(tr);
-    }
-    
-  $("#tbl_logchild").append("</tbody>");
-
-
-  tbllog = $("#tbl_logchild").dataTable({
-        "language": {
-          "url": "../../web/js/locale/datatable_fr.json"
-        },
-        "paging":   false,
-        "ordering": true,
-        "bAutoWidth": false,
-        "scrollY": winh + "px",
-        "scrollCollapse": true,
-        "info":     false,
-        "filter": false,
-        "destroy": true,
-      });
-  
-//  $('#tbl_logchild').on( 'search.dt', function () {
-//    pconfig.filter = tbllog.api().search();
-//    apppref.setpreference("pageconfig.logchild",pconfig);
-//  } );
-
-  $('#tbl_logchild').on( 'order.dt', function () {
-    pconfig.order= tbllog.fnSettings().aaSorting;
-    apppref.setpreference("pageconfig.logchild",pconfig);
- 
-  } );
-//  if (pconfig.filter) {
-//    tbllog.fnFilter(pconfig.filter);
-//  }
-  if (pconfig.order) {
-  
-    tbllog.fnSort(pconfig.order);
-  }
- 
-  
-  
-
-$('#tbl_logchild tbody').on( 'click', 'tr', function () {
-        if ( $(this).hasClass('selected') ) {
-           // $(this).removeClass('selected');
-        }
-        else {
-            tbllog.$('tr.selected').removeClass('selected');
-            $(this).addClass('selected');
-            var curchild = $(this).attr('data-child');
-            pconfig.childuuid = curchild;
-            var chsel = appdb.dbquery("select lastmodified,editor from childslog where childuuid='"+pconfig.childuuid+"' and logdate=date('"+initdate.toLocaleFormat('%Y-%m-%d')+"');");
-            //dump(JSON.stringify(chsel) + "\n");
-            $("#btnadd").hide();
-    	    $("#btnedit").hide();
-    	    $("#btnprotection").hide();
-            if (chsel.sqldata.length > 0){
-        	if (chsel.sqldata[0].editor == '' || chsel.sqldata[0].editor == myhostname){
-        	    $("#btnedit").show();
-        	}
-        	if (chsel.sqldata[0].editor != '' && chsel.sqldata[0].editor != myhostname){
-        	    $("#btnprotection").show();
-        	}
-        	
-        	
-        	load_childlog();	
-            } else {
-        	$("#childlogmessage").html("");
-        	$("#btnadd").show();
-            }
-            apppref.setpreference("pageconfig.logchild",pconfig);
-            
-        }
-    } );
-}
-
-function load_childlog(){
-  //$("#childlogmessage").summernote('disable');
-  var tmpdate = encodeparam(pconfig.logdate, 'date').replace(/'/g, '');
-  var childlogsql = "select uuid,logmessage,childuuid,lastmodified,editor from childslog where logdate=date('" + tmpdate + "') and childuuid='"+ pconfig.childuuid+"';";
-  var chdata = appdb.dbquery(childlogsql);
-  $("#btnadd").hide();
-  $("#btnedit").hide();
-  $("#btnprotection").hide();
-  //dump(childlogsql + " -> " +JSON.stringify(chdata) + "\n");
-  $("#childlogmessage").html("");
-  if (chdata.sqldata.length > 0){
-      if (chdata.sqldata[0].editor == '' || chdata.sqldata[0].editor == myhostname){
-	    $("#btnedit").show();
-	}
-	if (chdata.sqldata[0].editor != '' && chdata.sqldata[0].editor != myhostname){
-	    $("#btnprotection").show();
-	}
-    //dump("load data from db\n");
-    $("#childloguuid").val(chdata.sqldata[0].uuid);
-    $("#childlogmessage").html(htmlUnescape(chdata.sqldata[0].logmessage));
-  }else {
-	//$("#childlogmessage").html("");
-      $("#btnadd").show();
-  }
-  var childname = "";
-  if (pconfig.childuuid){
-    var chxdata = appdb.dbquery("select prename || ' ' || surname AS childname from childs where uuid='"+ pconfig.childuuid +"'");
-    if (chxdata.sqldata.length > 0){
-      childname = chxdata.sqldata[0].childname + " - "; 
-    }
-  }
-  set_infoheader(childname + " Date du: " + pconfig.logdate);
-}
-
-
-function edit_childlog(){
-    var childlogsql = "select uuid,logmessage,childuuid,editor from childslog where uuid='"+$("#childloguuid").val()+"';";
-    var chdata = appdb.dbquery(childlogsql);
-    if ((chdata.sqldata[0].editor != '') && (chdata.sqldata[0].editor != myhostname)){
-	system.popup("cette fiche d'évaluation est bloqué par l'editeur: " + chdata.sqldata[0].editor);
-	load_logchild_table()();
-	return;
-    }
-    //dump("EDIT: " + JSON.stringify(chdata) + "\n");
-    seteditorhost();
-    if (chdata.sqldata.length > 0){
-	//$('#frmeditchildlog #logmessage').summernote('reset');
-	$('#frmeditchildlog #uuid').val(chdata.sqldata[0].uuid);
-	$('#frmeditchildlog #childuuid').val(chdata.sqldata[0].childuuid);
-	$("#frmeditchildlog #logmessage").summernote('reset');
-	$("#frmeditchildlog #logmessage").summernote('code',htmlUnescape(chdata.sqldata[0].logmessage));
-	//$('#frmeditchildlog #logmessage').val(htmlUnescape(chdata.sqldata[0].logmessage));
-    }
-    $("#edit_childlog").modal('show');
-}
-
-function save_childlog(){
-    var lsql = "";
-    if ($('#frmeditchildlog #uuid').val() == '0'){
-	//new childlog
-	var nuuid = appdb.generate_uuid();
-	$("#childloguuid").val(nuuid);
-	var tmpdate = encodeparam(pconfig.logdate, 'date').replace(/'/g, '');
-	lsql = "INSERT INTO childslog (uuid,childuuid,logmessage,logdate) VALUES ('"+nuuid+"','"+pconfig.childuuid+"'," + encodeparam($('#frmeditchildlog #logmessage').val(),"richtextarea")+",date('"+tmpdate+"'));";
-    }else {
-	//update childlog;
-	lsql = "UPDATE childslog set logmessage="+encodeparam($('#frmeditchildlog #logmessage').val(),"richtextarea")+" where uuid='"+$("#frmeditchildlog  #uuid").val()+"';";
-    }
-    appdb.dbexec(lsql);
-    removeeditorhost();
-    load_logchild_table();
-    load_childlog();
-    $("#edit_childlog").modal('hide');
-}
-//$('#childlogmessage').on('summernote.focus', function() {
-//	seteditorhost();
-//	$("#childlogmessage").summernote('enable');
-//	});
-//
-//
-//$('#childlogmessage').on('summernote.blur', function() {
-//  //dump("New Data\n");
-//  var lsql = "";
-//  if ($("#childloguuid").val() != "0"){
-//    //UPDATE
-//    lsql = "UPDATE childslog set logmessage="+encodeparam($('#childlogmessage').val(),"richtextarea")+" where uuid='"+$("#childloguuid").val()+"';";
-//    //dump("UPDATE:" + lsql + "\n");
-//  } else {
-//    //INSERT
-//    var nuuid = appdb.generate_uuid();
-//    $("#childloguuid").val(nuuid);
-//    var tmpdate = encodeparam(pconfig.logdate, 'date').replace(/'/g, '');
-//    lsql = "INSERT INTO childslog (uuid,childuuid,logmessage,logdate) VALUES ('"+nuuid+"','"+pconfig.childuuid+"'," + encodeparam($('#childlogmessage').val(),"richtextarea")+",date('"+tmpdate+"'));";
-//    //dump("INSERT:" + lsql + "\n");
-//  }
-//  appdb.dbexec(lsql);
-//  removeeditorhost();
-//  //load_logchild_table();
-//  
-//});
-
-function addchildlog(){
-    var nuuid = appdb.generate_uuid();
-    var tmpdate = encodeparam(pconfig.logdate, 'date').replace(/'/g, '');
-    $("#childloguuid").val(nuuid);
-    var lsql = "INSERT INTO childslog (uuid,childuuid,logmessage,logdate) VALUES ('"+nuuid+"','"+pconfig.childuuid+"',null,date('"+tmpdate+"'));";
-    appdb.dbexec(lsql);
-    edit_childlog();
-
-}
-
-
-function set_logdate(){
-      pconfig.logdate =$("#logdate").val();
-      //dump("set_logdate:" + JSON.stringify(pconfig) + "\n");
-      apppref.setpreference("pageconfig.logchild",pconfig);
-      removeeditorhost();
-      globelreq.send_request({
-            page: 'logchild',
-            module: 'logbook',
-            data: null,
-            header: 'Livret d\'évaluation des enfants par date'
-      });
-}
-
-
-function onnextdate() {
-  var tmpmonth = new Date(encodeparam(pconfig.logdate, 'date').replace(/'/g, ''));
-  var nmonth = new Date(tmpmonth.getFullYear(), tmpmonth.getMonth(), tmpmonth.getDate()+1);
-  pconfig.logdate = nmonth.toLocaleFormat('%d.%m.%Y');
-  apppref.setpreference("pageconfig.logchild", pconfig);
-  removeeditorhost();
-  globelreq.send_request({
-    page: 'logchild',
-    module: 'logbook',
-    header: 'Livret d\'évaluation des enfants par date'
-  }, null);
-}
-
-function onpreviousdate() {
-  var tmpmonth = new Date(encodeparam(pconfig.logdate, 'date').replace(/'/g, ''));
-  var nmonth = new Date(tmpmonth.getFullYear(), tmpmonth.getMonth(), tmpmonth.getDate()-1);
-  pconfig.logdate = nmonth.toLocaleFormat('%d.%m.%Y');
-  apppref.setpreference("pageconfig.logchild", pconfig);
-  removeeditorhost();
-  globelreq.send_request({
-    page: 'logchild',
-    module: 'logbook',
-    header: 'Livret d\'évaluation des enfants par date'
-  }, null);
-}
-
-function seteditorhost(){
-	//dump('BLOCK editor '+ myhostname +"->"+ $('#childloguuid').val() +"\n");
-	appdb.dbexec("UPDATE childslog set editor=null where editor='"+myhostname+"';");
-	appdb.dbexec("UPDATE childslog set editor='"+myhostname+"' where uuid='"+$('#childloguuid').val()+"';");
-	//load_logchild_table();
-}
-//
-function removeeditorhost(){
-	appdb.dbexec("UPDATE childslog set editor=null where editor='"+myhostname+"';");
-	//load_logchild_table();
-}
-
-
-
-function confirm_delete_protection(){
-	$("#confirm_delete_protection").modal('show');
-}
-
-function delete_protection(){
-	appdb.dbexec("UPDATE childslog set editor=null where uuid='"+$('#childloguuid').val()+"';");
-	$('#editorhost').html('');
-	$('#btneditorhost').removeClass('btn-danger');
-	$('#btneditorhost').addClass('btn-default');
-	$('#btnprotection').hide();
-	load_logchild_table();
-	$("#confirm_delete_protection").modal('hide');
-}
diff --git a/modules/logbook/js/logcominterne.js b/modules/logbook/js/logcominterne.js
deleted file mode 100644
index c814574..0000000
--- a/modules/logbook/js/logcominterne.js
+++ /dev/null
@@ -1,328 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg )
-var pconfig = {};
-var winh= window.innerHeight -170;
-var tbllog = null;
-var crecheuuid = null;
-var initdate = new Date();
-var xcurdate = new Date();
-var deluuid = "";
-var amonth = ['', 'Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Aôut', 'Septembre', 'Octobre','Novembre', 'Décembre'];
-var myhostname = system.hostname();
-
-function initdata(){
-
-  load_helpers();
-  var configdata = apppref.getpreference("pageconfig.logcominterne");
-  //dump("cfdata:" + configdata +"\n");
-  if ((configdata) && (configdata !== '')){
-    pconfig = JSON.parse(configdata);
-  }
-
-  pconfig.printlayout = 'book';
-  apppref.setpreference("pageconfig.logcominterne",pconfig);
-
-  var ccreche = appdb.dbquery("select uuid from creche LIMIT 1;");
-  crecheuuid = ccreche.sqldata[0].uuid;
-  var edith = 270;
-  myhostname = system.hostname();
-  //dump("Current Hostname:" + myhostname + "\n");
-  loadtextareas(edith);
-   if (pconfig.logmonth) {
-
-    initdate = new Date(encodeparam(pconfig.logmonth, 'month').replace(/'/g, ''));
-    $("#logmonth").val(pconfig.logmonth);
-  } else {
-    $("#logmonth").val(initdate.toLocaleFormat('%m.%Y'));
-    
-    pconfig.logmonth=initdate.toLocaleFormat("%m.%Y");
-    apppref.setpreference("pageconfig.logcominterne",pconfig);
-  }
-  var acttitle = "";
-  if (pconfig.activityuuid){
-    var chdata = appdb.dbquery("select logtitle from messagelog where uuid='"+ pconfig.messageuuid +"'");
-    if (chdata.sqldata.length > 0){
-      acttitle = chdata.sqldata[0].logtitle + " - "; 
-    }
-  }
-  if (xcurdate.toLocaleFormat("%m.%Y") == pconfig.logmonth){
-	  $('#btnaddmessage').show();
-  } else{
-	  $('#btnaddmessage').hide();
-  }
-  set_infoheader(acttitle + " Mois: " + amonth[parseInt(pconfig.logmonth.substring(0, 3))] + " " + pconfig.logmonth.substring(3, 8));
-  $('#logmonth').on('dp.hide', function(e) {
-    set_logmonth();
-  });
-  $("#btnedit").hide();
-  $("#btnprotection").hide();
-  $("#btndelete").hide();
-  load_logmessage_table();
-  
-}
-
-function seteditorhost(){
-	//dump('BLOCK editor '+ myhostname +"->"+ $('#loguuid').val() +"\n");
-	appdb.dbexec("UPDATE messagelog set editor=null where editor='"+myhostname+"';");
-	appdb.dbexec("UPDATE messagelog set editor='"+myhostname+"' where uuid='"+$('#cominterneloguuid').val()+"';");
-	load_logmessage_table();
-}
-
-function removeeditorhost(){
-	appdb.dbexec("UPDATE messagelog set editor=null where editor='"+myhostname+"';");
-	load_logmessage_table();
-}
-
-
-function load_logmessage_table(){
-  var mins = initdate.getTimezoneOffset() * -1;//dump("cur timezoneoffset:" + + "\n");
-  if (mins > 0){
-    mins = '+' + mins;
-  }
-  var logsql = "SELECT uuid, logtitle,'<span style=\"display:none\">' || logdate || '</span>' || strftime('%d.%m.%Y',logdate) as logdate,'<span style=\"display:none\">' || lastmodified || '</span>' || strftime('%d.%m.%Y %H:%M',lastmodified,'"+mins+" minutes') as lastmodified,editor  FROM messagelog where date(logdate) between date('"+initdate.toLocaleFormat("%Y-%m")+"-01') and date('"+initdate.toLocaleFormat("%Y-%m")+"-01','+1 month','-1 day');";
-  var logdata = appdb.dbquery(logsql);
-  var headerdata = getlabels("subject,daydate,lastmodified,editor");
-  $("#tbl_logcominterne").html("");
-  //tbllog = null;
-  var tblheader = '<tr>';
-
-  for (var h in headerdata){
-    if ((headerdata[h].keyname == 'act') && (headerdata[h].class.indexOf('action1btn') == -1)){
-      headerdata[h].class +=" action1btn";
-    }
-
-    tblheader += '<th class="' + headerdata[h].class +'">'+ headerdata[h].title+'</th>';
-
-  }
-  tblheader += '</tr>';
-
-  
-  $("#tbl_logcominterne").append("<thead>" + tblheader + "</thead>");
-  $("#tbl_logcominterne").append("<tfoot>" + tblheader + "</tfoot>");
-  $("#tbl_logcominterne").append("<tbody>");
- 
-
-  for (var i in logdata.sqldata){
-    var sel = "";
-    var row = logdata.sqldata[i];
-    if (pconfig.messageuuid && row.uuid == pconfig.messageuuid) {
-      sel = "selected";
-      load_messagelog();
-    }
-    
-        var tr = '<tr data-message="'+ row.uuid+'" class="'+ sel+'"><td>' + row.logtitle + '</td>'+
-        '<td>' + row.logdate + '</td>'+
-        '<td>'+ row.lastmodified+'</td>'+
-        '<td>'+ row.editor +'</td>'+
-        '</tr>';
-        
-        $("#tbl_logcominterne").append(tr);
-    }
-    
-  $("#tbl_logcominterne").append("</tbody>");
-
-
-  tbllog = $("#tbl_logcominterne").dataTable({
-        "language": {
-          "url": "../../web/js/locale/datatable_fr.json"
-        },
-        "paging":   false,
-        "ordering": true,
-        "bAutoWidth": false,
-        "scrollY": winh + "px",
-        "scrollCollapse": true,
-        "info":     false,
-        "filter": false,
-        "destroy": true,
-      });
-  
-
-
-  $('#tbl_logcominterne').on( 'order.dt', function () {
-    pconfig.order= tbllog.fnSettings().aaSorting;
-    apppref.setpreference("pageconfig.logcominterne",pconfig);
- 
-  } );
-
-  if (pconfig.order) {
-  
-    tbllog.fnSort(pconfig.order);
-  }
-  
-  
-
-$('#tbl_logcominterne tbody').on( 'click', 'tr', function () {
-        //dump("select activity\n");
-        if ( $(this).hasClass('selected') ) {
-           // $(this).removeClass('selected');
-        }
-        else {
-        	$("#btnedit").hide();
-      	  $("#btnprotection").hide();
-      	  $("#btndelete").hide();
-            tbllog.$('tr.selected').removeClass('selected');
-            $(this).addClass('selected');
-            var curmessage = $(this).attr('data-message');
-            //setforeigneditor($(this).attr('data-editor'));
-            pconfig.messageuuid = curmessage;
-            var cilogsql = "SELECT editor FROM messagelog where uuid='"+ pconfig.messageuuid+"';";
-            var cdata = appdb.dbquery(cilogsql);
-            if (cdata.sqldata[0].editor == '' || cdata.sqldata[0].editor == myhostname){
-          	    $("#btnedit").show();
-          	    $("#btndelete").show();
-          		}
-          		if (cdata.sqldata[0].editor != '' && cdata.sqldata[0].editor != myhostname){
-          			$("#btnprotection").show();
-          		}
-            apppref.setpreference("pageconfig.logcominterne",pconfig);
-            load_messagelog();
-        }
-    } );
-}
-
-function newlogmessage(){
-  var nuuid = appdb.generate_uuid();
-  var sql = "INSERT INTO messagelog (uuid,logtitle,logdate) VALUES ('"+nuuid+"','nouveau message',date('"+xcurdate.toLocaleFormat('%Y-%m-%d')+"'));";
-  //dump(sql + "\n");
-  appdb.dbexec(sql);
-  pconfig.messageuuid=nuuid;
-  apppref.setpreference("pageconfig.logcominterne",pconfig);
-  edit_cominternelog();
-}
-
-function edit_cominternelog(){
-	var actlogsql = "SELECT uuid, strftime('%d.%m.%Y',logdate) as logdate,  logtitle, logmessage,editor FROM messagelog where uuid='"+ pconfig.messageuuid+"';";
-	var adata = appdb.dbquery(actlogsql);
-    //dump("EDIT: " + JSON.stringify(chdata) + "\n");
-	if ((adata.sqldata[0].editor != '') && (adata.sqldata[0].editor != myhostname)){
-	system.popup("cette communication est bloqué par l'editeur: " + adata.sqldata[0].editor);
-	load_logmessage_table();
-	return;
-	}
-    seteditorhost();
-    if (adata.sqldata.length > 0){
-	$('#frmeditcominterne #loguuid').val(adata.sqldata[0].uuid);
-	$("#frmeditcominterne #logtitle").val(adata.sqldata[0].logtitle);
-    $("#frmeditcominterne #logdate").val(adata.sqldata[0].logdate);
-	$("#frmeditcominterne #logmessage").summernote('reset');
-	$("#frmeditcominterne #logmessage").summernote('code',htmlUnescape(adata.sqldata[0].logmessage));
-    }
-    $("#edit_cominternelog").modal('show');
-}
-
-function load_messagelog(){
-	$("#btnedit").hide();
-	  $("#btnprotection").hide();
-	  $("#btndelete").hide();
-  var actlogsql = "SELECT uuid, strftime('%d.%m.%Y',logdate) as logdate,  logtitle, logmessage,editor FROM messagelog where uuid='"+ pconfig.messageuuid+"';";
-  var adata = appdb.dbquery(actlogsql);
-  //dump(childlogsql + " -> " +JSON.stringify(chdata) + "\n");
-  var inftitle = "";
-  if (adata.sqldata.length > 0){
-    //dump("load data from db\n");
-    $("#cominterneloguuid").val(adata.sqldata[0].uuid);
-    $("#cominternelogmessage").html(htmlUnescape(adata.sqldata[0].logmessage));
-    $("#cominternelogtitle").html(adata.sqldata[0].logtitle);
-    $("#cominternelogdate").html(adata.sqldata[0].logdate);
-    if (adata.sqldata[0].editor == '' || adata.sqldata[0].editor == myhostname){
-	    $("#btnedit").show();
-	    $("#btndelete").show();
-	}
-	if (adata.sqldata[0].editor != '' && adata.sqldata[0].editor != myhostname){
-	    $("#btnprotection").show();
-	}
-    inftitle=adata.sqldata[0].logtitle;
-  }else {
-    //dump("set data to empty fields\n");
-	  $("#cominterneloguuid").val('0');
-	    $("#cominternelogmessage").html("");
-	    $("#cominternelogtitle").html("");
-	    $("#cominternelogdate").html("");
-	
-  }
-  
-  set_infoheader(inftitle + " Mois: " + amonth[parseInt(pconfig.logmonth.substring(0, 3))] + " " + pconfig.logmonth.substring(3, 8));
-
-}
-
-function save_cominternelog(){
-	var ld = encodeparam($("#frmeditcominterne #logdate").val(),"date");
-	$("#cominterneloguuid").val($("#frmeditcominterne #loguuid").val());
-	//var tmpdate = encodeparam(pconfig.logdate, 'date').replace(/'/g, '');
-	var lsql = "UPDATE messagelog set logtitle="+encodeparam($('#frmeditcominterne #logtitle').val(),"text")+
-	",logmessage="+encodeparam($('#frmeditcominterne #logmessage').val(),"richtextarea")+
-	",logdate=date("+ld+") where uuid='"+$("#frmeditcominterne #loguuid").val()+"';";
-	//dump("SV cominterne: "+ lsql + "\n");
-    appdb.dbexec(lsql);
-    removeeditorhost();
-    $("#edit_cominternelog").modal('hide');
-    //load_logmessage_table();
-    load_messagelog();
-    
-}
-
-function confirm_delete_cominterne() {
-
-  deluuid = $("#cominterneloguuid").val();
-  $('#confirm_delete_logcominterne').modal('show');
-}
-
-function delete_logcominterne() {
-  appdb.dbexec("delete from messagelog where uuid='"+ deluuid+"';");
-  load_logmessage_table();
-  $('#confirm_delete_logcominterne').modal('hide');
-}
-
-function onnextmonth() {
-  var tmpmonth = new Date(encodeparam(pconfig.logmonth, 'month').replace(/'/g, ''));
-  var nmonth = new Date(tmpmonth.getFullYear(), tmpmonth.getMonth() + 1, tmpmonth.getDate());
-  pconfig.logmonth = nmonth.toLocaleFormat('%m.%Y');
-  apppref.setpreference("pageconfig.logcominterne", pconfig);
-  removeeditorhost();
-  //dump("Next Month:" +JSON.stringify(pconfig) + "\n");
-  globelreq.send_request({
-    page: 'logcominterne',
-    module: 'logbook',
-    header: 'Communication interne'
-  }, null);
-}
-
-function onpreviousmonth() {
-  var tmpmonth = new Date(encodeparam(pconfig.logmonth, 'month').replace(/'/g, ''));
-  var nmonth = new Date(tmpmonth.getFullYear(), tmpmonth.getMonth() - 1, tmpmonth.getDate());
-  pconfig.logmonth = nmonth.toLocaleFormat('%m.%Y');
-  apppref.setpreference("pageconfig.logcominterne", pconfig);
-  removeeditorhost();
-  //dump("previous Month:" +JSON.stringify(pconfig) + "\n");
-  globelreq.send_request({
-    page: 'logcominterne',
-    module: 'logbook',
-    header: 'Communication interne'
-  }, null);
-}
-
-function set_logmonth(){
-      pconfig.logmonth =$("#logmonth").val();
-      apppref.setpreference("pageconfig.logcominterne",pconfig);
-      removeeditorhost();
-      //dump("Set Month:" +JSON.stringify(pconfig) + "\n");
-      globelreq.send_request({
-            page: 'logcominterne',
-            module: 'logbook',
-            header: 'Communication interne'
-      });
-}
-
-function confirm_delete_protection(){
-	$("#confirm_delete_protection").modal('show');
-}
-
-function delete_protection(){
-	//dump("DELPROT: UPDATE messagelog set editor=null where uuid='"+$('#loguuid').val()+"';\n");
-	appdb.dbexec("UPDATE messagelog set editor=null where uuid='"+$('#cominterneloguuid').val()+"';");
-	$('#editorhost').html('');
-	$('#btneditorhost').removeClass('btn-danger');
-	$('#btneditorhost').addClass('btn-default');
-	$('#btnprotection').hide();
-	load_logmessage_table();
-	$("#confirm_delete_protection").modal('hide');
-}
\ No newline at end of file
diff --git a/modules/logbook/js/logcominterne_basic.js b/modules/logbook/js/logcominterne_basic.js
deleted file mode 100644
index 27d3135..0000000
--- a/modules/logbook/js/logcominterne_basic.js
+++ /dev/null
@@ -1,296 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg )
-var pconfig = {};
-var winh= window.innerHeight -170;
-var tbllog = null;
-var crecheuuid = null;
-var initdate = new Date();
-var xcurdate = new Date();
-var deluuid = "";
-var amonth = ['', 'Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Aôut', 'Septembre', 'Octobre','Novembre', 'Décembre'];
-var myhostname = system.hostname();
-
-function initdata(){
-
-  load_helpers();
-  var configdata = apppref.getpreference("pageconfig.logcominterne");
-  //dump("cfdata:" + configdata +"\n");
-  if ((configdata) && (configdata !== '')){
-    pconfig = JSON.parse(configdata);
-  }
-
-  pconfig.printlayout = 'book';
-  apppref.setpreference("pageconfig.logcominterne",pconfig);
-
-  var ccreche = appdb.dbquery("select uuid from creche LIMIT 1;");
-  crecheuuid = ccreche.sqldata[0].uuid;
-  var edith = 270;
-  myhostname = system.hostname();
-  //dump("Current Hostname:" + myhostname + "\n");
-  loadtextareas(edith);
-   if (pconfig.logmonth) {
-
-    initdate = new Date(encodeparam(pconfig.logmonth, 'month').replace(/'/g, ''));
-    $("#logmonth").val(pconfig.logmonth);
-  } else {
-    $("#logmonth").val(initdate.toLocaleFormat('%m.%Y'));
-    
-    pconfig.logmonth=initdate.toLocaleFormat("%m.%Y");
-    apppref.setpreference("pageconfig.logcominterne",pconfig);
-  }
-  var acttitle = "";
-  if (pconfig.activityuuid){
-    var chdata = appdb.dbquery("select logtitle from messagelog where uuid='"+ pconfig.messageuuid +"'");
-    if (chdata.sqldata.length > 0){
-      acttitle = chdata.sqldata[0].logtitle + " - "; 
-    }
-  }
-  if (xcurdate.toLocaleFormat("%m.%Y") == pconfig.logmonth){
-	  $('#btnaddmessage').show();
-  } else{
-	  $('#btnaddmessage').hide();
-  }
-  set_infoheader(acttitle + " Mois: " + amonth[parseInt(pconfig.logmonth.substring(0, 3))] + " " + pconfig.logmonth.substring(3, 8));
-  $('#logmonth').on('dp.hide', function(e) {
-    set_logmonth();
-  });
-  $("#btnedit").hide();
-  load_logmessage_table();
-  
-}
-
-function seteditorhost(){
-	//dump('BLOCK editor '+ myhostname +"->"+ $('#loguuid').val() +"\n");
-	appdb.dbexec("UPDATE messagelog set editor=null where editor='"+myhostname+"';");
-	appdb.dbexec("UPDATE messagelog set editor='"+myhostname+"' where uuid='"+$('#loguuid').val()+"';");
-	load_logmessage_table();
-}
-
-function removeeditorhost(){
-	appdb.dbexec("UPDATE messagelog set editor=null where editor='"+myhostname+"';");
-	load_logmessage_table();
-}
-
-
-function load_logmessage_table(){
-  var mins = initdate.getTimezoneOffset() * -1;//dump("cur timezoneoffset:" + + "\n");
-  if (mins > 0){
-    mins = '+' + mins;
-  }
-  var logsql = "SELECT uuid, logtitle,'<span style=\"display:none\">' || logdate || '</span>' || strftime('%d.%m.%Y',logdate) as logdate,'<span style=\"display:none\">' || lastmodified || '</span>' || strftime('%d.%m.%Y %H:%M',lastmodified,'"+mins+" minutes') as lastmodified,editor  FROM messagelog where date(logdate) between date('"+initdate.toLocaleFormat("%Y-%m")+"-01') and date('"+initdate.toLocaleFormat("%Y-%m")+"-01','+1 month','-1 day');";
-  var logdata = appdb.dbquery(logsql);
-  var headerdata = getlabels("subject,daydate,lastmodified,editor");
-  $("#tbl_logcominterne").html("");
-  //tbllog = null;
-  var tblheader = '<tr>';
-
-  for (var h in headerdata){
-    if ((headerdata[h].keyname == 'act') && (headerdata[h].class.indexOf('action1btn') == -1)){
-      headerdata[h].class +=" action1btn";
-    }
-
-    tblheader += '<th class="' + headerdata[h].class +'">'+ headerdata[h].title+'</th>';
-
-  }
-  tblheader += '</tr>';
-
-  
-  $("#tbl_logcominterne").append("<thead>" + tblheader + "</thead>");
-  $("#tbl_logcominterne").append("<tfoot>" + tblheader + "</tfoot>");
-  $("#tbl_logcominterne").append("<tbody>");
- 
-
-  for (var i in logdata.sqldata){
-    var sel = "";
-    var row = logdata.sqldata[i];
-    if (pconfig.messageuuid && row.uuid == pconfig.messageuuid) {
-      sel = "selected";
-      load_messagelog();
-    }
-    
-        var tr = '<tr data-message="'+ row.uuid+'" class="'+ sel+'"><td>' + row.logtitle + '</td>'+
-        '<td>' + row.logdate + '</td>'+
-        '<td>'+ row.lastmodified+'</td>'+
-        '<td>'+ row.editor +'</td>'+
-        '</tr>';
-        
-        $("#tbl_logcominterne").append(tr);
-    }
-    
-  $("#tbl_logcominterne").append("</tbody>");
-
-
-  tbllog = $("#tbl_logcominterne").dataTable({
-        "language": {
-          "url": "../../web/js/locale/datatable_fr.json"
-        },
-        "paging":   false,
-        "ordering": true,
-        "bAutoWidth": false,
-        "scrollY": winh + "px",
-        "scrollCollapse": true,
-        "info":     false,
-        "filter": false,
-        "destroy": true,
-      });
-  
-
-
-  $('#tbl_logcominterne').on( 'order.dt', function () {
-    pconfig.order= tbllog.fnSettings().aaSorting;
-    apppref.setpreference("pageconfig.logcominterne",pconfig);
- 
-  } );
-
-  if (pconfig.order) {
-  
-    tbllog.fnSort(pconfig.order);
-  }
-  
-  
-
-$('#tbl_logcominterne tbody').on( 'click', 'tr', function () {
-        //dump("select activity\n");
-        if ( $(this).hasClass('selected') ) {
-           // $(this).removeClass('selected');
-        }
-        else {
-        	$("#btnedit").hide();
-            tbllog.$('tr.selected').removeClass('selected');
-            $(this).addClass('selected');
-            var curmessage = $(this).attr('data-message');
-            //setforeigneditor($(this).attr('data-editor'));
-            pconfig.messageuuid = curmessage;
-            var cilogsql = "SELECT editor FROM messagelog where uuid='"+ pconfig.messageuuid+"';";
-            var cdata = appdb.dbquery(cilogsql);
-            if (cdata.sqldata[0].editor == '' || cdata.sqldata[0].editor == myhostname){
-          	    $("#btnedit").show();
-
-          		}
-
-            apppref.setpreference("pageconfig.logcominterne",pconfig);
-            load_messagelog();
-        }
-    } );
-}
-
-function newlogmessage(){
-  var nuuid = appdb.generate_uuid();
-  var sql = "INSERT INTO messagelog (uuid,logtitle,logdate) VALUES ('"+nuuid+"','nouveau message',date('"+xcurdate.toLocaleFormat('%Y-%m-%d')+"'));";
-  //dump(sql + "\n");
-  appdb.dbexec(sql);
-  pconfig.messageuuid=nuuid;
-  apppref.setpreference("pageconfig.logcominterne",pconfig);
-  edit_cominternelog();
-}
-
-function edit_cominternelog(){
-	var actlogsql = "SELECT uuid, strftime('%d.%m.%Y',logdate) as logdate,  logtitle, logmessage,editor FROM messagelog where uuid='"+ pconfig.messageuuid+"';";
-	var adata = appdb.dbquery(actlogsql);
-	if ((adata.sqldata[0].editor != '') && (adata.sqldata[0].editor != myhostname)){
-	    system.popup("cette communication est bloqué par l'editeur: " + adata.sqldata[0].editor);
-	    load_logmessage_table();
-	    return;
-	}
-    //dump("EDIT: " + JSON.stringify(chdata) + "\n");
-    seteditorhost();
-    if (adata.sqldata.length > 0){
-	$('#frmeditcominterne #loguuid').val(adata.sqldata[0].uuid);
-	$("#frmeditcominterne #logtitle").val(adata.sqldata[0].logtitle);
-    $("#frmeditcominterne #logdate").val(adata.sqldata[0].logdate);
-	$("#frmeditcominterne #logmessage").summernote('reset');
-	$("#frmeditcominterne #logmessage").summernote('code',htmlUnescape(adata.sqldata[0].logmessage));
-    }
-    $("#edit_cominternelog").modal('show');
-}
-
-function load_messagelog(){
-	$("#btnedit").hide();
-	  $("#btnprotection").hide();
-	  $("#btndelete").hide();
-  var actlogsql = "SELECT uuid, strftime('%d.%m.%Y',logdate) as logdate,  logtitle, logmessage,editor FROM messagelog where uuid='"+ pconfig.messageuuid+"';";
-  var adata = appdb.dbquery(actlogsql);
-  //dump(childlogsql + " -> " +JSON.stringify(chdata) + "\n");
-  var inftitle = "";
-  if (adata.sqldata.length > 0){
-    //dump("load data from db\n");
-    $("#cominterneloguuid").val(adata.sqldata[0].uuid);
-    $("#cominternelogmessage").html(htmlUnescape(adata.sqldata[0].logmessage));
-    $("#cominternelogtitle").html(adata.sqldata[0].logtitle);
-    $("#cominternelogdate").html(adata.sqldata[0].logdate);
-    if (adata.sqldata[0].editor == '' || adata.sqldata[0].editor == myhostname){
-	    $("#btnedit").show();
-	    $("#btndelete").show();
-	}
-	if (adata.sqldata[0].editor != '' && adata.sqldata[0].editor != myhostname){
-	    $("#btnprotection").show();
-	}
-    inftitle=adata.sqldata[0].logtitle;
-  }else {
-    //dump("set data to empty fields\n");
-	  $("#cominterneloguuid").val('0');
-	    $("#cominternelogmessage").html("");
-	    $("#cominternelogtitle").html("");
-	    $("#cominternelogdate").html("");
-	
-  }
-  
-  set_infoheader(inftitle + " Mois: " + amonth[parseInt(pconfig.logmonth.substring(0, 3))] + " " + pconfig.logmonth.substring(3, 8));
-
-}
-
-function save_cominternelog(){
-	var ld = encodeparam($("#frmeditcominterne #logdate").val(),"date");
-	$("#cominterneloguuid").val($("#frmeditcominterne #loguuid").val());
-	//var tmpdate = encodeparam(pconfig.logdate, 'date').replace(/'/g, '');
-	var lsql = "UPDATE messagelog set logtitle="+encodeparam($('#frmeditcominterne #logtitle').val(),"text")+
-	",logmessage="+encodeparam($('#frmeditcominterne #logmessage').val(),"richtextarea")+
-	",logdate=date("+ld+") where uuid='"+$("#frmeditcominterne #loguuid").val()+"';";
-	//dump("SV cominterne: "+ lsql + "\n");
-    appdb.dbexec(lsql);
-    removeeditorhost();
-    $("#edit_cominternelog").modal('hide');
-    //load_logmessage_table();
-    load_messagelog();
-    
-}
-
-function onnextmonth() {
-  var tmpmonth = new Date(encodeparam(pconfig.logmonth, 'month').replace(/'/g, ''));
-  var nmonth = new Date(tmpmonth.getFullYear(), tmpmonth.getMonth() + 1, tmpmonth.getDate());
-  pconfig.logmonth = nmonth.toLocaleFormat('%m.%Y');
-  apppref.setpreference("pageconfig.logcominterne", pconfig);
-  removeeditorhost();
-  //dump("Next Month:" +JSON.stringify(pconfig) + "\n");
-  globelreq.send_request({
-    page: 'logcominterne_basic',
-    module: 'logbook',
-    header: 'Communication interne'
-  }, null);
-}
-
-function onpreviousmonth() {
-  var tmpmonth = new Date(encodeparam(pconfig.logmonth, 'month').replace(/'/g, ''));
-  var nmonth = new Date(tmpmonth.getFullYear(), tmpmonth.getMonth() - 1, tmpmonth.getDate());
-  pconfig.logmonth = nmonth.toLocaleFormat('%m.%Y');
-  apppref.setpreference("pageconfig.logcominterne", pconfig);
-  removeeditorhost();
-  //dump("previous Month:" +JSON.stringify(pconfig) + "\n");
-  globelreq.send_request({
-    page: 'logcominterne_basic',
-    module: 'logbook',
-    header: 'Communication interne'
-  }, null);
-}
-
-function set_logmonth(){
-      pconfig.logmonth =$("#logmonth").val();
-      apppref.setpreference("pageconfig.logcominterne",pconfig);
-      removeeditorhost();
-      //dump("Set Month:" +JSON.stringify(pconfig) + "\n");
-      globelreq.send_request({
-            page: 'logcominterne_basic',
-            module: 'logbook',
-            header: 'Communication interne'
-      });
-}
-
diff --git a/modules/logbook/js/logstaff.js b/modules/logbook/js/logstaff.js
deleted file mode 100644
index 5b33b73..0000000
--- a/modules/logbook/js/logstaff.js
+++ /dev/null
@@ -1 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg )
\ No newline at end of file
diff --git a/modules/logbook/logactivity.html b/modules/logbook/logactivity.html
deleted file mode 100644
index 41fbda3..0000000
--- a/modules/logbook/logactivity.html
+++ /dev/null
@@ -1,165 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-  <title>Livret des activités</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="cache-control" content="max-age=0" />
-  <meta http-equiv="cache-control" content="no-cache" />
-  <meta http-equiv="expires" content="0" />
-  <meta http-equiv="expires" content="Tue, 01 Jan 1970 1:00:00 GMT" />
-  <meta http-equiv="pragma" content="no-cache" />
-  <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-  <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-  <link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/dataTables.bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css">
-  <!-- <link href="../../web/css/bootstrap-timepicker.min.css" rel="stylesheet" type="text/css"> -->
-  <link href="../../web/css/bootstrap-multiselect.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/glyphicons.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/summernote.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/creorga.css" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    .dataTables_filter {
-      margin-top: 15px;
-    }
-  </style>
-</head>
-
-<body>
-  <div class="container-fluid"  style="padding-top: 5px;">
-    <div class="form-inline" >
-      <div class="input-group month btn-group">
-            <span class="input-group-addon">du mois:</span>
-            <input type="date" class="form-control" value="" placeholder="mm.yyyy" style="width: 80px;" id="logmonth">
-            <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-          </div>
-            <button class="btn btn-primary" onclick="onpreviousmonth();"><span class="glyphicon glyphicon-chevron-left"></span></button>
-            <button class="btn btn-primary" onclick="onnextmonth();"><span class="glyphicon glyphicon-chevron-right"></span></button>
-      <button class="btn btn-primary" onclick="newlogactivity();"><span class="glyphicon glyphicon-plus"></span> Activité</button>
-    
-   </div>
-   <div>
-    <table style="height: calc(100vh - 100px); width: 100%; ">
-      <tbody>
-        <tr>
-          <td style="width: 550px; vertical-align: top;"><table class="display dataTable cell-border" style="width: 100%;" id="tbl_logactivity" role="grid"></table></td>
-          <td style="vertical-align: top; margin-left: 30px;">
-            <div class="form-inline" style="margin-top: 15px; margin-bottom: 10px; margin-left: 10px;">
-				<button class="btn btn-success" onclick="edit_activitylog();" id="btnedit"><span class="glyphicon glyphicon-pencil"></span> éditer</button>
-          		<button class="btn btn-danger" onclick="confirm_delete_activity();" id="btndelete"><span class="glyphicon glyphicon-remove"></span> supprimer</button>
-          		<button class="btn btn-warning" onclick="confirm_delete_protection();" id="btnprotection"><span class="glyphicon glyphicon-remove"></span> Protection</button>
-          	</div>
-          	<input type="hidden" id="activityloguuid" value="0">
-          	
-                <div><strong>Titre:</strong> <span  id="activitylogtitle"></span></div>
-          		<div><strong>Date: </strong><span id="activitylogdatefrom"></span> <strong>au</strong> <span id="activitylogdateto"></span></div>
-          	
-          <div style="width: 100%; height: calc(100vh - 200px); background-color: #fff; border: 1px solid grey; border-radius: 10px; display: block; overflow-y: auto; padding: 5px; margin: 5px;" id="activitylogmessage"></div></td>
-        </tr>
-      </tbody>
-    </table>
-   </div>
-   <div class="modal fade" id="confirm_delete_logactivity">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-
-                <h4 class="modal-title">Supprimer Activité</h4>
-              </div><!-- dialog contents -->
-
-              <div class="modal-body">
-                Êtes vous sûre de supprimer cette activité?<br>
-                
-              </div><!-- dialog buttons -->
-
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Non</button> <button onclick="delete_logactivity();" class="btn btn-primary">Oui</button>
-              </div>
-            </div>
-          </div>
-  </div>
-  <div class="modal fade" id="confirm_delete_protection">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-
-                <h4 class="modal-title">Supprimer Protection</h4>
-              </div><!-- dialog contents -->
-
-              <div class="modal-body">
-                Êtes vous sûre de supprimer cette protection?<br>
-                (possibilité de perdre des données pas sauvegardées)
-              </div><!-- dialog buttons -->
-
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Non</button> <button onclick="delete_protection();" class="btn btn-primary">Oui</button>
-              </div>
-            </div>
-          </div>
-  </div>
-  <div class="modal fade" id="edit_activitylog">
-          <div class="modal-dialog"  style="width: 1000px; min-width: 1000px;">
-            <div class="modal-content" >
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title">Editer activité</h4>
-              </div>
-              <div class="modal-body" style=" height: 80vh; max-height: height: 80vh; ">
-
-                <div id="frmeditactivitylog">
-                  <input type="hidden" id="loguuid" value="0">
-          <div class="row form-inline" style="margin-left: 30px;">
-                          <label for="logtitle">Titre</label> <input type="text" value="" style="width: 80%;" id="logtitle" class="form-control">
-          </div>
-          <div class="row" style="margin-left: 30px;">
-             <div class="form-inline" id="date-container">
-                          <label for="logdatefrom" style="width: 200px;">Date début / fin</label>
-                          <div id="dt_logdatefrom" class="input-group date">
-                            <input type="date" class="form-control" value="00.00.0000" limits="0" placeholder="dd.mm.yyyy"  id="logdatefrom"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                          </div>
-                        
-                          <div id="dt_logdateto" class="input-group date">
-                            <input type="date" class="form-control" value="00.00.0000" limits="0" placeholder="dd.mm.yyyy" id="logdateto"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                          </div>
-                        </div>
-
-          </div>
-          <textarea class="summernote" type="text" style="width: 100%;" id="logmessage">
-</textarea>
-					
-                </div>
-              </div>
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" onclick="removeeditorhost();" class="btn">Annuler</button> <button onclick="save_activitylog();" class="btn btn-primary">OK</button>
-              </div>
-              </div>
-
-              
-            </div>
-          </div>
-   </div>
-   
-  
-  <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-  <script src="../../web/js/moment-with-locales.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-timepicker.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-multiselect.js" type="text/javascript"></script>
-  <script src="../../web/js/summernote.min.js" type="text/javascript"></script>
-  <script src="../../web/js/lang/summernote-fr-FR.min.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/navigation.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/system.js" type="text/javascript"></script>
-  <script src="../../web/js/labels.js" type="text/javascript"></script>
-  <script src="js/logactivity.js" type="text/javascript"></script>
-  <script src="../../web/js/creorga.js" type="text/javascript"></script>
-  
-</body>
-</html>
diff --git a/modules/logbook/logactivity_basic.html b/modules/logbook/logactivity_basic.html
deleted file mode 100644
index b68930b..0000000
--- a/modules/logbook/logactivity_basic.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-  <title>Livret des activités</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="cache-control" content="max-age=0" />
-  <meta http-equiv="cache-control" content="no-cache" />
-  <meta http-equiv="expires" content="0" />
-  <meta http-equiv="expires" content="Tue, 01 Jan 1970 1:00:00 GMT" />
-  <meta http-equiv="pragma" content="no-cache" />
-  <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-  <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-  <link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/dataTables.bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css">
-  <!-- <link href="../../web/css/bootstrap-timepicker.min.css" rel="stylesheet" type="text/css"> -->
-  <link href="../../web/css/bootstrap-multiselect.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/glyphicons.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/summernote.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/creorga.css" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    .dataTables_filter {
-      margin-top: 15px;
-    }
-  </style>
-</head>
-
-<body>
-  <div class="container-fluid"  style="padding-top: 5px;">
-    <div class="form-inline" >
-      <div class="input-group month btn-group">
-            <span class="input-group-addon">du mois:</span>
-            <input type="date" class="form-control" value="" placeholder="mm.yyyy" style="width: 80px;" id="logmonth">
-            <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-          </div>
-            <button class="btn btn-primary" onclick="onpreviousmonth();"><span class="glyphicon glyphicon-chevron-left"></span></button>
-            <button class="btn btn-primary" onclick="onnextmonth();"><span class="glyphicon glyphicon-chevron-right"></span></button>
-      <button class="btn btn-primary" onclick="newlogactivity();"><span class="glyphicon glyphicon-plus"></span> Activité</button>
-     
-   </div>
-   <div>
-    <table style="height: calc(100vh - 100px); width: 100%; ">
-      <tbody>
-        <tr>
-          <td style="width: 550px; vertical-align: top;"><table class="display dataTable cell-border" style="width: 100%;" id="tbl_logactivity" role="grid"></table></td>
-          <td style="vertical-align: top; margin-left: 30px;">
-            <div class="form-inline" style="margin-top: 15px; margin-bottom: 10px; margin-left: 10px;">
-				<button class="btn btn-success" onclick="edit_activitylog();" id="btnedit"><span class="glyphicon glyphicon-pencil"></span> éditer</button>
-          		</div>
-          	<input type="hidden" id="activityloguuid" value="0">
-          	
-                <div><strong>Titre:</strong> <span  id="activitylogtitle"></span></div>
-          		<div><strong>Date début: </strong><span id="activitylogdatefrom"></span> <strong>au</strong> <span id="activitylogdateto"></span></div>
-          	
-          <div style="width: 100%; height: calc(100vh - 200px); background-color: #fff; border: 1px solid grey; border-radius: 10px; display: block; overflow-y: auto; padding: 5px; margin: 5px;" id="activitylogmessage"></div></td>
-        </tr>
-      </tbody>
-    </table>
-   </div>
- 
-  <div class="modal fade" id="edit_activitylog">
-          <div class="modal-dialog"  style="width: 1000px; min-width: 1000px;">
-            <div class="modal-content" >
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title">Editer activité</h4>
-              </div>
-              <div class="modal-body" style=" height: 80vh; max-height: height: 80vh; ">
-
-                <div id="frmeditactivitylog">
-                  <input type="hidden" id="loguuid" value="0">
-          <div class="row form-inline" style="margin-left: 30px;">
-                          <label for="logtitle">Titre</label> <input type="text" value="" style="width: 80%;" id="logtitle" class="form-control">
-          </div>
-          <div class="row" style="margin-left: 30px;">
-             <div class="form-inline" id="date-container">
-                          <label for="logdatefrom" style="width: 200px;">Date début / fin</label>
-                          <div id="dt_logdatefrom" class="input-group date">
-                            <input type="date" class="form-control" value="00.00.0000" limits="0" placeholder="dd.mm.yyyy"  id="logdatefrom"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                          </div>
-                        
-                          <div id="dt_logdateto" class="input-group date">
-                            <input type="date" class="form-control" value="00.00.0000" limits="0" placeholder="dd.mm.yyyy" id="logdateto"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                          </div>
-                        </div>
-
-          </div>
-          <textarea class="summernote" type="text"  style="width: 100%;" id="logmessage">
-</textarea>
-					
-                </div>
-              </div>
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" onclick="removeeditorhost();" class="btn">Annuler</button> <button onclick="save_activitylog();" class="btn btn-primary">OK</button>
-              </div>
-              </div>
-
-              
-            </div>
-          </div>
-   </div>
-   </div>
-   
-  
-  <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-  <script src="../../web/js/moment-with-locales.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
-  <!-- <script src="../../web/js/bootstrap-timepicker.min.js" type="text/javascript"></script> -->
-  <script src="../../web/js/bootstrap-multiselect.js" type="text/javascript"></script>
-  <script src="../../web/js/summernote.min.js" type="text/javascript"></script>
-  <script src="../../web/js/lang/summernote-fr-FR.min.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/navigation.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/system.js" type="text/javascript"></script>
-  <script src="../../web/js/labels.js" type="text/javascript"></script>
-  <script src="js/logactivity.js" type="text/javascript"></script>
-  <script src="../../web/js/creorga.js" type="text/javascript"></script>
-  
-</body>
-</html>
diff --git a/modules/logbook/logbook.xul b/modules/logbook/logbook.xul
deleted file mode 100644
index 559a5b5..0000000
--- a/modules/logbook/logbook.xul
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE overlay PUBLIC "-//MOZILLA//DTD XUL V1.0//EN"
-"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<overlay id="ov_logbook" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <toolbar id="co_maintoolbar" style="-moz-appearance: none;">
-    <toolbarbutton type="menu" class="btn btn-default" id="tbb_logbook" insertafter="tbb_forms" label="Livrets de bord" image="modules/logbook/img/logbook.png" orient="vertical">
-    <menupopup class="tlbpopup" style="text-align: left;">
-      
-      <label value="Enfants" style="font-weight: bold;"/>
-      <menuitem label="Livret d'évaluation par date" oncommand="navigation.load_appview('logchild','logbook',null,'Livret d évaluation des enfants par date');"  id="mnulogchild"/>
-      <menuseparator />
-      <label value="Crèche" style="font-weight: bold;"/>
-      <menuitem label="Livret des activités" oncommand="navigation.load_appview('logactivity','logbook',null,'Livret des activités');"  id="mnulogactivity"/>
-      <menuitem label="Communication Interne" oncommand="navigation.load_appview('logcominterne','logbook',null,'Communication Interne');"  id="mnulogmessage"/>
-      
-    </menupopup>
-    </toolbarbutton>
-  </toolbar>
-</overlay>
\ No newline at end of file
diff --git a/modules/logbook/logbook_basic.xul b/modules/logbook/logbook_basic.xul
deleted file mode 100644
index 802382e..0000000
--- a/modules/logbook/logbook_basic.xul
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE overlay PUBLIC "-//MOZILLA//DTD XUL V1.0//EN"
-"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<overlay id="ov_logbook" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <toolbar id="co_maintoolbar" style="-moz-appearance: none;">
-    <toolbarbutton type="menu" class="btn btn-default" id="tbb_logbook" insertafter="tbb_forms" label="Livrets de bord" image="modules/logbook/img/logbook.png" orient="vertical">
-    <menupopup class="tlbpopup" style="text-align: left;">
-      
-      <label value="Enfants" style="font-weight: bold;"/>
-      <menuitem label="Livret d'évaluation par date" oncommand="navigation.load_appview('logchild','logbook',null,'Livret d évaluation des enfants par date');"  id="mnulogchild"/>
-      <menuseparator />
-      <label value="Crèche" style="font-weight: bold;"/>
-      <menuitem label="Livret des activités" oncommand="navigation.load_appview('logactivity_basic','logbook',null,'Livret des activités');"  id="mnulogactivity"/>
-      <menuitem label="Communication Interne" oncommand="navigation.load_appview('logcominterne_basic','logbook',null,'Communication Interne');"  id="mnulogmessage"/>
-    </menupopup>
-    </toolbarbutton>
-  </toolbar>
-</overlay>
\ No newline at end of file
diff --git a/modules/logbook/logchild.html b/modules/logbook/logchild.html
deleted file mode 100644
index b8c316b..0000000
--- a/modules/logbook/logchild.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-  <title>Livret d'évaluation des enfants</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="cache-control" content="max-age=0" />
-  <meta http-equiv="cache-control" content="no-cache" />
-  <meta http-equiv="expires" content="0" />
-  <meta http-equiv="expires" content="Tue, 01 Jan 1970 1:00:00 GMT" />
-  <meta http-equiv="pragma" content="no-cache" />
-  <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/dataTables.bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css">
-  <!-- <link href="../../web/css/bootstrap-timepicker.min.css" rel="stylesheet" type="text/css"> -->
-  <link href="../../web/css/bootstrap-multiselect.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/glyphicons.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/summernote.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/creorga.css" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    .dataTables_filter {
-      margin-top: 15px;
-    }
-  </style>
-</head>
-
-<body>
-  <div class="container-fluid"  style="padding-top: 5px;">
-    <div class="form-inline" >
-      <div class="input-group date btn-group">
-            <span class="input-group-addon">date du:</span>
-            <input type="date" class="form-control" value="" placeholder="dd.mm.yyyy" style="width: 120px;" id="logdate" onchange="set_logdate();">
-            <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-          </div>
-          <button class="btn btn-primary" onclick="onpreviousdate();"><span class="glyphicon glyphicon-chevron-left"></span></button>
-          <button class="btn btn-primary" onclick="onnextdate();"><span class="glyphicon glyphicon-chevron-right"></span></button>
-          <!--<button class="btn btn-default" id="btneditorhost">Editeur: <span id="editorhost"></span></button>
-          <button class="btn btn-danger" id="btnprotection" onclick="confirm_delete_protection();" style="display: none;"><span class="glyphicon glyphicon-remove"></span> protection</button>-->
-   </div>
-   <div>
-    <table style="height: calc(100vh - 100px); width: 100%;">
-      <tbody>
-        <tr>
-          <td style="width: 600px; vertical-align: top; padding-top: 0px;"><table class="display dataTable cell-border" style="width: 100%;" id="tbl_logchild" role="grid"></table></td>
-          <td style="vertical-align: top; padding-top: 0px; ">
-          	<input type="hidden" id="childloguuid" value="0">
-          	<div class="form-inline" style="margin-top: 15px; margin-bottom: 10px; margin-left: 10px;">
-          		<button class="btn btn-primary" onclick="addchildlog();" id="btnadd"><span class="glyphicon glyphicon-plus"></span> ajouter</button>
-          		<button class="btn btn-success" onclick="edit_childlog();" id="btnedit"><span class="glyphicon glyphicon-pencil"></span> éditer</button>
-          		<button class="btn btn-warning" onclick="confirm_delete_protection();" id="btnprotection"><span class="glyphicon glyphicon-remove"></span> Protection</button>
-          	</div>
-          	<div   style="width: 100%; height: calc(100vh - 150px); background-color: #fff; border: 1px solid grey; border-radius: 10px; display: block; overflow-y: auto; padding: 5px; margin: 5px;" id="childlogmessage"></div>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-    
-   </div>
-   <div class="modal fade" id="confirm_delete_protection">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-
-                <h4 class="modal-title">Supprimer Protection</h4>
-              </div><!-- dialog contents -->
-
-              <div class="modal-body">
-                Êtes vous sûre de supprimer cette protection?<br>
-                (possibilité de perdre des données pas sauvegardées)
-              </div><!-- dialog buttons -->
-
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Non</button> <button onclick="delete_protection();" class="btn btn-primary">Oui</button>
-              </div>
-            </div>
-          </div>
-  </div>
-  <div class="modal fade" id="edit_childlog">
-          <div class="modal-dialog"  style="width: 1000px; min-width: 1000px;">
-            <div class="modal-content" >
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title">Editer livret d'évaluation</h4>
-              </div>
-              <div class="modal-body" style=" height: 700px; max-height: 700px ">
-
-                <div id="frmeditchildlog">
-                  <input type="hidden" value="0" id="uuid" />
-                  <input type="hidden" value="0" id="childuuid" />
-                  <textarea style="height: 600px;" class="summernote" type="text"  id="logmessage"></textarea>
-					
-                </div>
-              </div>
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" onclick="removeeditorhost();" class="btn">Annuler</button> <button onclick="save_childlog();" class="btn btn-primary">OK</button>
-              </div>
-              </div>
-
-              
-            </div>
-          </div>
-   </div>
-  
-  
-  <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-  <script src="../../web/js/moment-with-locales.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
-  <!-- <script src="../../web/js/bootstrap-timepicker.min.js" type="text/javascript"></script> -->
-  <script src="../../web/js/bootstrap-multiselect.js" type="text/javascript"></script>
-  <script src="../../web/js/summernote.min.js" type="text/javascript"></script>
-  <script src="../../web/js/lang/summernote-fr-FR.min.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/navigation.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/system.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-  <script src="../../web/js/labels.js" type="text/javascript"></script>
-  <script src="js/logchild.js" type="text/javascript"></script>
-  <script src="../../web/js/creorga.js" type="text/javascript"></script>
-  
-</body>
-</html>
diff --git a/modules/logbook/logcominterne.html b/modules/logbook/logcominterne.html
deleted file mode 100644
index 79ddc8d..0000000
--- a/modules/logbook/logcominterne.html
+++ /dev/null
@@ -1,165 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-  <title>Communication interne</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="cache-control" content="max-age=0" />
-  <meta http-equiv="cache-control" content="no-cache" />
-  <meta http-equiv="expires" content="0" />
-  <meta http-equiv="expires" content="Tue, 01 Jan 1970 1:00:00 GMT" />
-  <meta http-equiv="pragma" content="no-cache" />
-  <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-  <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-  <link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/dataTables.bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css">
-  <!-- <link href="../../web/css/bootstrap-timepicker.min.css" rel="stylesheet" type="text/css"> -->
-  <link href="../../web/css/bootstrap-multiselect.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/glyphicons.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/summernote.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/creorga.css" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    .dataTables_filter {
-      margin-top: 15px;
-    }
-  </style>
-</head>
-
-<body>
-  <div class="container-fluid"  style="padding-top: 5px;">
-    <div class="form-inline" >
-      <div class="input-group month btn-group">
-            <span class="input-group-addon">du mois:</span>
-            <input type="date" class="form-control" value="" placeholder="mm.yyyy" style="width: 80px;" id="logmonth">
-            <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-          </div>
-            <button class="btn btn-primary" onclick="onpreviousmonth();"><span class="glyphicon glyphicon-chevron-left"></span></button>
-            <button class="btn btn-primary" onclick="onnextmonth();"><span class="glyphicon glyphicon-chevron-right"></span></button>
-      <button class="btn btn-primary" onclick="newlogmessage();" id="btnaddmessage"><span class="glyphicon glyphicon-plus"></span> Message</button>
-   	  <!--<button class="btn btn-default" id="btneditorhost">Editeur: <span id="editorhost"></span></button>
-   	  <button class="btn btn-danger" id="btnprotection" onclick="confirm_delete_protection();" style="display: none;"><span class="glyphicon glyphicon-remove"></span> protection</button>-->
-   </div>
-   <div>
-    <table style="height: calc(100vh - 100px); width: 100%; ">
-      <tbody>
-        <tr>
-          <td style="width: 550px; vertical-align: top;"><table class="display dataTable cell-border" style="width: 100%;" id="tbl_logcominterne" role="grid"></table></td>
-          <td style="vertical-align: top; margin-left: 30px;">
-          	<div class="form-inline" style="margin-top: 15px; margin-bottom: 10px; margin-left: 10px;">
-				<button class="btn btn-success" onclick="edit_cominternelog();" id="btnedit"><span class="glyphicon glyphicon-pencil"></span> éditer</button>
-          		<button class="btn btn-danger" onclick="confirm_delete_cominterne();" id="btndelete"><span class="glyphicon glyphicon-remove"></span> supprimer</button>
-          		<button class="btn btn-warning" onclick="confirm_delete_protection();" id="btnprotection"><span class="glyphicon glyphicon-remove"></span> Protection</button>
-          	</div>
-          	<input type="hidden" id="cominterneloguuid" value="0">
-          	<div><strong>Titre:</strong> <span  id="cominternelogtitle"></span></div>
-          		<div><strong>Date: </strong><span id="cominternelogdate"></span></div>
-          	
-          <div style="width: 100%; height: calc(100vh - 200px); background-color: #fff; border: 1px solid grey; border-radius: 10px; display: block; overflow-y: auto; padding: 5px; margin: 5px;" id="cominternelogmessage"></div>
-          
-          </td>
-        </tr>
-      </tbody>
-    </table>
-   </div>
-   <div class="modal fade" id="confirm_delete_logcominterne">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-
-                <h4 class="modal-title">Supprimer Message</h4>
-              </div><!-- dialog contents -->
-
-              <div class="modal-body">
-                Êtes vous sûre de supprimer ce message?<br>
-                
-              </div><!-- dialog buttons -->
-
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Non</button> <button onclick="delete_logcominterne();" class="btn btn-primary">Oui</button>
-              </div>
-            </div>
-          </div>
-  </div>
-  <div class="modal fade" id="confirm_delete_protection">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-
-                <h4 class="modal-title">Supprimer Protection</h4>
-              </div><!-- dialog contents -->
-
-              <div class="modal-body">
-                Êtes vous sûre de supprimer cette protection?<br>
-                (possibilité de perdre des données pas sauvegardées)
-              </div><!-- dialog buttons -->
-
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Non</button> <button onclick="delete_protection();" class="btn btn-primary">Oui</button>
-              </div>
-            </div>
-          </div>
-  </div>
-  <div class="modal fade" id="edit_cominternelog">
-          <div class="modal-dialog"  style="width: 1000px; min-width: 1000px;">
-            <div class="modal-content" >
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title">Editer communication</h4>
-              </div>
-              <div class="modal-body" style=" height: 80vh; max-height: height: 80vh; ">
-
-                <div id="frmeditcominterne">
-                  <input type="hidden" id="loguuid" value="0">
-          <div class="row form-inline" style="margin-left: 30px;">
-                          <label for="logtitle">Titre</label> <input type="text" value=""  style="width: 80%;" id="logtitle" class="form-control">
-          </div>
-          <div class="row" style="margin-left: 30px;">
-             <div class="form-inline" id="date-container">
-                          <label for="logtimestamp" style="width: 100px;">Date</label>
-                          <div id="dt_logdate" class="input-group date">
-                            <input type="date" class="form-control" value="" limits="0" placeholder="dd.mm.yyyy"  id="logdate"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                          </div>
-                        
-                          
-                        </div>
-
-          </div>
-          <textarea class="summernote"  style="width: 100%;" id="logmessage">
-</textarea>
-					
-                </div>
-              </div>
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" onclick="removeeditorhost();" class="btn">Annuler</button> <button onclick="save_cominternelog();" class="btn btn-primary">OK</button>
-              </div>
-              </div>
-
-              
-            </div>
-          </div>
-   </div>
-   
-  
-  <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-  <script src="../../web/js/moment-with-locales.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
-  <!-- <script src="../../web/js/bootstrap-timepicker.min.js" type="text/javascript"></script> -->
-  <script src="../../web/js/bootstrap-multiselect.js" type="text/javascript"></script>
-  <script src="../../web/js/summernote.min.js" type="text/javascript"></script>
-  <script src="../../web/js/lang/summernote-fr-FR.min.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/navigation.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/system.js" type="text/javascript"></script>
-  <script src="../../web/js/labels.js" type="text/javascript"></script>
-  <script src="js/logcominterne.js" type="text/javascript"></script>
-  <script src="../../web/js/creorga.js" type="text/javascript"></script>
-  
-</body>
-</html>
diff --git a/modules/logbook/logcominterne_basic.html b/modules/logbook/logcominterne_basic.html
deleted file mode 100644
index 0d82130..0000000
--- a/modules/logbook/logcominterne_basic.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-  <title>Communication interne</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="cache-control" content="max-age=0" />
-  <meta http-equiv="cache-control" content="no-cache" />
-  <meta http-equiv="expires" content="0" />
-  <meta http-equiv="expires" content="Tue, 01 Jan 1970 1:00:00 GMT" />
-  <meta http-equiv="pragma" content="no-cache" />
-  <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-  <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-  <link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/dataTables.bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css">
-  <!-- <link href="../../web/css/bootstrap-timepicker.min.css" rel="stylesheet" type="text/css"> -->
-  <link href="../../web/css/bootstrap-multiselect.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/glyphicons.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/summernote.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/creorga.css" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    .dataTables_filter {
-      margin-top: 15px;
-    }
-  </style>
-</head>
-
-<body>
-  <div class="container-fluid"  style="padding-top: 5px;">
-    <div class="form-inline" >
-      <div class="input-group month btn-group">
-            <span class="input-group-addon">du mois:</span>
-            <input type="date" class="form-control" value="" placeholder="mm.yyyy" style="width: 80px;" id="logmonth">
-            <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-          </div>
-            <button class="btn btn-primary" onclick="onpreviousmonth();"><span class="glyphicon glyphicon-chevron-left"></span></button>
-            <button class="btn btn-primary" onclick="onnextmonth();"><span class="glyphicon glyphicon-chevron-right"></span></button>
-      <button class="btn btn-primary" onclick="newlogmessage();" id="btnaddmessage"><span class="glyphicon glyphicon-plus"></span> Message</button>
-   	  <!--<button class="btn btn-default" id="btneditorhost">Editeur: <span id="editorhost"></span></button>
-   	  <button class="btn btn-danger" id="btnprotection" onclick="confirm_delete_protection();" style="display: none;"><span class="glyphicon glyphicon-remove"></span> protection</button>-->
-   </div>
-   <div>
-    <table style="height: calc(100vh - 100px); width: 100%; ">
-      <tbody>
-        <tr>
-          <td style="width: 550px; vertical-align: top;"><table class="display dataTable cell-border" style="width: 100%;" id="tbl_logcominterne" role="grid"></table></td>
-          <td style="vertical-align: top; margin-left: 30px;">
-          	<div class="form-inline" style="margin-top: 15px; margin-bottom: 10px; margin-left: 10px;">
-				<button class="btn btn-success" onclick="edit_cominternelog();" id="btnedit"><span class="glyphicon glyphicon-pencil"></span> éditer</button>
-          		</div>
-          	<input type="hidden" id="cominterneloguuid" value="0">
-          	<div><strong>Titre:</strong> <span  id="cominternelogtitle"></span></div>
-          		<div><strong>Date: </strong><span id="cominternelogdate"></span></div>
-          	
-          <div style="width: 100%; height: calc(100vh - 200px); background-color: #fff; border: 1px solid grey; border-radius: 10px; display: block; overflow-y: auto; padding: 5px; margin: 5px;" id="cominternelogmessage"></div>
-          
-          </td>
-        </tr>
-      </tbody>
-    </table>
-   </div>
-   <div class="modal fade" id="confirm_delete_logcominterne">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-
-                <h4 class="modal-title">Supprimer Message</h4>
-              </div><!-- dialog contents -->
-
-              <div class="modal-body">
-                Êtes vous sûre de supprimer ce message?<br>
-                
-              </div><!-- dialog buttons -->
-
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Non</button> <button onclick="delete_logcominterne();" class="btn btn-primary">Oui</button>
-              </div>
-            </div>
-          </div>
-  </div>
-  <div class="modal fade" id="confirm_delete_protection">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-
-                <h4 class="modal-title">Supprimer Protection</h4>
-              </div><!-- dialog contents -->
-
-              <div class="modal-body">
-                Êtes vous sûre de supprimer cette protection?<br>
-                (possibilité de perdre des données pas sauvegardées)
-              </div><!-- dialog buttons -->
-
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Non</button> <button onclick="delete_protection();" class="btn btn-primary">Oui</button>
-              </div>
-            </div>
-          </div>
-  </div>
-  <div class="modal fade" id="edit_cominternelog">
-          <div class="modal-dialog"  style="width: 1000px; min-width: 1000px;">
-            <div class="modal-content" >
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title">Editer communication</h4>
-              </div>
-              <div class="modal-body" style=" height: 80vh; max-height: height: 80vh; ">
-
-                <div id="frmeditcominterne">
-                  <input type="hidden" id="loguuid" value="0">
-          <div class="row form-inline" style="margin-left: 30px;">
-                          <label for="logtitle">Titre</label> <input type="text" value=""  style="width: 80%;" id="logtitle" class="form-control">
-          </div>
-          <div class="row" style="margin-left: 30px;">
-             <div class="form-inline" id="date-container">
-                          <label for="logtimestamp" style="width: 100px;">Date</label>
-                          <div id="dt_logdate" class="input-group date">
-                            <input type="date" class="form-control" value="" limits="0" placeholder="dd.mm.yyyy"  id="logdate"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                          </div>
-                        
-                          
-                        </div>
-
-          </div>
-          <textarea class="summernote"  style="width: 100%;" id="logmessage">
-</textarea>
-					
-                </div>
-              </div>
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" onclick="removeeditorhost();" class="btn">Annuler</button> <button onclick="save_cominternelog();" class="btn btn-primary">OK</button>
-              </div>
-              </div>
-
-              
-            </div>
-          </div>
-   </div>
-   
-  
-  <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-  <script src="../../web/js/moment-with-locales.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
-  <!-- <script src="../../web/js/bootstrap-timepicker.min.js" type="text/javascript"></script> -->
-  <script src="../../web/js/bootstrap-multiselect.js" type="text/javascript"></script>
-  <script src="../../web/js/summernote.min.js" type="text/javascript"></script>
-  <script src="../../web/js/lang/summernote-fr-FR.min.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/navigation.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/system.js" type="text/javascript"></script>
-  <script src="../../web/js/labels.js" type="text/javascript"></script>
-  <script src="js/logcominterne.js" type="text/javascript"></script>
-  <script src="../../web/js/creorga.js" type="text/javascript"></script>
-  
-</body>
-</html>
diff --git a/modules/logbook/logstaff.html b/modules/persons/index.html
similarity index 100%
rename from modules/logbook/logstaff.html
rename to modules/persons/index.html
diff --git a/modules/persons/index.js b/modules/persons/index.js
new file mode 100644
index 0000000..e69de29
diff --git a/modules/reports/css/print.css b/modules/reports/css/print.css
deleted file mode 100644
index a3c54fc..0000000
--- a/modules/reports/css/print.css
+++ /dev/null
@@ -1,138 +0,0 @@
-body {
-  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
-  font-size: 11px;
-  line-height: 1.42857;
-  background-color: #fff;
-}
-h2 {
-  font-size: 18px;
-  font-weight: bold;
-  margin-top: 0px;
-  margin-bottom: 5px;
-}
-
-h3 {
-  font-size: 14px;
-  font-style: italic;
-  margin-top: 0px;
-  margin-bottom: 5px;
-}
-
-.dataTables_filter {
-  height: 0px;
-  width: 0px;
-}
-
-/*.dataTable > thead > tr > th {*/
-/*  padding-top: 70px;*/
-/*}*/
-
-/*.dataTable > tfoot > tr > th {
-  padding-bottom: 40px;
-}*/
-
-/*tfoot { display: table-footer-group;*/
-/*                 position: absolute;        */
-/*                 bottom: 0; }*/
-
-.alignright{
-        text-align: right;
-}
-
-.alignleft {
-        text-align: left;
-}
-
-.noprint {
-  display: none;
-}
-
-
-
-@media print {
-
-@page {
-  margin-left: 2cm;
-  margin-right: 1cm;
-  margin-top: 1cm;
-  margin-bottom: 1cm;
-}
-
-tfoot {
-  display: table-row-group;
-}
-
-table {
-  width: 100% !Important;
-    border-spacing: 0;
-    border-collapse: collapse;
-}
-
-table.dataTable td {
-  white-space: nowrap;
-  overflow: hidden;
-}
-
-table.dataTable > thead > th > td {
-  white-space: nowrap;
-  overflow: hidden;
-}
-table.dataTable tr {
-               page-break-inside: avoid;
-               page-break-after: auto;
-           }
-
-table.dataTable tfoot {
-               page-break-inside: avoid;
-               page-break-after: auto;
-           }
-
-table.dataTable tfoot > th > td {
-  font-size: 2vw;
-}
-table.dataTable {
-  width: 100% !Important;
-    border-spacing: 0;
-    border-collapse: collapse;
-}
-
-#print-head {
-  display: block;
-  position: fixed;
-  font-family: Arial,Helvetica, sans-serif;
-  z-index: 10;
-  top: 0pt;
-  left:0pt;
-  right: 0pt;
-  background-color: #fff;
-  text-align: center;
-  }
-
-/*#print-foot {
-  display: block;
-  position: fixed;
-  width: 100%;
-  padding-top: 5px; 
-  bottom: 0pt;
-  text-align: center;
-  right: auto;
-  left: auto;
-  font-family: Arial,Helvetica, sans-serif;
-  }*/
-
-/*#print-foot:after {
-  content: counter(page);
-  counter-increment: page;
-  }*/
-
-
-.dataTables_filter {
-  height: 0px;
-  width: 0px;
-}
-
-.dataTable {
-    width: 100% !Important;
-}
-  
-}
\ No newline at end of file
diff --git a/modules/reports/dlg/dlgpdfviewer.xul b/modules/reports/dlg/dlgpdfviewer.xul
deleted file mode 100644
index 255bb8c..0000000
--- a/modules/reports/dlg/dlgpdfviewer.xul
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE dialog PUBLIC "-//MOZILLA//DTD XUL V1.0//EN" "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-
-<dialog id="dlgprdfviewer" title="PDF Viewer"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        persist="screenX screenY width height"
-        buttons="accept"
-        buttonlabelaccept="Fermer"
-        ondialogaccept="return OK();"
-        >
-    <script type="application/javascript" src="chrome://creorga/content/js/system.js" />
-    <vbox flex="1">
-        <browser id="pdfviewer" flex="1" src="chrome://creorga/web/pdfjs/web/viewer.html" type="content-primary" style="background-color: #fff;"/>
-    </vbox>
-<script><![CDATA[
-      
-      
-      function OK() {
-          window.close();
-      }
-
-
-      if (window.arguments[0]. in != null) {
-        var appd = OS.Path.split(system.appdir());
-        var len = appd.components.length-1;
-        var npath = new Array();
-        for (var i=0; i<len;i++){
-            npath.push("..");
-        }
-        var abspath= window.arguments[0].in.uri.substring(8);
-        //dump("PDF URI: "+ abspath + "\n");
-        //npath.join("/") +
-        //?file=" +abspath file:///
-        
-          document.getElementById("pdfviewer").loadURI("chrome://creorga/content/web/pdfjs/web/viewer.html?file=" +abspath, null, 'UTF-8');
-
-      }
-]]>
-</script>
-</dialog>
diff --git a/modules/reports/dlg/dlgprint.xul b/modules/reports/dlg/dlgprint.xul
deleted file mode 100644
index 0817914..0000000
--- a/modules/reports/dlg/dlgprint.xul
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE dialog PUBLIC "-//MOZILLA//DTD XUL V1.0//EN" "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-
-<dialog id="dlgprint" title="Impression"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        persist="screenX screenY width height"
-        buttons="accept"
-        buttonlabelaccept="Fermer"
-        ondialogaccept="return OK();"
-        minwidth="1020"
-        minheight="600"
-        >
-    <script type="application/javascript" src="chrome://global/content/printUtils.js"/>
-    <script type="application/javascript" src="chrome://creorga/content/js/system.js" />
-    <vbox flex="1">
-        <toolbox id="previewtoolbox">
-<toolbar>
-<toolbarbutton label="Configuration" id="cmd_pageSetup" image="../img/settings.png" orient="vertical" oncommand="showpagesetup();"/>
-<toolbarbutton label="Imprimer" id="cmd_print" image="../img/print.png" orient="vertical" oncommand="PrintUtils.print(document.getElementById('print_browser').contentWindowAsCPOW, document.getElementById('print_browser'));" />
-</toolbar>
-</toolbox>
-        <browser id="print_browser" src="about:blank" type="content-primary" style="height: 0px;" autoscroll="true"/>
-        <browser id="preview_browser" src="about:blank" type="content-primary" flex="1" autoscroll="true" />
-    </vbox>
-<script><![CDATA[
-  var PSSVC = Components.classes["@mozilla.org/gfx/printsettings-service;1"].getService(Components.interfaces.nsIPrintSettingsService);
-  var printSettings = PSSVC.newPrintSettings; printSettings.printerName = PSSVC.printerName;
-  if (system.os == "WINNT") {
-    //code
-  
-    if (!printSettings.printerName) {
-        printSettings.printerName = PSSVC.defaultPrinterName;
-    }
-    PSSVC.initPrintSettingsFromPrinter(printSettings.printerName, printSettings);
-    PSSVC.initPrintSettingsFromPrefs(printSettings, true, printSettings.kInitSaveAll);
-    }
-  if (system.os == "WINNT") {
-    var printPreviewTB = {
-      inititalize: function() {
-      },
-      updateToolbar: function() {
-      }
-    };
-
-    var PrintPreviewListener = {
-      getPrintPreviewBrowser: function() {
-        return document.getElementById('preview_browser');
-      },
-      getSourceBrowser: function() {
-        return document.getElementById('print_browser');
-      },
-      getNavToolbox: function() {
-        return document.getElementById('previewtoolbox');
-      },
-      onEnter: function() {
-        //gInPrintPreviewMode = true;
-        this._toggleAffectedChrome();
-
-      },
-      onExit: function() {
-        this._toggleAffectedChrome();
-        this._printPreviewTab = null;
-      }
-    }
-  }
-
-
-  function OK() {
-    window.close();
-  }
-
-  function reload() {
-    //var orientval = ((printSettings.orientation == 1) ? "landscape" : "portrait");
-    window.arguments[0].out = {
-      reload: true
-    };
-    window.close();
-  }
-
-  function savedocument() {
-    var sdoc = document.getElementById("print_browser").contentDocument;
-    var webBrowserPersist = Components.classes["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"]
-      .createInstance(Components.interfaces.nsIWebBrowserPersist);
-    var localFile = Components.classes["@mozilla.org/file/local;1"]
-      .createInstance(Components.interfaces.nsILocalFile);
-    localFile.initWithPath(system.tmpdir() + system.sep() + 'test' + system.sep() + 'test.html');
-    //"File saved to: " + system.tmpdir() + system.sep() + 'test' + system.sep() + 'test.html' + "\n");
-    var localDir = Components.classes["@mozilla.org/file/local;1"]
-      .createInstance(Components.interfaces.nsILocalFile);
-    localDir.initWithPath(system.tmpdir() + system.sep() + 'test' + system.sep() + 'testdata');
-    
-    webBrowserPersist.saveDocument(sdoc, localFile, localDir, null, null, null);
-  }
-
-  function showpagesetup() {
-    try {
-      var x = PrintUtils.showPageSetup();
-    } catch (e) {} finally {
-      reload();
-    }
-  }
-
-  function resize() {
-    var ww = 1020;
-    if (printSettings.orientation == 1) {
-      ww = 1430;
-    }
-    if (ww > window.screen.width) {
-      ww = window.screen.width;
-    }
-    window.resizeTo(ww, window.screen.availHeight);
-  }
-  if (window.arguments[0].in != null) {
-    document.getElementById("print_browser").loadURI(window.arguments[0].in.uri, null, 'UTF-8');
-    printSettings.printBGColors = true;
-    printSettings.printBGImages = true;
-    printSettings.unwriteableMarginTop = 0.5;
-    printSettings.unwriteableMarginLeft = 0.5;
-    printSettings.unwriteableMarginBottom = 0.5;
-    printSettings.unwriteableMarginRight = 0.5;
-    printSettings.marginTop = 0.2; /*  these are in inches */
-    printSettings.marginLeft = 0.2;
-    printSettings.marginBottom = 0.2;
-    printSettings.marginRight = 0.2;
-    //printSettings.shrinkToFit;
-    printSettings.paperName = "iso_a4"; /* name of paper */
-    printSettings.paperSizeType = 1; /* use native data or is defined here */
-    //printSettings.paperData = 9;     /* native data value */
-    if (printSettings.orientation == 1) {
-      printSettings.paperWidth = 297.0; /* width of the paper in inches or mm */
-      printSettings.paperHeight = 210.0; /* height of the paper in inches or mm */
-
-    } else {
-      printSettings.paperWidth = 210.0; /* width of the paper in inches or mm */
-      printSettings.paperHeight = 297.0; /* height of the paper in inches or mm */
-    }
-    printSettings.paperSizeUnit = 1; /* paper is in inches or mm */
-    //lets hide those ugly default headers
-    printSettings.footerStrCenter = '';
-    printSettings.footerStrLeft = '';
-    printSettings.footerStrRight = '';
-    printSettings.headerStrCenter = '';
-    printSettings.headerStrLeft = '';
-    printSettings.headerStrRight = '';
-    
-    PSSVC.savePrintSettingsToPrefs(printSettings, true, printSettings.kInitSaveAll);
-    gBrowser = document.getElementById("preview_browser");
-    gBrowser.selectedBrowser = document.getElementById("preview_browser");
-    if (system.os == "WINNT") {
-      PSSVC.savePrintSettingsToPrefs(printSettings, true, printSettings.kInitSavePrinterName);
-      PrintUtils.printPreview(PrintPreviewListener);
-      resize();
-    } else {
-      document.getElementById("preview_browser").setAttribute("hidden", true);
-      document.getElementById("print_browser").removeAttribute("style");
-      document.getElementById("print_browser").setAttribute("flex", "1");
-      //document.getElementById("cmd_save").setAttribute("hidden", true);
-    }
-  }
-  ]]>
-</script>
-</dialog>
diff --git a/modules/reports/img/logoprint.png b/modules/reports/img/logoprint.png
deleted file mode 100644
index 8c760e8ad75dc6048f90d3e3a9d48147f1ee1f46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8121
zcmV;qA4cGbP)<h;3K|Lk000e1NJLTq005Q%001`#1^@s6?m@Gu00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru-wGHDAS=bpQHTHl03B&m
zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*03RJmL_t(|+U;FucvMB(
zzGu$%-DE?0Xwsww6i^Wa1PdrdkggygHH0Jt5=v;&At5Az&<R}#N(T`Qh$0{_MT#h(
zekeVVo@{UD%=aV3WcLJ;kXON%Cs(d(&zy5+XP&vAI%NqSLMN`RLc2!6CCV<|*n{S^
zd*NxKHAi{|Wa$4`X13{iNvPz3T<RX_>;C*_0t7bdt(|yAl~2^UfH79|xm}}RFve6%
zzwYQ6z3-(ej4|!wf-3Q=PLF)1cpFNiQ@?F^<TEpOGynjk>#l#FXG-nu;4Q>#*9RCZ
z8OeHU#_P{ORW=eEj~$<X{?K<w;fF29hvLB5jo39I|2p=IHen`fPKe2p<qbke{uc;P
zNZpL?O1~Wwx}TZ=05SVoV)FZEAKAFWmlvbc3;C6=`?h~zw&7+!J8x^LkZ2kMOlPv?
z9P?0BPYLUsa<Cj7c3bv!r`~!?Mn{gy+S(i@PRc3LY!1`c{_YKS1$Ekc@yO-a+D9(O
z{z(We!Kf<g>Yq*NdHzGOdS`ty6SL;be&qMZMn_{}R8+YKseqk-D;+p+0NuNHe;ja;
z1#{;$N=;1_Mu&_sH*MPVR^h#s%U57bXoxGY_MV-Lo-Jc=@WM>lg&Vs*u-T29tqv0i
zAs}#O0)xN=$R%nhW!gm?k<N|k`J-XanThE2YOG6xmLBSe@GeKN>DVB*blv~8F<3I!
zTWtEOMb#Ea10e*A3E-#<UT(D(5|HJQ@10C-HxoEI-Gp7IBQT)dY5+jY{+5jx*t{IW
z?Ou!t0HOKy5CRko9Akh?qP$(#zs=06cMor*ge%4*0iK%YR!6;mu7sWM^w!%reDoVE
zO-RsQyY_1XxlA_Hpx1X|Kpnf?4$5(mNu?%*LUDjnnxs^zE=Mnl$?Wl7ckDZ`zf6Fc
zJ9~~_Zca{JqtQ5wa$Ik{PUk@>g<LKNrSytiF5d}YzgDaLZO;68X6N^(Po0K&3+96{
zMngsiH<8I?-AyLbyK=d_O<rDJe*XjkN|g$Xv0qgx)ed*9c5h(g##cTVIKUn?aT20q
z7nRz+!uyOd8Xg)J$bcahvpG_)*XQGb5b!(?rBVr{Qu(DuqggBn!nwF53C75A;}N$c
zA%8q~otcC_uPy>(OgVdZ!`)V!p|ijo#g$p<C<cR+Q(SLet55qrt>RKI+}MQ{wfnd{
zxBlA!P48r#UuLoE+Y5{r0jo&8RDM&V^o^PF{*S9WF9g1tQZO*P0%uqp`e`<YSza70
zrPV}<1Uz#vg1@w`Osa;bx<<o@ZpVKEfVjnr5ji1Wn}&@E8E7(@##*h`mORfFfb=gd
z!-@%lTrU4p<K~vMY{l|u0NB58KYG01!=)7yBO*y`d>jiK6B2B**(U0Ay4ppO?Nl#g
z3<`w;0KW9`^@)y+i#wULHVGp~jV!8f^QO(-$G-b^p1=!1R;#tBj^e;BZoZ^aDJZ1}
z8a8bBNz}BdKaChV4C^+Q?n*3)ix0ST>C$Y**vP{A#e}BtJCsW0Szlk@;ON*z7nUzu
zMnc2FSkcq7b~e0fw&gaeh?<mea?JnWmdiKC9%v1<!rL=TfAjwgmUPdufVG4JNH~XD
z?io70_s?qpV9u__Q%$zq`HTtWZX-u!;05b-jl#!R)BEMHA?-JvSeeolW8V3)=$Vkw
z!PD~c@@5Nyz?HRLLWrPHDE_m4)5f-9_s52WB5}oXM1+q!djJ0YH_KxNDWz!MqD9Zh
zi4*pHw*51lKX(o$i$!fR7>`@6mKNpZ0U;zyqtWzUvo7g-vHRo4hQrItOMCb3-HUm7
zd9};aR)@pEckBLM=-?qkR!^BUIe(<*><(OLv}8vCtYY>T3`(i?-0Xh8w{%hcyPKrw
z%xRq-tzG`Ajevp>&IsU!o67HdFLjNHCTmXp4E>EuykM(P8+pNj8lEpM4exq%8~|+o
z{$mVjzX>6ugRx@uDvS*Y?W)u14%%!LtKZ$-eO=V_>7&-IUBl+hpI_qMn4r-+v$C@K
za2!`&zXnpN6mNCx_{xxvhx}Mj*OBb(?6)bU6>6tUCc9g`Mva#97R<jdc7N3H5kKg3
zy4NaFzaR*fTD5Dv61`~AFJ%7S=H3>Y?hl*8=<eDv0TNCDLdYM4P$~$H+IHRoN;u|f
zD~ZilTd!|qw-W~nOBNky)g#+*YoAC|!59;WOsaM;fxkfrRSAr*Mu`LxiQ=$?N<UZ1
z+;2p7JNaGV3-k9hyP9iCZA1xm0kwomL5cJ>0keP*f2-Z-P6%~rBLPKC@0Z$-dFPAc
z#mlEonq1}fojciurcZ2ud7cNQ94Hl+VnQkW{QWw_CnS9D1gZhKxw+dO7Hv5@^psLa
zq>^l<LYXWG!YOyH`)`Zm<1dUK8y=CCmKOJ@z(5cL5D*Y5-j^z#o?BP0UNvaPjveUN
zuOF7gCtzH}cubrS8FTyQ?MdYofa0XqXpTHrtJeEeLS=2OcD=jkLkjObKJIm^a8wp3
z<CKlI9>2pq=krQ}xC180a*g-fGsX~quss04XvvN*#cYx1d|M9x^t&4}j*~Z$P<dUY
z%tI~Z6e@ph!*0`iUEWX}R7ZY}eLmN8&jnNfgIuD1(6a8Jnjm;yDp56^yZweo;~Jd@
zinUPyk96JttpR{d-w(#-O`8D#xjNk!VxTJ27+S41<+V0#Hv9Sc?2t;OIik|a^RSpL
zUjo3Im8$>%lP64cvsf&nO9O#Ip|Gk{s-4xUSKp}7Xns(u)$sQAKIr4)<1dv;tJQB%
zKYZ=_b=w!m$6sKKaSt9m7+<QX=Qvx<nl<CARj<~(RqIxL{rvromtqc)m6`cbjxNuq
zU%!3;fN>GyasK=TkGr?;4i*CyV+=Bx3^KX=oI;`aP9l+{m(~um$<*=pUw`$Kn5<bt
zT&0vjCe@sn+2?9+;A&Cnwv#~^*mh0CoLzyrMr+n==gb9z&@T3iHrh$uPvxyl>Gu51
z%pX0R9d$}L)bnrOdia~kr<bR6A))UavXzwBYdHB^652NS%UL~lJ$bkos3e>`Z*KoT
z1Av7{J~0{t+O5WhV;|w;_M4Mef72`dM%t+(C0j^fw&nWlI6babzgA0b0$Z?m&t9L;
zw{LGCrusE*Zs(KMuY1|KJa|-4QeIx(2<HLI%*aqLUz+$*(3s%!0ARD(yd4flJ26~&
zdU>u`v1(OVSv5gu@R-*LAs%8tk;~<WHf-M1wOH{b0J}chmfRvGCFNU-#iA`f#vI3C
zV)*!Q0MiT0)~#97iBej{*}4!ypwVa!tX;pZL{u_!#*9IKT>m3U5CnM%mxJe_)oO=R
zfV|8^5c<vwQN5g_i_^d7M-s2p`EVTp$q<3|^H#e-0RVb)+KZG>wTq3HsE*ip{iUrZ
zMj`Z_L(Dmv0Z;-|0ARA^zU-`k7z3(%HXl$VQBoBEU|5H(*m!IZa`d-O$vEXnk%3VE
zcJJGl3a`KW_S^Ox$GM4UfZsK0bvpp~^1v7Q(b$HKXwt9|R;^t#QmInycOC?ZM1reV
zuLc)Ga%;QY?!qRiRC=m7s3we$e6;_<*z<%^rHIe;Ye4ntefsw5U1F?aqhs*FzyTM0
ze0+LIBodeLl}IE#ijS{Or+c0;CU>r1sZ<_bvo5KpGZtpgo%^YupWjqL5L|$0Hk-Rq
z0M(s+7PZ0)Z5xivbRP6&!}6KbxyAHU24-?~y9K2n*eC!PY}r~c=Au_EcKxZ~j$c?l
zYPYt`cH2W$y`Hm4<v1zs<y^i}*v3As;*0JL?eHn4^gM6kIN5(hVgsq&VX9JinVps8
z&P3WNkx2F=BrY`rK-cc?0RV;!8;W0ky#@gA_4S!7Y6{HedPRLTTiS}56>lG(Bmjt6
zun+*SI3ezlJTRL~4B|5qd*{!eXWqGIcZso@7&RF)XM6&^L4TR!xI4~+pPQSjE&QCG
zmM-=1@Tl)BD3nqrS11k<LIknYNZgWy_=40(iT=qIikB!a*h}gH#-NmWJhGz-nLA2G
zkqjDzkKC_HBUyfuj%O8%F<r^-FuAx)GEND#%<~aa&Krr738hrRd28#`D7>yyw@xjI
zlSmUnAdyHc4|9@rc{;O7rE)3v@bIWx6e()8FNm5hnd}$<OrARB@p)snTT8n)d+r<v
zykO;d{<c^uqmW`^qKQtg<3xN+fl`_&)`wym%}^YWgb?WR@(6`kuA&TiBC+`+#sn~d
zul)H4Lg1VVVPFvO@OG-@o`kqghr+?ziYl{Otb&+dA(zX^L-IjTs#Jt?GBE`MUBm#p
z&E^mZ$x-L|I`Yb43xQNBeQ2^tsa6w?<0KDz=EY{sIJH`>EzSo@DSUi=&OBeg{tpj(
zSEtk66AOAM{>5ar>lkwZAAyWhJhn1r71YOt>43j+2DuFRCmu{-0;LoZiR60SdiCDl
zx;>dJNla`rHhk>OojZ3GJ)5*P$yxJ>3W=oB+F!u5e`12QG%{JT;cN<d!Dhdkefb8S
zQ4!_k<T(PWR!yEcdsbgUh)agJZ{I%H@%avH*|G^EM~y`4{Rh%%lP7mlYc$(3GcvSd
z5w+xTpj4P9ka7xW6h83`!hS;NgC~JmcXKXtYmfBux7rQP=?>=YR+k4-pCPJ%!pD!Z
z1NeN_oY|tQFN&8fS`;%pGCVwl<GAKonVBdpLtkNFaa8KiDg%Cesc!$i?>3uy6S#@x
zUw1~(+k2k~W+fjVq2L93eG!M=ObGk^8JtQt)rB;7)@;m}H8cP7oH-sh{=AWV@y83D
zi?aI<u}&2NR`mXsG^)qhg0T80e0qEs2ED!kq3?e6L@;N;zL#Ke7}bQ(H$*h8rPB*h
zSAi4HQ1l3zF>5A{e|t<hK78DVxj8xOi?5`36qVa~-|*c4MD;jZ!uuTb`i3WpAyeN!
z4?<{Po5Mt$BS|-<UsjWvU5&8^UVDa|M+7E6UHygIn!NQ?dRp3go6S}(|GC`28umuA
zX!*7iqyBM*EIIUcvD}w=xyTeOs;H{31b~U%Pd!7>L(Cy#%zx3G`3{5L(5$Sc^Ra+c
zTF5=H9GUe07LDuj4fdRy<}q`}^H(f3J)D!OQcli7-aWLUEd3&c$o^M>HGAf)CW8kI
zykA;MrC@SCi&C1XP$;s+o~sbBj{UOK1+5#u8#HXuf!FS?Oz9TzcQfLvpJEZY#f>n=
z@XM{eDHglFv9lxzjEBFrQ4jzeyRyPLQv$~Fqg=UMj^}FC3b$A+i~rXEHF@GBGBz|!
zbLY;TZ+P)s8xsTp0RaKKq%v9Kt=p5sEf!0bnAWP0^WLFJIHLEx;w6)){4I9ft~}HI
zhS%<;z(ZXfgwVfT()FgBR3)!2pSwHIWUyqq<gNffDRsZ7H>Z7m=)xRy2>ff|Kc&=4
z2+8vE_xm+r>C#Sw5EB5zER6nFxlLtxC?<9h8ygz7)u7k=iKP*wQYmTw<{M3h4I6eP
zYT~5gX0!6r4OWNYdbZ(~2SEO@#3&(>+&yO|)xC6c_avLcG|Flh#6ZP3DkUnJ$LOe@
z=XJnOB_qg~=tM$DGyp6~OvJLpWe6J^hRIW+o+xCL#$SiS@z6BBkUu?FCd;%WF22L*
z)2DklgQ{Td*zf-S{_hVPHtgE*6UXs-yVon%c`qbhaOC}ynRdnmSZ%o%&;617AFIPS
z3J~2^#VFxOfJb1HsGjFt_NbjbeFlXZs*u9QhCPugM<S8%&YFiY2DMsURcv(z09?Fq
z5k`Yv4uaYufc(oh9Xl2PaQ^)Hm13aMXf$y1@OW|IqL^!8V?rJYs>gQT|4FhrjIh{s
zwFTzzDP77b0&8|{6xR9cD_g!F>T<tjt5=_z{_;HkGh@u?Ty8KJI?k9n%^v`!M&+-T
z`0`->`myFMnxk5^8n0N*Rv%}u`1||o3O_GNOhn}P@vV5CuO_A`Uu@Q_eq!QM3ji!z
zxuQ(%eTpZc3B-5(FvcK2F4dgSC_I~f)OPK!-~5t*!R<Gesn+7Y)r5$MC#JU%kr6i-
zV-69`Qzth!_w$&A(M=Xa=dbVT+O1&y*hhl~-M)S6OXs!kf*?Sn(HtmlV$&X^wF2O>
zL|voN9N;Luec}9t@@d$ATVx}XXo$PguQy}-*OPjjG0oapA8$7qU-rmoN)%!iMlVcH
zPtz@qk6-wt^sC7WFJy*{4*n%OJG;H}#*6Ii>^8Z%xhDto{~)jF3oo$r^faX2OQm+Z
zy{eelX*3!vh>4zBSa$Q~pWOU8^BWtDMrU=!+Z>KV!J#46a+~gdPg0LMK*&!`Yj*41
zul3SfJAMcQa0avbK73kmX?%j_!jC`tY24kt2qA~Fv$M6AfBFekJgUrk()!r8L))$g
z_Z>8dMPY&<XaQ(1UAzcNDN5UELkNLFshnCOfSJ2MZn0Quh$w%9SCuN~E7I1dd_5K`
z&{C@Jl~V2C=nwC`+^_Z0TZvzFLccc4TqJeQuEs^zg@=>m<m3b~;CfC@&Y7&NtfJ+*
zkKC^Px96B9;=>OH8hw0xK9<W%Unj_MT&V$7L7wiITq21L4;x!lu23ix5{aa?2ncPx
z`}M2PGLWZMV==}cm#WaF!KfEgevbY%VNjm!xiP@a70hL;dGY9VMM{?lUT~z0?R@wO
z0GQ2YH};5-{z;&i*jS7W3B{6SiJQld4QFX-X`9Q-FRfOawmNC8%f!6JVv!1h;4AWu
z<+ayZr~XfAEQQP+RotHQc(>V<%Y9ynvjM=Zl_kNk`%I)}>Sr|?#T|V8tp$6VrA^)z
zz;0!ppKG(3>`!B#6IU!pcxV_B5|?h-_Sts1T%ov3DZMR`JX}9eO5q<6uyl3OTL0it
zK`zo`x7#5I0u?c@6<%peMVGFYL2|{Un-B^@xc`QJa)|&50IOB!0RU|pj&OM+df%&x
zD|fz%V@$Z3p7;AVxyJjx1-UK@z{t}oP)nCD!_FN$KnSsI+`Q?<PMtcv?CIq-0>C%`
z6RK9LwnC*+Wfb?rWHOmKJ1bK&A#y^GRcqI<;GofBz!Fn)kCAtyGT3-?v0)>y*!3mM
zNOAh%_w{H~e>lumozp!6o#}zmXvwx#HZ!GEL7c&5=Plp`J1gzHDUMR5gSWOR+%{J9
z3<FdOuL=oHS&|)phiBHeU<b1y&j5{9lL25o037-1TX^|txlcE3o>0Zpvs>!Dd!I7K
z6c&p`31Ikx)YQIVA)$Sjtyq58S)&Pp;4(Es%5Z)ID`lpdS{<g}i~FgB5a`Y6V2o*<
z=YhVuI3I2556888NBk)zDp$u*YFEfKtg;!IW4il?^HhyPu)*J>QPooCsyKz*Az15(
zROhG@&^o*D!e}zNL|K9$ATKZPq4q_tkjo7QgGjnVX8F6cmqx28aow@=n`qJEB|axt
zXNiqlysK)pY6pw=O%Mckqros_)25Bm;_tb;yF)6K3L?U#xP0l7x7c^jobd?&z|+gi
zWj~@!CIgjliYu-{M=*cS3)`F}S7%NG0PH<GX#f~=5qnA`*EI^CN@uKu$}fs3hWj~J
zHy5_?%H6N?L+8EC2>{r5bEJc}E1gZMT&i)r`@)orzf`s)2Y^E)x@tM(qd~G2%a)fY
zUtVx+Hktd2nGdVo_K$DW*tBI+z69Cr2Z|4R!4BwZS?QT2!b*3oyOra(TOz)hcI%d{
zuZsl&v**si&YipbvobSXf+eX`nneSuG}<CC-o;lkSTegV*xO=t@$&w!C1T^TL1Xev
z58{}J<8ODEQpR;TnpfG3dd}ySZO&~32pod7{wJT;y}}sd0;|6Z0GQhIB8%Sla&or*
z#srs50RU9;DnA0i**}sCoJ?{_5CoU0606nPv3`RF{X@b+Q8<$y5k3x~VWHT)dr#8`
z4<5`Z<z$*Y|1_{BMdlwOXS3NpF5boh?fzrrq=_X|?fiucbpU=4ao*)w*;#|<&7LER
zi(TyECVX}9;P<7ZJia4~_P^?BvgQ6}w&i-eI0%e^auO&cZW%V-oClzu-C+U|ImU>9
zSo}Q$dyMP+&0zqT{#mVIcHX)MV9q9GcFe#BWllb>Jp3NUbov5wb_MDT)=W3C^b!Gq
zT;^_+aS9kLnQERnMAJ}&P&BU5IdE{h^;e6R4;nD=PoC$U^EgZp1mfrCw?92SeSt=!
zky$JjrdF#v==J(}1-=Dw_RF?zPnH*Mp^69}ckKTC`|X`2`i-~WXfSHj=rV8U7#kAW
zC?g}omr`2R4T;Rd!{eRY+}x>*F<RI*xm<oUFfedr<fMr%S~Y0os6ht3egk7A$4d|d
zRI6S+CGEk3nO<IA7Q5X}tX8WVrF4SPXzVWLoBI0t_Mj8HpU#$YiUkZJ+lmQ+An-8R
za(o=TwVs2w7DjzeyYdAn<sJtMK~<SFrc?feDlgc(mv(p?1B1nutIjh&P?vTTrNA8U
zcB{R6aJ%(am#1_A0GvFTFQnC~RhuPZ)(E8(>FMb`D5YmC7Rw1i5KiiJx_JfWrNoyA
zJP&_=|HXt5+tDN6R4NYyL8v2@N{=zdj+gQOL{3i5^g>V-nSH6$o}Q7>zwmm?#!W@{
z)+DX{R3?+<!D$5rr4*_6?!5!xbZ&0$34_6K!eX%;7Xwv+YjM|PGM%7=5KQa!Q-X)O
z>c!G`_mYRE0u)mByEFS->k9x!e@Uox)jn_ci+Ce2{G>waw(((c+QX9N8ijY7lv9iW
zfY5gi0RY;zZIhpxh+VWrt<i|~zc4u9dH$ihpVb;on!s2r0KC=l?Mmx=<hb!rC=|yC
zAx9oJp={9W-@Se7*22L9KjP1yJ?A%g=*O5jeFlO@1pxqBwQl`3&+|l#2ZA8LZnwKR
z91cxsd?18Cp-?Pevo0xz0zlMue=_y`i!b|W>witD#8H+rK3Tz^LaIIX-m9}}jo<7}
z0N|~1O!$_SruY5{9Rfof5#3Kja#Z>SB^+28kF{h>fJ~ygrIdN}4)1bQ^uVx@!$%M=
z50BPLr82!jGXQcqlPi^j6P7MXuk60ZElI%Qgm@#RbQu8K<JLzAfy3dT2?+@gCXA2h
z)x29btX#7ii=tx?6g>KpkFReKfN~$eK`Dhoq4<2wx}=z*%=_@RpRp<1t0D5e6P>ln
zfH(ZBG(OJ@b}%MDV0`{zAI1I!!2wTojXP?&SI<@rKJM~Lt&jNl!FkRj?GEuNBV|Px
zvg=F)+~vMGAGTf7OC|RVQpr4u+9PT{7!OLNa98>*^>(ZK#-#42e^{`$x#+V=>({YG
z3Gr5?QrS$a)n4a$9w@_dUY_USuGJbmJ-u45T($CWr?)zZWp>4MYq?W08@Fu!LMD@)
zt3>mPw6wJ3yJyb^5JE61YBEB{gkbr~6>Hrznl3V#3@qP0V2=_kj^p6w<`%Yo)5Z?~
z;D;Yhm9!n79v_N9ujgBvQ@?NaIR9tzhXP|GjFyaMJaZ70tjf=FiTZ0PRm2B%+M5Od
zd(KWmua+gx4WIVebD00Ztx_8^d7D3C23Bk*{*ps)VO*D^`0na5$+bHv!?TUIR_B=>
z@P&CU#(2miDz3U`^KDuB8$r{1UpB5g+7Bb%+VRkO_w3k(RjXIw$hSu^HY9XVZf@?D
zf@Qz7l)Rwe<?X$pOZTq9D-u`m6C)zf;qAAa&Dg2b)YR655XWB;0h4rivqR&c;NWZJ
z?fc!kcWOt3kN@*gQ#j?(wi=D*yQB^4-z+Q(4-Lc8<@po%6C)?APQ7<8h~-PKGam$=
z=b4|M-)&EC@0PP>&&pi2VkLq@#+2?now>dZuhtv*#7=7@9qo&ePCr-j>9JuNtKE#@
zZzuDFkfMY46$1gwwzAh95k3y_OPA!E;HlHP>GisgGcz(NB}4{77{_sjs#U8V`Ecl<
zZA}{nmO9HYdBQ{zvpBX?X^&p808vw?mbqPD9z2My-MV31*w|09v$LC)!(1_k!y%Q+
z<&7;COC#qL2_Xcdf`UBSztN#6O|*9PT8tX~*FMotrcdi`GFduiXJz?XtyWgAUOkIm
zuir6r#E6qkn>NuEfDo~9|8pCg%113;d{IogiL=u>tsKCp3<?je_<H<=#c^K2qk?vQ
z*snhu(Eo#?{}221XOkvOsPIzR_{DMM4)>nXzl0VqibYmtCT`rgQJv$sJI(^4P$-sf
z*u1GycahL%Z2$L@Mx(*PMKP#Rv!=i3u4O_iUBNs9)>B4j&zvpyJEO-0<M7uhuViLs
z9&(v*=LPsx^{e#5!X(dz>gl4Eujc=%OvvcqOAd#lN?9U5K@hw)tY5FDl)5YjB9tH?
zpxVA?z<Q>!(DK!maQE<-b@R_Z%Y4e6*p_+57*s0N-O#YmtMlf}#q>{RR9ZWqIqy#~
zjTk!YkkM%DT+y}q9LGVaRKB!!{kjX4-L_{w)>BIFzt<gvkf9Y#mQqTgR;y>NS(kM2
zztO&Dz<Nq)?}7cO->_kpL@Iscaf-!%Wvt-5hYXEI6S+ER?QB8_D_jj)ne@yQKIQbu
z^cnSU-@5f5##pI8(;<_|V7J?E%jEKN9$M{owOW00=A7AS0I)o98AAUH2ci5wMFiC%
TAh=5?00000NkvXXu0mjf5-{IL

diff --git a/modules/reports/img/print.png b/modules/reports/img/print.png
deleted file mode 100644
index 335f48293aa0cdf080ff05f7ed6bfe1c717f64a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 559
zcmV+~0?_@5P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;0hTGE*aZL=^g+80lY~>
zK~z}7?bp3))leA6@lR{ScJsAl5C;cKmx5bGs7nz_aS)_Sz)@Ex15Pdu>EPyD_iW-U
z{sp&-qJtI3>Jad46UAy=a^d#k&CSgTxZK|o&P$$r&+|OzoF_ACl;$xU!7D78OuIOb
zpIK6joHR4eN}9*V@kKkG$dck~-Gtc&My_bDvF|nkSPTGI>;hmT0AQmvK$^$>{8$bE
zSRS%9SrVpsd;?E}>1LJ`+igQ|RJdwwL}?yJ|M1FwmJ}t{IsjP1RuzT_<pBUZ9Pmbo
zdECcKT<QRzZ(|8}@cqDQ(>(4I6_vZ@a0@v;RP7M`zyenAVpI-%#Oi=IcCcA_C{z)y
z53jsQ5|$kT{K4;0gAn66j#ce*c#1bo?u#)h@gD1S01?g(^gqU3eC`O~Vr6e6z_8|V
zPq&ID0nkzW$7<Gp))Zh0Fa>C`*M9|^h9wS%0DQu29BTRT5*bdl1?U$OCx<JUhT(mO
z9^SSA*vpb)H_hX30kvT-ONt9=9`E7Iq)GT7&EwO7h3QK5d{pOw%Om=GxE7k_X&!H4
x8?UiH>3_j9Tn%N&l47gvIWX73R$r|f{0oZUTY`$;RWASl002ovPDHLkV1nPt@3H^@

diff --git a/modules/reports/img/save.png b/modules/reports/img/save.png
deleted file mode 100644
index ef5ba59cb7e7fb1b4b9a6c27188a813b2305133e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 597
zcmV-b0;>IqP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-v$y5B^<8CaTNdn0pdwS
zK~z}7?bc6-O<@?v@y{HLJ3?cjv17p$iG{6{uw&`(#>QA#+4z?~SxK2v7P7K2nTAqI
z7E=~jDUA&atC7M&Mw4-Ixi$}-j?+1J?!9Mh=2vf>-sk=Eec$Ii@AJSdG;`WV95#F1
zNv*LNhwufXSe_l6#DJ<*$3EQ1LL}x^`?C;p4e$@d!U{I%X%PaBmH{-|0C<mgsNrh~
zM6(DW!BX@^YxVTUaV+3_v8%w<2Z{jta1dKMa8(0?MF;3<^P0P+#DCU2z&yZg!|OH1
zV&1Qu!!)oL>#72HhBFvIe+nYO6h2^0l>p14ox@gqi~hxUf|Fry+XX*xACIsoXY32C
z#71n&*r&pF4UfYe*|oQ0Pj>Be6*PmP66g&W&#9os!&aoB*yHcKB<E?ab&w&;p7mNb
zUAGg4^_&P0ef28Ba0Pb61`Vu^D9CC6yD^CcSb~R9+;#-ez<QjB#d;$Ivl_(d_}Th#
z9S^#31Jk&RZP;1j-&Lvi;x;~Y>nVPT3wYJS*vYtw=iSZ)PjR;7R5LggAz4W>x`*=x
z;dU|HRarLtiJQ2RW4jtZ-uJ50@pNo9n(7<FFg{nEj{oQ_E@5qi<z>8?i+Uif2^>j%
jw_Op9bO<rg!TgcmM4NEQ)0bU*00000NkvXXu0mjfw*wAe

diff --git a/modules/reports/img/settings.png b/modules/reports/img/settings.png
deleted file mode 100644
index 3a8b3b3a099490d608af786aed9004cf74facca9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 796
zcmV+%1LOROP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-wPNDD*?eF0ulfK0;x$v
zK~z}7wb$K?RaF=U@ZWseFeZajqR}KlQ=k`?eUNm~U!aYQXb@%4#b6M4<DCi`qDjz=
zNYGU<GI&vucM&DR+)N)(3RZ$hDD*WW%qY~T&GF_vvDoZ=_BwN>2Ns8O&U)7KuC?Fy
zdDmuT(S>2`$G5nP25w>!TU(I_G0=f{KX!*$qh$Px-!NK6egda)5?f*??VtzmR0!X}
zFF1_VW#lLEbwap?eOTK@0Iyew|BMsZ*or(Ala~tQ&+ur5_!?X<aR0>ncseKgPb;Et
z;5d3~_!CL8rKk8(?(uCdS)e(l<N3D2Cy`)9?uWTa-Ho?foWip;{7V(QTNtn5{<rop
z&Q~lnAC*ysA6f)|z9Ip);!7;1KaNJ?&Ea0jZk}oL5j4ks^hIfJ!ns1Ol;SnqC@eIG
z7fR+%mIPen?M$jI9aF8I&#NUtT*XNI--lyiG>v79S?sDy(A`N8i#Qc-){l2P5O0L@
z_T*H_7%t;beD4kMe>xEV2<zJM`sX8wx;qsAK8$N9ZJ+Jn7!Jhqufjq&=wLLtCH#sR
z{DdpZZMVm3%B|V?#$#gxvD2Xr+dOzL^N7d%4>*}Az9Z(3;2<7b3Govd!grFLufrGd
z`&V(-SQdIC;g)K|7ZNjh7-tH1i|O1uL5c@5O=dRSQY6~hf_U@uJG|VE_|c3y|0DVZ
zJcN%c<}D>nXGfiQU#7|Y72;h<(*2#0E5GB-I+IzfS!6yr_7uA^D`hS!WLYM&Skt}s
zW(IK^AEd+=SIA^~Tf7^T<<Ryf@u@aUrVgucBxAiFu_0|pZ&XaYi&xq#;|HVNR*7H6
zBW1+53fY`<tF6L%d|o1cu}Zvo5);unuVGJzHa?0AiTF&;n^q6DWxNaI;yHX17m>%y
aCfo=8j=oJN=_zOc0000<MNUMnLSTYR^KE_r

diff --git a/modules/reports/js/print.js b/modules/reports/js/print.js
deleted file mode 100644
index 4ae6ede..0000000
--- a/modules/reports/js/print.js
+++ /dev/null
@@ -1,64 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg )
-document.onreadystatechange = function () {
-  if (document.readyState == "complete") {
-    try {
-      initdata();
-    }catch(e){
-      //dump("Print.js No initdata function!\n");
-    }
-  }
-}
-
-function encodeparam(string,type){
-    if (type == "text") {
-        if (string == "") {
-            string = 'null';
-        }else {
-            string = string.replace('<','&lt;','g');
-            string = string.replace('>','&gt;','g');
-            string = string.replace('&','&amp;','g');
-            string = string.replace('"','&quot','g');
-            string = string.replace("'","''",'g');
-            string = "'"+ string+"'";
-        }
-    }else if(type == "date"){
-      var re = /^(\d{1,2})\.(\d{1,2})\.(\d{4})$/i;
-        if (!string.match(re)) {
-            string = 'null';
-        }else{
-           var dspl=string.split('.');
-            string = "'"+dspl[2]+'-'+dspl[1]+'-'+dspl[0]+"'";
-        }
-    }else if(type == "number"){
-        if (string == "") {
-            string = 'null';
-        }else {
-            string.replace(',','.');
-            string = parseFloat(string);
-        }
-    }else if(type == "boolean"){
-        if (string == "") {
-          string = 'null';
-        }
-        string= string.replace('true',"'1'");
-        string= string.replace('false',"'0'");
-    }else if(type == "month"){
-      var re = /^(\d{1,2})\.(\d{4})$/i;
-        if (!string.match(re)) {
-            string = 'null';
-        }else{
-           var dspl=string.split('.');
-            string = "'"+dspl[1]+'-'+dspl[0]+"-01'"
-        }
-    }
-    else {
-        string = string.replace('<','&lt;','g');
-        string = string.replace('>','&gt;','g');
-        string = string.replace('&','&amp;','g');
-        string = string.replace('"','&quot','g');
-        string = string.replace("'","''",'g');
-        string = "'"+ string+"'";
-    }
-    
-    return string;
-}
\ No newline at end of file
diff --git a/modules/reports/js/print_book.js b/modules/reports/js/print_book.js
deleted file mode 100644
index 7f3632d..0000000
--- a/modules/reports/js/print_book.js
+++ /dev/null
@@ -1,41 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg )
-var pconfig = {};
-
-function initdata(){
-    var configdata = apppref.getpreference("pageconfig.logactivity");
-  if (configdata != '') {
-    pconfig = JSON.parse(configdata);
-  }
-  //"Book Ident Data:" + JSON.stringify(pconfig) + "\n");
-  var windowMediator = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-                     .getService(Components.interfaces.nsIWindowMediator);
-      var winmain = windowMediator.getMostRecentWindow("xulcreorga");
-      var maindoc = winmain.document.getElementById("brw_application").contentDocument;
-
-      //var xdate = new Date();
-      //$("#printdatetime").html(xdate.toLocaleFormat("%d.%m.%Y %H:%M:%S"));
- 
-      $("#title_sub").html(winmain.document.getElementById("infoheader").value);
-
-      $("#title_main").html(maindoc.title);
-      //$("#tbl_list").css("margin-top","100px");
-      var crn = appdb.dbquery("select crechename,adress,city,country,zip from creche;");
-      crn = crn.sqldata[0];
-      $("#creche_name").html(crn.crechename);
-      $("#creche_address").html(crn.adress);
-      $("#creche_zip").html(crn.zip);
-      $("#creche_city").html(crn.city);
-      loadactivitydata();
-}
-
-function loadactivitydata(){
-  var actdatasql = "SELECT strftime('%d.%m.%Y',logdatefrom) || ' - ' || strftime('%d.%m.%Y',logdateto) as daterange, logtitle, logmessage FROM activitylog where uuid='"+ pconfig.activityuuid+"';";
-  //dump(actdatasql + "\n");
-  var data = appdb.dbquery(actdatasql);
-  $("#bookdata").append('<h2>'+ data.sqldata[0].logtitle+'</h2>');
-  $("#bookdata").append('<h4>'+ data.sqldata[0].daterange+'</h4>');
-  $("#bookdata").append('<div>'+ data.sqldata[0].logmessage+'</div>');
-}
-
-
-
diff --git a/modules/reports/js/print_calendar.js b/modules/reports/js/print_calendar.js
deleted file mode 100644
index 7e6e2f8..0000000
--- a/modules/reports/js/print_calendar.js
+++ /dev/null
@@ -1,35 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg )
-function initdata(){
-  var windowMediator = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-                     .getService(Components.interfaces.nsIWindowMediator);
-      var winmain = windowMediator.getMostRecentWindow("xulcreorga");
-
-      var maindoc = winmain.document.getElementById("brw_application").contentDocument;
-      
-      var xdate = new Date();
-      $("#printdatetime").html(xdate.toLocaleFormat("%d.%m.%Y %H:%M:%S"));
-      $("#title_sub").html(winmain.document.getElementById("infoheader").value);
-      $("#title_main").html(maindoc.title);
-      //$("#cal_month").css("margin-top","100px");
-      var crn = appdb.dbquery("select crechename,adress,city,country,zip from creche;");
-      crn = crn.sqldata[0];
-      $("#creche_name").html(crn.crechename);
-      $("#creche_address").html(crn.adress);
-      $("#creche_zip").html(crn.zip);
-      $("#creche_city").html(crn.city);
-      
-      var elx = maindoc.querySelectorAll('table[id^="cal_"]');
-      
-      for (var i in elx) {
-        //dump(elx[i].id + "\n");
-        if (elx[i].id) {
-          var elementdata = maindoc.getElementById(elx[i].id).innerHTML;
-          
-          //elementdata = elementdata.replace(/height:\ 0px;/g,'');
-          //elementdata = elementdata.replace(/height:0;/g,'');
-          $("#cal_month").append(elementdata);
-          //$("#tbl_list th:first-child").remove();
-          //$("#tbl_list td:first-child").remove();
-        }
-      }
-}
\ No newline at end of file
diff --git a/modules/reports/js/print_child.js b/modules/reports/js/print_child.js
deleted file mode 100644
index d704637..0000000
--- a/modules/reports/js/print_child.js
+++ /dev/null
@@ -1,155 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg )
-var pconfig = {};
-function initdata(){
-    var configdata = apppref.getpreference("pageconfig.child");
-  if (configdata != '') {
-    pconfig = JSON.parse(configdata);
-  }
-  var windowMediator = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-                     .getService(Components.interfaces.nsIWindowMediator);
-      var winmain = windowMediator.getMostRecentWindow("xulcreorga");
-      var maindoc = winmain.document.getElementById("brw_application").contentDocument;
-
-      //var xdate = new Date();
-      //$("#printdatetime").html(xdate.toLocaleFormat("%d.%m.%Y %H:%M:%S"));
- 
-      $("#title_sub").html(winmain.document.getElementById("infoheader").value);
-
-      $("#title_main").html(maindoc.title);
-      //$("#tbl_list").css("margin-top","100px");
-      var crn = appdb.dbquery("select crechename,adress,city,country,zip from creche;");
-      crn = crn.sqldata[0];
-      $("#creche_name").html(crn.crechename);
-      $("#creche_address").html(crn.adress);
-      $("#creche_zip").html(crn.zip);
-      $("#creche_city").html(crn.city);
-
-  var cdatasql = "select child.uuid,child.clientnumber,child.prename,child.surname,strftime('%d.%m.%Y',child.birthday) as birthday,child.address,child.city,child.zip,child.country,strftime('%d.%m.%Y',child.entrydate) as entrydate,child.checkservicenumber,strftime('%d.%m.%Y',child.checkserviceexpiration) as checkserviceexpiration,strftime('%d.%m.%Y',child.leavedate) as leavedate,child.nationality,child.nativelanguage,child.bankaccount,child.bankbic,child.cautionamount,child.cautionpayed,child.cautionremark,child.cautionpayedback,child.cautionstatusdate,child.remark,child.uuid,health.docname, health.docphone,health.docaddress,health.doczip, health.doccity,health.doccountry,health.healthinfo,health.uuid as docuuid from childs child join health health on (child.uuid=health.childuuid)  where child.uuid='" + pconfig.uuid + "';";
-  var cdata = appdb.dbquery(cdatasql);
-  $('#financedata').hide();
-  if (cdata) {
-    cdata = cdata.sqldata[0];
-   var hx = true;
-  for (var ci in cdata) {
-    if (document.getElementById("childs_" + ci)) {
-      $("#childs_" + ci).html(cdata[ci]);
-    }
-    if (document.getElementById("health_" + ci)) {
-      if (cdata[ci] != '') {
-        hx = false;
-        $("#health_" + ci).html(cdata[ci]);
-      }else {
-        $("#health_" + ci).hide();
-      }
-      
-    }
-
-  }
-  if (hx) {
-    $('#healthdata').hide();
-  }
-  }
-  
-   load_table_presence();
-    load_table_parents();
-    load_table_refpersons();
-  var cdatea = new Date();
-  //$("#printdatetime").html(cdatea.toLocaleFormat("%d.%m.%Y %H:%M:%S"));
-  //$("#accmonth").html(myfilter.description);
-  var crn = appdb.dbquery("select crechename,adress,city,country,zip from creche;");
-  crn = crn.sqldata[0];
-  $("#creche_name").html(crn.crechename);
-  $("#creche_address").html(crn.adress);
-  $("#creche_zip").html(crn.zip);
-  $("#creche_city").html(crn.city);
-}
-
-function load_table_presence(){
-    var plandatasql = "SELECT grp.grpname, strftime('%d.%m.%Y',plan.datebegin) || ' - ' || strftime('%d.%m.%Y',plan.dateend) AS planningdaterange, plan.montimebegin || ' - ' || plan.montimeend || CASE WHEN plan.monlunch='1' THEN ' (<span class=\"glyphicon glyphicon-cutlery\" aria-hidden=\"true\"></span>)' ELSE '' END || case when plan.montimebegin2 is not null and plan.montimeend2 is not null then '<br/>' || plan.montimebegin2 || ' - ' || plan.montimeend2 else '' end AS monplanningtime, plan.tuetimebegin || ' - ' || plan.tuetimeend || CASE WHEN plan.tuelunch='1' THEN ' (<span class=\"glyphicon glyphicon-cutlery\" aria-hidden=\"true\"></span>)' ELSE '' END || case when plan.tuetimebegin2 is not null and plan.tuetimeend2 is not null then '<br/>' || plan.tuetimebegin2 || ' - ' || plan.tuetimeend2 else '' end AS tueplanningtime, plan.wedtimebegin || ' - ' || plan.wedtimeend || CASE WHEN plan.wedlunch='1' THEN ' (<span class=\"glyphicon glyphicon-cutlery\" aria-hidden=\"true\"></span>)' ELSE '' END || case when plan.wedtimebegin2 is not null and plan.wedtimeend2 is not null then '<br/>' || plan.wedtimebegin2 || ' - ' || plan.wedtimeend2 else '' end AS wedplanningtime, plan.thutimebegin || ' - ' || plan.thutimeend || CASE WHEN plan.thulunch='1' THEN ' (<span class=\"glyphicon glyphicon-cutlery\" aria-hidden=\"true\"></span>)' ELSE '' END || case when plan.thutimebegin2 is not null and plan.thutimeend2 is not null then '<br/>' || plan.thutimebegin2 || ' - ' || plan.thutimeend2 else '' end AS thuplanningtime, plan.fritimebegin || ' - ' || plan.fritimeend || CASE WHEN plan.frilunch='1' THEN ' (<span class=\"glyphicon glyphicon-cutlery\" aria-hidden=\"true\"></span>)' ELSE '' END || case when plan.fritimebegin2 is not null and plan.fritimeend2 is not null then '<br/>' || plan.fritimebegin2 || ' - ' || plan.fritimeend2 else '' end AS friplanningtime FROM planning plan LEFT JOIN groups grp ON ( plan.groupuuid=grp.uuid) WHERE plan.childuuid='" + pconfig.uuid + "' ORDER BY plan.datebegin, plan.dateend;";
-  var plandata = appdb.dbqueryarray(plandatasql);
-  if (plandata) {
-    var headerdata = getlabels(plandata.sqlhead.join(","));
-  $("#tbl_planning").html("");
-  var tblplan = $("#tbl_planning").dataTable({
-    "language": {
-          "url": "L../../web/js/locale/datatable_fr.json"
-        },
-    "data": plandata.sqldata,
-    "columns": headerdata,
-    "paging": false,
-    "ordering": false,
-    "info": false,
-    "filter": false,
-    "destroy": true
-  });
-  }else {
-    $('#planningdata').hide();
-  }
-}
-
-function load_table_parents() {
-  var labelx = getlabelswithkey('mother,father');
-  var areftypes = new Array(); 
-  for (var l in labelx){
-    areftypes.push("select '"+ labelx[l].title +"' as refname, '"+labelx[l].keyname+"' as reftype");
-  }
-  var lblsql = areftypes.join(" UNION "); 
-  var parentssql = "SELECT rx.refname as reftype, coalesce(rp.surname,'') || ' ' || coalesce(rp.prename,'') as nameprename, coalesce(rp.address,'') || '<br/>' || coalesce(rp.zip,'') || ' ' || coalesce(rp.city,'') || '<br/>' || coalesce(rp.country,'') as address, case when rp.phone is not null then '<span class=\"glyphicon glyphicon-earphone\" aria-hidden=\"true\"></span>: ' || rp.phone || '<br/>' else '' end || case when rp.mobile is not null then'<span class=\"glyphicon glyphicon-phone\" aria-hidden=\"true\"></span>: ' || rp.mobile || '<br/>' else '' end || case when rp.workphone is not null then '<span class=\"glyphicon glyphicon-phone-alt\" aria-hidden=\"true\"></span>: ' || rp.workphone || '<br/>' else '' end || case when rp.email is not null then '<span class=\"glyphicon glyphicon-envelope\" aria-hidden=\"true\"></span>: ' || email else '' end as phonemail, rp.job, rp.authsubscriber FROM refpersons rp join ("+lblsql+") rx on (rp.reftype=rx.reftype)  where rp.childuuid='" + pconfig.uuid + "' and rp.reftype in ('mother','father');";
-  
-  var parentsdata = appdb.dbqueryarray(parentssql);
-  if (parentsdata) {
-    var headerdata = getlabels(parentsdata.sqlhead.join(","));
-  $("#tbl_parents").html("");
-  $("#tbl_parents").dataTable({
-"language": {
-          "url": "../../web/js/locale/datatable_fr.json"
-        },
-    "data": parentsdata.sqldata,
-    "columns": headerdata,
-    "paging": false,
-    "ordering": false,
-    "info": false,
-    "filter": false,
-    "destroy": true
-  });
-  }else {
-    $('#parentdata').hide();
-  }
-  
-  
-  
-}
-
-function load_table_refpersons() {
-   var labelx = getlabelswithkey('tuteur,famillymember,famillyfriend');
-  var areftypes = new Array(); 
-  for (var l in labelx){
-    areftypes.push("select '"+ labelx[l].title +"' as refname, '"+labelx[l].keyname+"' as reftype");
-  }
-  var lblsql = areftypes.join(" UNION "); 
-   var refpersonsql = "SELECT rx.refname as reftype, coalesce(rp.surname,'') || ' ' || coalesce(rp.prename,'') as nameprename, coalesce(rp.address,'') || '<br/>' || coalesce(rp.zip,'') || ' ' || coalesce(rp.city,'') || '<br/>' || coalesce(rp.country,'') as address, case when rp.phone is not null then '<span class=\"glyphicon glyphicon-earphone\" aria-hidden=\"true\"></span>: ' || rp.phone || '<br/>' else '' end || case when rp.mobile is not null then'<span class=\"glyphicon glyphicon-phone\" aria-hidden=\"true\"></span>: ' || rp.mobile || '<br/>' else '' end || case when rp.workphone is not null then '<span class=\"glyphicon glyphicon-phone-alt\" aria-hidden=\"true\"></span>: ' || rp.workphone || '<br/>' else '' end || case when rp.email is not null then '<span class=\"glyphicon glyphicon-envelope\" aria-hidden=\"true\"></span>: ' || email else '' end as phonemail, rp.job, rp.authsubscriber FROM refpersons rp join ("+lblsql+") rx on (rp.reftype=rx.reftype)  where rp.childuuid='" + pconfig.uuid + "' and rp.reftype not in ('mother','father');";
-
-  var refpersonsdata = appdb.dbqueryarray(refpersonsql);
-  if (refpersonsdata) {
-    var headerdata = getlabels(refpersonsdata.sqlhead.join(","));
-  $("#tbl_refpersons").html("");
-  $("#tbl_refpersons").dataTable({
-    "language": {
-          "url": "../../web/js/locale/datatable_fr.json"
-        },
-    "data": refpersonsdata.sqldata,
-    "columns": headerdata,
-    "paging": false,
-    "ordering": false,
-    "info": false,
-    "filter": false,
-    "destroy": true
-  });
-  }else {
-    $('#refpersondata').hide();
-  }
-  
-  
-  
-}
-
diff --git a/modules/reports/js/print_loaddata.js b/modules/reports/js/print_loaddata.js
deleted file mode 100644
index 48c9de8..0000000
--- a/modules/reports/js/print_loaddata.js
+++ /dev/null
@@ -1,67 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg )
-function initdata(){
-      var windowMediator = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-                     .getService(Components.interfaces.nsIWindowMediator);
-      var winmain = windowMediator.getMostRecentWindow("xulcreorga");
-      var maindoc = winmain.document.getElementById("brw_application").contentDocument;
-
-      $("#title_sub").html(winmain.document.getElementById("infoheader").value);
-
-      $("#title_main").html(maindoc.title);
-      var crn = appdb.dbquery("select crechename,adress,city,country,zip from creche;");
-      crn = crn.sqldata[0];
-      $("#creche_name").html(crn.crechename);
-      $("#creche_address").html(crn.adress);
-      $("#creche_zip").html(crn.zip);
-      $("#creche_city").html(crn.city);
-      
-      var elx = maindoc.querySelectorAll('div[id^="tbl"]');
-      //var elx = maindoc.querySelectorAll('tfoot');
-      
-      var tcols = 1;
-      var strlp = apppref.getpreference("pageconfig.lastpage");
-      var lp = JSON.parse(strlp);
-      var strcp = apppref.getpreference("pageconfig." + lp.view);
-      var cp = JSON.parse(strcp);
-      var ctab = "";
-      //"print_loaddata.js \n");
-      if (cp.activetab) {
-        ctab = cp.activetab; 
-      }
-      for (var i in elx) {
-        //dump(elx[i].id)
-        if ((elx[i].id ) && (elx[i].id.indexOf(ctab+"_wrapper") != -1)) {
-   
-          var elementdata = maindoc.getElementById(elx[i].id).innerHTML;
-          
-          elementdata = elementdata.replace(/height:\ 0px;/g,'');
-          elementdata = elementdata.replace(/height:0;/g,'');
-          elementdata = elementdata.replace(/colspan="1" rowspan="1"/g,'');
-          elementdata = elementdata.replace(/style="width:\s\d+px;"/g,'');
-
-          var thead = elementdata.substring(elementdata.indexOf('<thead>'),elementdata.indexOf('</thead>')).replace('<thead>','');
-          var tbody = elementdata.substring(elementdata.indexOf('<tbody>'),elementdata.indexOf('</tbody>')).replace('<tbody>','');
-          var tfoot = elementdata.substring(elementdata.lastIndexOf('<tfoot>'),elementdata.lastIndexOf('</tfoot>')).replace('<tfoot>','');
-
-          tcols = thead.split('</th>');
-
-          
-          
-          $("#tbl_list > thead").append(thead);
-          $("#tbl_list > tbody").append(tbody);
-          $("#tbl_list > tfoot").append(tfoot);
-           
-        }
-      }
-      //$("#tbl_list").removeClass("dataTable");
-      // $("#tbl_list").dataTable({
-      //  "language": {
-      //    "url": "../../../web/js/locale/datatable_fr.json"
-      //  },
-      //  "paging":   false,
-      //  "ordering": false,
-      //  "info":     false,
-      //  "filter": false,
-      //  "destroy": true
-      //});
-}
\ No newline at end of file
diff --git a/modules/reports/js/print_logchild.js b/modules/reports/js/print_logchild.js
deleted file mode 100644
index 9fd5b9a..0000000
--- a/modules/reports/js/print_logchild.js
+++ /dev/null
@@ -1,45 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg )
-var pconfig = {};
-var initdate = new Date();
-
-function initdata(){
-    
-    var configdata = apppref.getpreference("pageconfig.logchild");
-  if (configdata != '') {
-    pconfig = JSON.parse(configdata);
-  }
-  var windowMediator = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-                     .getService(Components.interfaces.nsIWindowMediator);
-      var winmain = windowMediator.getMostRecentWindow("xulcreorga");
-      var maindoc = winmain.document.getElementById("brw_application").contentDocument;
-      initdate = new Date(encodeparam(pconfig.logdate, 'date').replace(/'/g, ''));
-      //var xdate = new Date();
-      //$("#printdatetime").html(xdate.toLocaleFormat("%d.%m.%Y %H:%M:%S"));
-     
-      $("#title_sub").html(pconfig.logdate);
-
-      $("#title_main").html(maindoc.title);
-      //$("#tbl_list").css("margin-top","100px");
-      var crn = appdb.dbquery("select crechename,adress,city,country,zip from creche;");
-      crn = crn.sqldata[0];
-      $("#creche_name").html(crn.crechename);
-      $("#creche_address").html(crn.adress);
-      $("#creche_zip").html(crn.zip);
-      $("#creche_city").html(crn.city);
-      
-      load_table_logchilds();
-}
-
-function load_table_logchilds(){
-    var logsql = "select  ch.prename || ' ' || ch.surname AS childname, ch.checkservicenumber,lc.logmessage from childs ch left join planning pl on (ch.uuid=pl.childuuid) left join childslog lc on (lc.childuuid=ch.uuid) where date('"+ initdate.toLocaleFormat('%Y-%m-%d')+"') between pl.datebegin and pl.dateend and lc.logmessage is not null and lc.logmessage != '' order by childname;";
-    
-    var logdata = appdb.dbquery(logsql);
-    
-    for (var i in logdata.sqldata){
-        var row = logdata.sqldata[i];
-        //"initdata print_logchild! " + JSON.stringify(row)+"\n");
-        var divd = '<div class="row panel panel-default"><div class="panel-heading"><strong>'+ row.childname + '</strong> ('+ row.checkservicenumber + ')'+'</div>';
-        divd += '<div class="panel-body">'+ row.logmessage+'</div></div>';
-        $("#div_data").append(divd);
-    }
-}
\ No newline at end of file
diff --git a/modules/reports/js/print_multilist.js b/modules/reports/js/print_multilist.js
deleted file mode 100644
index 605dc5a..0000000
--- a/modules/reports/js/print_multilist.js
+++ /dev/null
@@ -1,75 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg )
-function initdata(){
-      var windowMediator = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-                     .getService(Components.interfaces.nsIWindowMediator);
-      var winmain = windowMediator.getMostRecentWindow("xulcreorga");
-      var maindoc = winmain.document.getElementById("brw_application").contentDocument;
-
-      $("#title_sub").html(winmain.document.getElementById("infoheader").value);
-
-      $("#title_main").html(maindoc.title);
-      var crn = appdb.dbquery("select crechename,adress,city,country,zip from creche;");
-      crn = crn.sqldata[0];
-      $("#creche_name").html(crn.crechename);
-      $("#creche_address").html(crn.adress);
-      $("#creche_zip").html(crn.zip);
-      $("#creche_city").html(crn.city);
-      
-      var elx = maindoc.querySelectorAll('div[id^="tbl"]');
-      //var elx = maindoc.querySelectorAll('tfoot');
-      //"print_multilist.js \n");
-      var tcols = 1;
-      var strlp = apppref.getpreference("pageconfig.lastpage");
-      var lp = JSON.parse(strlp);
-      var strcp = apppref.getpreference("pageconfig." + lp.view);
-      var cp = JSON.parse(strcp);
-      var ctab = "";
-      //dump(JSON.stringify(cp) + "\n");
-      var getpagedesign=$("#allpages").html();
-      //dump(getpagedesign + "\n===============\n");
-      var cnt = 1;
-      $("#allpages").html("");
-      for (var i in elx) {
-      //  //dump(elx[i].id)
-        if ((elx[i].id ) && (elx[i].id.indexOf(ctab+"_wrapper") != -1)) {
-          var npage = getpagedesign.replace(/_xxnum/g,cnt);
-          
-          var elementdata = maindoc.getElementById(elx[i].id).innerHTML;
-          //
-          elementdata = elementdata.replace(/height:\ 0px;/g,'');
-          elementdata = elementdata.replace(/height:0;/g,'');
-          elementdata = elementdata.replace(/colspan="1" rowspan="1"/g,'');
-          elementdata = elementdata.replace(/style="width:\s\d+px;"/g,'');
-          //
-          var thead = elementdata.substring(elementdata.indexOf('<thead>'),elementdata.indexOf('</thead>')).replace('<thead>','');
-          var tbody = elementdata.substring(elementdata.indexOf('<tbody>'),elementdata.indexOf('</tbody>')).replace('<tbody>','');
-          var tfoot = elementdata.substring(elementdata.lastIndexOf('<tfoot>'),elementdata.lastIndexOf('</tfoot>')).replace('<tfoot>','');
-          //
-          //tcols = thead.split('</th>');
-          //dump(tbody + "\n========\n");
-          //
-          //
-          if (tbody.indexOf("dataTables_empty") == -1) {
-            $("#allpages").append(npage);
-            $("#tbl_list"+cnt+" > thead").append(thead);
-            $("#tbl_list"+cnt+" > tbody").append(tbody);
-            $("#tbl_list"+cnt+" > tfoot").append(tfoot);
-            
-            $("#tbl_list" + cnt).dataTable({
-              "language": {
-                "url": "../../../web/js/locale/datatable_fr.json"
-              },
-              "paging":   false,
-              "ordering": false,
-              "info":     false,
-              "filter": false,
-              "destroy": true
-            });
-            cnt++;
-          }
-          
-        }
-      }
-      $('[id$="lunch"]').removeClass('btn-success');
-      $('[id$="lunch"]').addClass('btn-default');
-}
\ No newline at end of file
diff --git a/modules/reports/js/print_table.js b/modules/reports/js/print_table.js
deleted file mode 100644
index 525aeb5..0000000
--- a/modules/reports/js/print_table.js
+++ /dev/null
@@ -1,92 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg )
-function initdata(){
-      var windowMediator = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-                     .getService(Components.interfaces.nsIWindowMediator);
-      var winmain = windowMediator.getMostRecentWindow("xulcreorga");
-      var maindoc = winmain.document.getElementById("brw_application").contentDocument;
-
-      $("#title_sub").html(winmain.document.getElementById("infoheader").value);
-
-      $("#title_main").html(maindoc.title);
-      var crn = appdb.dbquery("select crechename,adress,city,country,zip from creche;");
-      crn = crn.sqldata[0];
-      $("#creche_name").html(crn.crechename);
-      $("#creche_address").html(crn.adress);
-      $("#creche_zip").html(crn.zip);
-      $("#creche_city").html(crn.city);
-      
-      var elx = maindoc.querySelectorAll('table[id="tbl_timetable"]');
-      //var elx = maindoc.querySelectorAll('tfoot');
-      
-      var tcols = 1;
-      var strlp = apppref.getpreference("pageconfig.lastpage");
-      var lp = JSON.parse(strlp);
-      var strcp = apppref.getpreference("pageconfig." + lp.view);
-      var cp = JSON.parse(strcp);
-      var ctab = "";
-      //dump(JSON.stringify(cp) + "\n");
-      //if (cp.activetab) {
-      //  ctab = cp.activetab; 
-      //}
-      //var elx = maindoc.querySelectorAll('table[id^="cal_"]');
-      for (var i in elx) {
-        if (elx[i].id) {
-          var elementdata = maindoc.getElementById(elx[i].id).innerHTML;
-          //elementdata = elementdata.replace(/height:\ 0px;/g,'');
-          //elementdata = elementdata.replace(/height:0;/g,'');
-          $("#tbl_list").append(elementdata);
-          //$("#tbl_list th:first-child").remove();
-          //$("#tbl_list td:first-child").remove();
-        }
-      }
-      
-      //$('td').each(function(){
-      //  if($(this).attr('colspan') > 1){
-      //    var ccol = $(this).attr('colspan');
-      //    $(this).attr('colspan',ccol -1);
-      //  }
-      //});
-      //$('th').each(function(){
-      //  if($(this).attr('colspan') > 1){
-      //    var ccol = $(this).attr('colspan');
-      //    $(this).attr('colspan',ccol -1);
-      //  }
-      //});
-
-
-      //for (var i in elx) {
-      //  //dump(elx[i].id)
-      //  if ((elx[i].id ) && (elx[i].id.indexOf(ctab+"_wrapper") != -1)) {
-      //
-      //    var elementdata = maindoc.getElementById(elx[i].id).innerHTML;
-      //    
-      //    elementdata = elementdata.replace(/height:\ 0px;/g,'');
-      //    elementdata = elementdata.replace(/height:0;/g,'');
-      //    elementdata = elementdata.replace(/colspan="1" rowspan="1"/g,'');
-      //    elementdata = elementdata.replace(/style="width:\s\d+px;"/g,'');
-      //
-      //    var thead = elementdata.substring(elementdata.indexOf('<thead>'),elementdata.indexOf('</thead>')).replace('<thead>','');
-      //    var tbody = elementdata.substring(elementdata.indexOf('<tbody>'),elementdata.indexOf('</tbody>')).replace('<tbody>','');
-      //    var tfoot = elementdata.substring(elementdata.lastIndexOf('<tfoot>'),elementdata.lastIndexOf('</tfoot>')).replace('<tfoot>','');
-      //
-      //    tcols = thead.split('</th>');
-      //
-      //    
-      //    
-      //    $("#tbl_list > thead").append(thead);
-      //    $("#tbl_list > tbody").append(tbody);
-      //    $("#tbl_list > tfoot").append(tfoot);
-      //     
-      //  }
-      //}
-      // $("#tbl_list").dataTable({
-      //  "language": {
-      //    "url": "../../../web/js/locale/datatable_fr.json"
-      //  },
-      //  "paging":   false,
-      //  "ordering": false,
-      //  "info":     false,
-      //  "filter": false,
-      //  "destroy": true
-      //});
-}
\ No newline at end of file
diff --git a/modules/reports/js/printpdf.js b/modules/reports/js/printpdf.js
deleted file mode 100644
index c178594..0000000
--- a/modules/reports/js/printpdf.js
+++ /dev/null
@@ -1,85 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg )
-var printpdf = {
-  //onLoad: function() {
-  //  // initialization code
-  //  this.initialized = true;
-  //  this.strings     = document.getElementById("printpdf-strings");
-  //  this.prefs       = Components.classes["@mozilla.org/preferences-service;1"]
-  //                            .getService(Components.interfaces.nsIPrefBranch).getBranch("extensions.printpdf@pavlov.");
-  //},
-  onMenuItemCommand: function(fpath,fname,e) {
-    var nsIFilePicker = Components.interfaces.nsIFilePicker;
-    var picker = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
-    picker.init(window, "Save Document as PDF", nsIFilePicker.modeSave);
-    picker.appendFilter("PDF", "*.pdf");
-    picker.defaultExtension = "pdf";
-    picker.defaultString = content.document.title;
-
-    picker.show();
-
-    var webBrowserPrint = window.content.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-    .getInterface(Components.interfaces.nsIWebBrowserPrint);
-
-    var PSSVC = Components.classes["@mozilla.org/gfx/printsettings-service;1"]
-    .getService(Components.interfaces.nsIPrintSettingsService);
-    
-    var printSettings = PSSVC.newPrintSettings;
-    
-    printSettings.printToFile = true;
-    printSettings.toFileName  = picker.file.path;
-    printSettings.printSilent = true;
-    printSettings.outputFormat = Components.interfaces.nsIPrintSettings.kOutputFormatPDF;
-    
-    // Added by bho
-    //var myPrintPrefs  = printpdf.getPrintingPrefs();
-    printSettings.printBGColors = true;
-    printSettings.printBGImages = true;
-    printSettings.unwriteableMarginTop = 0.5;
-    printSettings.unwriteableMarginLeft = 0.5;
-    printSettings.unwriteableMarginBottom = 0.5;
-    printSettings.unwriteableMarginRight = 0.5;
-    printSettings.marginTop = 0.2; /*  these are in inches */
-    printSettings.marginLeft = 0.2;
-    printSettings.marginBottom = 0.2;
-    printSettings.marginRight = 0.2;
-    //printSettings.shrinkToFit;
-    printSettings.paperName = "iso_a4"; /* name of paper */
-    printSettings.paperSizeType = 1; /* use native data or is defined here */
-    //printSettings.paperData = 9;     /* native data value */
-    printSettings.orientation = 1;
-    //"PDF Orientation:" + printSettings.orientation + "\n");
-    if (printSettings.orientation == 1) {
-      printSettings.paperWidth = 297.0; /* width of the paper in inches or mm */
-      printSettings.paperHeight = 210.0; /* height of the paper in inches or mm */
-
-    } else {
-      printSettings.paperWidth = 210.0; /* width of the paper in inches or mm */
-      printSettings.paperHeight = 297.0; /* height of the paper in inches or mm */
-    }
-    printSettings.paperSizeUnit = 1; /* paper is in inches or mm */
-    //lets hide those ugly default headers
-    printSettings.footerStrCenter = '';
-    printSettings.footerStrLeft = '';
-    printSettings.footerStrRight = '';
-    printSettings.headerStrCenter = '';
-    printSettings.headerStrLeft = '';
-    printSettings.headerStrRight = '';
-    //}
-    // END: Added by bho
-
-    webBrowserPrint.print(printSettings, null);
-  }
-  //onToolbarButtonCommand: function(e) {
-  //  // just reuse the function above.  you can change this, obviously!
-  //  printpdf.onMenuItemCommand(e);
-  //},
-  //getPrintingPrefs: function (){
-  //    return {
-  //        showBGColor: this.prefs.getBoolPref("print.showBGColors"),
-  //        showBGImages: this.prefs.getBoolPref("print.showBGImages"),
-  //        showHeaders: this.prefs.getBoolPref("print.showHeaders")
-  //    };
-  //}
-
-};
-//window.addEventListener("load", function(e) { printpdf.onLoad(e); }, false);
diff --git a/modules/reports/js/printutils.js b/modules/reports/js/printutils.js
deleted file mode 100644
index d3ac722..0000000
--- a/modules/reports/js/printutils.js
+++ /dev/null
@@ -1,41 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg )
-var printmanager = {
-  onprint: function() {
-    var sprdata = apppref.getpreference("pageconfig.lastpage");
-    var prdata = JSON.parse(sprdata);
-    var spldata = apppref.getpreference("pageconfig." + prdata.view);
-    var pldata = JSON.parse(spldata);
-    if (!pldata.printlayout) {
-      //dump(prdata.module +" "+prdata.view+": Sorry, no printlayout defined!\n");
-    }else {
-       //dump(JSON.stringify(pldata) + "\n");
-       printmanager.load_printpreview("chrome://creorga/content/modules/reports/print_" +pldata.printlayout + ".html");
-    }
-  },
-  load_pdf: function(data){
-    var params = { in : {
-        "uri": data.uri
-      },
-      out: null
-    };
-    var dlg = window.openDialog("chrome://creorga/content/modules/reports/dlg/dlgpdfviewer.xul", "dlgpdfviewer",
-      "chrome,centerscreen,resizable,scrollbars", params).focus();
-    if (params.out) {
-      //code
-    }
-  },
-  load_printpreview: function(path) {
-    var params = { in : {
-        "uri": path
-    },
-      out: null
-    };
-    var dlg = window.openDialog("chrome://creorga/content/modules/reports/dlg/dlgprint.xul", "dlgprint",
-      "chrome,centerscreen,resizable,scrollbars,modal", params).focus();
-    if (params.out) {
-      if (params.out.reload == true) {
-        printmanager.load_printpreview(params.in.uri,params.in.type);
-      }
-    }
-  },
-}
\ No newline at end of file
diff --git a/modules/reports/print_book.html b/modules/reports/print_book.html
deleted file mode 100644
index 248f817..0000000
--- a/modules/reports/print_book.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-    <title>Creorga - Enfant</title>
-    <meta charset="UTF-8">
-    <meta http-equiv="cache-control" content="max-age=0" />
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="expires" content="0" />
-    <meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-    <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-    <link href="../../web/css/jquery.dataTables.min.css" rel="stylesheet" type="text/css">
-    <link href="../../web/css/jquery.dataTables_themeroller.css" rel="stylesheet" type="text/css">
-    <link href="css/print.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-    <div style="width: 100%;">
-      <table style="width: 100%;" id="pagehead"><tr><td style="width: 200px; text-align: left; ">
-                <img src="img/logoprint.png" />
-                </td>
-      <td style="text-align: center;"><h2 id="title_main"></h2><h3 id="title_sub"></h3></td>
-                <td style="text-align: right;">
-                  <div style="text-align: left;"><span id="creche_name">Creche</span><br/>
-                  <span id="creche_address">address</span><br/>
-                  <span id="creche_zip">CP</span>&nbsp;<span id="creche_city">City</span></div>
-                </td>
-                </tr>
-                </table>
-    </div>
-    <div id="bookdata">
-      
-    </div>
-    <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-    <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-    <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-    <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-    <script src="js/print.js" type="text/javascript"></script>
-    <script src="js/print_book.js" type="text/javascript"></script>
-</body>
-</html>
\ No newline at end of file
diff --git a/modules/reports/print_calendar.html b/modules/reports/print_calendar.html
deleted file mode 100644
index c834e6f..0000000
--- a/modules/reports/print_calendar.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-    <title>Creorga - Printing - List</title>
-    <meta charset="UTF-8">
-    <meta http-equiv="cache-control" content="max-age=0" />
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="expires" content="0" />
-    <meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-    <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-    <link href="../../web/css/jquery.dataTables.min.css" rel="stylesheet" type="text/css">
-    <!--<link href="../../web/css/jquery.dataTables_themeroller.css" rel="stylesheet" type="text/css">-->
-    <link href="css/print.css" rel="stylesheet" type="text/css">
-    <link href="../../web/css/calendar.css" rel="stylesheet" type="text/css">
-    <style>
-      .panel-daybody {
-  height: 10.5vh;
-  max-height: 10.5vh;
-  overflow-y: auto;
-  padding: 3px;
-}
-    </style>
-</head>
-
-<body>
-  <div style="width: 100%;">
-      <table style="width: 100%;" id="pagehead"><tr><td style="width: 200px; text-align: left;">
-                <img src="img/logoprint.png" />
-                </td>
-      <td style="text-align: center;"><h2 id="title_main"></h2><h3 id="title_sub"></h3></td>
-                <td style="text-align: right; ">
-                  <div style="text-align: left;"><span id="creche_name">Creche</span><br/>
-                  <span id="creche_address">address</span><br/>
-                  <span id="creche_zip">CP</span>&nbsp;<span id="creche_city">City</span></div>
-                </td>
-                </tr>
-                </table>
-    </div>
-  <table class="table table-bordered" id="cal_month" style="width: 100%;">
-    </table>
-    
-    <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-    <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-    <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-    <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-    <script src="js/print.js" type="text/javascript"></script>
-    <script src="js/print_calendar.js" type="text/javascript"></script>
-    <script src="../../web/js/labels.js" type="text/javascript"></script>
-</body>
-</html>
\ No newline at end of file
diff --git a/modules/reports/print_child.html b/modules/reports/print_child.html
deleted file mode 100644
index 4e2c4d6..0000000
--- a/modules/reports/print_child.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-    <title>Creorga - Enfant</title>
-    <meta charset="UTF-8">
-    <meta http-equiv="cache-control" content="max-age=0" />
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="expires" content="0" />
-    <meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-    <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-    <link href="../../web/css/jquery.dataTables.min.css" rel="stylesheet" type="text/css">
-    <link href="../../web/css/jquery.dataTables_themeroller.css" rel="stylesheet" type="text/css">
-    <link href="css/print.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-    <div style="width: 100%;">
-      <table style="width: 100%;" id="pagehead"><tr><td style="width: 200px; text-align: left; ">
-                <img src="img/logoprint.png" />
-                </td>
-      <td style="text-align: center;"><h2 id="title_main"></h2><h3 id="title_sub"></h3></td>
-                <td style="text-align: right;">
-                  <div style="text-align: left;"><span id="creche_name">Creche</span><br/>
-                  <span id="creche_address">address</span><br/>
-                  <span id="creche_zip">CP</span>&nbsp;<span id="creche_city">City</span></div>
-                </td>
-                </tr>
-                </table>
-    </div>
-    <div id="childdata" style="margin-top: 20px;">
-        <h2>Données de base</h2>
-        <table class="table table-striped">
-            <tbody>
-                <tr><td>Prénom</td><th id="childs_prename"></th></tr>
-                <tr><td>Nom</td><th id="childs_surname"></th></tr>
-                <tr><td>Date de naissance</td><th id="childs_birthday"></th></tr>
-                <tr><td>No. Check Service</td><th id="childs_checkservicenumber"></th></tr>
-                <tr><td>Date d'expiration</td><th id="childs_checkserviceexpiration"></th></tr>
-                <tr><td>No. Client</td><th id="childs_clientnumber"></th></tr>
-                <tr><td>Addresse</td><th id="childs_address"></th></tr>
-                <tr><td>Code Postale</td><th id="childs_zip"></th></tr>
-                <tr><td>Ville</td><th id="childs_city"></th></tr>
-                <tr><td>Pays</td><th id="childs_country"></th></tr>
-                <tr><td>Nationalité</td><th id="childs_nationality"></th></tr>
-                <tr><td>Langue maternelle</td><th id="childs_nativelanguage"></th></tr>
-                <tr><td>Remarque</td><th id="childs_remark"></th></tr>
-            </tbody>
-        </table>
-    </div>
-    
-    <div  id="parentdata" style="padding-top: 20px;">
-        <h2>Données parents / personnes de référence</h2>
-        <div id="tbl_parents_wrapper" class="dataTables_wrapper" style="width: 100%;">
-            
-            <table class="display dataTable cell-border" style="width: 100%;" id="tbl_parents" role="grid">
-              
-            </table>
-          </div>
-    </div>
-
-    <div  id="refpersondata" style="padding-top: 20px;">
-        <h2>Données personnes de réferences/authorisées</h2>
-        <div id="tbl_refpersons_wrapper" class="dataTables_wrapper" style="width: 100%;">
-            
-            <table class="display dataTable cell-border" style="width: 100%;" id="tbl_refpersons" role="grid">
-              
-            </table>
-          </div>
-    </div>
-
-    <div id="planningdata" style="padding-top: 20px;">
-        <h2>Info Planning</h2>
-        <table>
-            <tbody>
-                <tr><td>Date d'entrée</td><td id="childs_entrydate"></td></tr>
-                <tr><td>Date de sortie</td><td id="childs_leavedate"></td></tr>
-                
-            </tbody>
-        </table>
-        <div id="tbl_planning_wrapper" class="dataTables_wrapper" style="width: 100%;">
-            
-            <table class="display dataTable cell-border" style="width: 100%;" id="tbl_planning" role="grid">
-              
-            </table>
-          </div>
-    </div>
-
-    <div id="healthdata" style="padding-top: 20px;">
-        <h2>Info Santé</h2>
-        <table class="table table-striped">
-            <tbody>
-                <tr><td>Médecin de famille</td><th id="health_docname"></th></tr>
-                <tr><td>Téléphone</td><th id="health_docphone"></th></tr>
-                <tr><td>Adr. cabinet</td><th id="health_docaddress"></th></tr>
-                <tr><td>Code Postale</td><th id="health_doczip"></th></tr>
-                <tr><td>Ville</td><th id="health_doccity"></th></tr>
-                <tr><td>Pays</td><th id="health_doccountry"></th></tr>
-                <tr><td>Info Santé</td><th id="health_healthinfo"></th></tr>
-            </tbody>
-        </table>    
-    </div>
-   
-    <div id="financedata" style="padding-top: 20px;">
-        <h2>Info fincances/caution</h2>
-        <table class="table table-striped">
-            <tbody>
-                <tr><td>Somme totale</td><td id="health_docname"></td></tr>
-                <tr><td>Somme payé</td><td id="health_docphone"></td></tr>
-                <tr><td>Somme remboursé</td><td id="health_docaddress"></td></tr>
-                <tr><td>Date Status</td><td id="health_doczip"></td></tr>
-                <tr><td>Compte bancaire</td><td id="health_doccity"></td></tr>
-                <tr><td>BIC</td><td id="health_doccountry"></td></tr>
-                <tr><td>Remarque</td><td id="health_healthinfo"></td></tr>
-            </tbody>
-        </table>   
-    </div>
-    
-    
-    
-    <!--<div id="print-foot">
-      Date: <span id="printdatetime">00.00.0000 00:00</span>&nbsp;&nbsp;-&nbsp;Page: 
-    </div>-->
-    <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-    <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-    <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-    <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-    <script src="js/print.js" type="text/javascript"></script>
-    <script src="js/print_child.js" type="text/javascript"></script>
-    <script src="../../web/js/labels.js" type="text/javascript"></script>
-</body>
-</html>
\ No newline at end of file
diff --git a/modules/reports/print_list.html b/modules/reports/print_list.html
deleted file mode 100644
index 13a8de5..0000000
--- a/modules/reports/print_list.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-    <title>Creorga - Printing - List</title>
-    <meta charset="UTF-8">
-    <meta http-equiv="cache-control" content="max-age=0" />
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="expires" content="0" />
-    <meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-    <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-    <link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">
-    <link href="../../web/css/glyphicons.css" rel="stylesheet">
-    <!--<link href="../../web/css/jquery.dataTables_themeroller.css" rel="stylesheet" type="text/css">-->
-    <link href="css/print.css" rel="stylesheet" type="text/css">
-    <link href="../../web/css/calendar.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-    <div style="width: 100%;">
-      <table style="width: 100%;" id="pagehead"><tr><td style="width: 200px; text-align: left;">
-                <img src="img/logoprint.png" />
-                </td>
-      <td style="text-align: center;"><h2 id="title_main"></h2><h3 id="title_sub"></h3></td>
-                <td style="text-align: right; ">
-                  <div style="text-align: left;"><span id="creche_name">Creche</span><br/>
-                  <span id="creche_address">address</span><br/>
-                  <span id="creche_zip">CP</span>&nbsp;<span id="creche_city">City</span></div>
-                </td>
-                </tr>
-                </table>
-    </div>
-    <table class="dataTable row-border cell-border stripe" tyle="width: 100%;" id="tbl_list" role="grid">
-    <thead style="margin-top: 200px;"></thead>
-    <tbody>
-      
-    </tbody>
-    <tfoot>
-      
-    </tfoot>
-    </table>
-    <!--<div id="print-head" style="width: 100%;">
-      <table style="width: 100%;" id="pagehead"><tr><td style="width: 200px; text-align: left;">
-                <img src="img/logoprint.png" />
-                </td>
-      <td style="text-align: center;"><h2 id="title_main"></h2><h3 id="title_sub"></h3></td>
-                <td style="text-align: right; ">
-                  <div style="text-align: left;"><span id="creche_name">Creche</span><br/>
-                  <span id="creche_address">address</span><br/>
-                  <span id="creche_zip">CP</span>&nbsp;<span id="creche_city">City</span></div>
-                </td>
-                </tr>
-                </table>
-    </div>-->
-    <!--<div id="print-foot">
-      Date: <span id="printdatetime">00.00.0000 00:00</span>&nbsp;&nbsp;-&nbsp;Page:&nbsp;
-    </div>-->
-    <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-    <script src="../../web/js/bootstrap.min.js" type="text/javascript"></script>
-    <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-    <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-    <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-    <script src="js/print.js" type="text/javascript"></script>
-    <script src="js/print_loaddata.js" type="text/javascript"></script>
-    <script src="../../web/js/labels.js" type="text/javascript"></script>
-</body>
-</html>
diff --git a/modules/reports/print_logchild.html b/modules/reports/print_logchild.html
deleted file mode 100644
index f41f7bf..0000000
--- a/modules/reports/print_logchild.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-    <title>Creorga - Logbook</title>
-    <meta charset="UTF-8">
-    <meta http-equiv="cache-control" content="max-age=0" />
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="expires" content="0" />
-    <meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-    <link href="css/print.css" rel="stylesheet" type="text/css">
-    <style>
-        .panel-heading {
-            background-color: #969696 !important;
-    }
-    </style>
-</head>
-
-<body>
-    <div style="width: 100%;">
-      <table style="width: 100%;" id="pagehead"><tr><td style="width: 200px; text-align: left; ">
-                <img src="img/logoprint.png" />
-                </td>
-      <td style="text-align: center;"><h2 id="title_main"></h2><h3 id="title_sub"></h3></td>
-                <td style="text-align: right;">
-                  <div style="text-align: left;"><span id="creche_name">Creche</span><br/>
-                  <span id="creche_address">address</span><br/>
-                  <span id="creche_zip">CP</span>&nbsp;<span id="creche_city">City</span></div>
-                </td>
-                </tr>
-                </table>
-    </div>
-    <div id="div_data" style="margin-top: 20px;"></div>
-    <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-    <!--<script src="../../web/js/datatables.min.js" type="text/javascript"></script>-->
-    <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-    <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-    <script src="js/print.js" type="text/javascript"></script>
-    <script src="js/print_logchild.js" type="text/javascript"></script>
-    <script src="../../web/js/labels.js" type="text/javascript"></script>
-</body>
-</html>
\ No newline at end of file
diff --git a/modules/reports/print_multilist.html b/modules/reports/print_multilist.html
deleted file mode 100644
index 8b7a52b..0000000
--- a/modules/reports/print_multilist.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-    <title>Creorga - Printing - MultiList</title>
-    <meta charset="UTF-8">
-    <meta http-equiv="cache-control" content="max-age=0" />
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="expires" content="0" />
-    <meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-    <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-    <link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">
-    <!--<link href="../../web/css/glyphicons.css" rel="stylesheet">-->
-    <!--<link href="../../web/css/jquery.dataTables_themeroller.css" rel="stylesheet" type="text/css">-->
-    <link href="css/print.css" rel="stylesheet" type="text/css">
-    <style>
-      .mpage {
-        page-break-after: always;
-      }
-    </style>
-</head>
-
-<body>
-    <div id="allpages">
-    <div id="page_xxnum" class="mpage">
-    <div style="width: 100%;">
-      <table style="width: 100%;" id="pagehead"><tr><td style="width: 200px; text-align: left;">
-                <img src="img/logoprint.png" />
-                </td>
-      <td style="text-align: center;"><h2 id="title_main"></h2><h3 id="title_sub"></h3></td>
-                <td style="text-align: right; ">
-                  <div style="text-align: left;"><span id="creche_name">Creche</span><br/>
-                  <span id="creche_address">address</span><br/>
-                  <span id="creche_zip">CP</span>&nbsp;<span id="creche_city">City</span></div>
-                </td>
-                </tr>
-                </table>
-    </div>
-    <h2 id="page_title"></h2>
-    <table class="dataTable row-border cell-border stripe" tyle="width: 100%;" id="tbl_list_xxnum" role="grid">
-    <thead style="margin-top: 200px;"></thead>
-    <tbody>
-      
-    </tbody>
-    <tfoot>
-      
-    </tfoot>
-    
-    </table>
-    </div>
-    </div>
-    <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-    <script src="../../web/js/bootstrap.min.js" type="text/javascript"></script>
-    <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-    <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-    <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-    <script src="js/print.js" type="text/javascript"></script>
-    <script src="js/print_multilist.js" type="text/javascript"></script>
-    <script src="../../web/js/labels.js" type="text/javascript"></script>
-</body>
-</html>
diff --git a/modules/reports/print_table.html b/modules/reports/print_table.html
deleted file mode 100644
index d4a0374..0000000
--- a/modules/reports/print_table.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-    <title>Creorga - Printing - Table</title>
-    <meta charset="UTF-8">
-    <meta http-equiv="cache-control" content="max-age=0" />
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="expires" content="0" />
-    <meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-    <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-    <!--<link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">-->
-    <link href="../../web/css/glyphicons.css" rel="stylesheet">
-    <!--<link href="../../web/css/jquery.dataTables_themeroller.css" rel="stylesheet" type="text/css">-->
-    <link href="css/print.css" rel="stylesheet" type="text/css">
-    <link href="../../web/css/calendar.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-    <div style="width: 100%;">
-      <table style="width: 100%;" id="pagehead"><tr><td style="width: 200px; text-align: left;">
-                <img src="img/logoprint.png" />
-                </td>
-      <td style="text-align: center;"><h2 id="title_main"></h2><h3 id="title_sub"></h3></td>
-                <td style="text-align: right; ">
-                  <div style="text-align: left;"><span id="creche_name">Creche</span><br/>
-                  <span id="creche_address">address</span><br/>
-                  <span id="creche_zip">CP</span>&nbsp;<span id="creche_city">City</span></div>
-                </td>
-                </tr>
-                </table>
-    </div>
-    <table class="table table-bordered table-striped" style="width: 100%;" id="tbl_list" role="grid">
-
-    </table>
-    <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-    <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-    <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-    <script src="js/print.js" type="text/javascript"></script>
-    <script src="js/print_table.js" type="text/javascript"></script>
-    <script src="../../web/js/labels.js" type="text/javascript"></script>
-</body>
-</html>
diff --git a/modules/reports/reports.xul b/modules/reports/reports.xul
deleted file mode 100644
index 7f9abec..0000000
--- a/modules/reports/reports.xul
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE overlay PUBLIC "-//MOZILLA//DTD XUL V1.0//EN"
-"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<overlay id="ov_reports" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <script type="application/javascript" src="chrome://creorga/content/modules/reports/js/printutils.js" />
-  <script type="application/javascript" src="chrome://creorga/content/modules/reports/js/printpdf.js" />
-  <toolbar id="co_maintoolbar" style="-moz-appearance: none;">
-    <toolbarbutton class="btn btn-default" id="tbb_print" insertafter="tbb_space" label="Impression" image="modules/reports/img/print.png" orient="vertical" oncommand="printmanager.onprint();"/>
-  </toolbar>
-</overlay>
\ No newline at end of file
diff --git a/modules/settings/db.html b/modules/settings.old/db.html
similarity index 100%
rename from modules/settings/db.html
rename to modules/settings.old/db.html
diff --git a/modules/settings/dbconfig.js b/modules/settings.old/dbconfig.js
similarity index 100%
rename from modules/settings/dbconfig.js
rename to modules/settings.old/dbconfig.js
diff --git a/modules/dashboard/index.html b/modules/settings.old/index.html
similarity index 58%
rename from modules/dashboard/index.html
rename to modules/settings.old/index.html
index f84c768..f9a2741 100644
--- a/modules/dashboard/index.html
+++ b/modules/settings.old/index.html
@@ -12,15 +12,31 @@
   </head>
   <body>
     <nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
-      <a class="navbar-brand" href="#">Creorga</a>
+      <a class="navbar-brand" href="#">Configuration</a>
       <div class="ml-auto">
         <div class="btn-group" role="group" aria-label="Basic example">
+                <button class="btn btn-primary" onclick="db_import();"><i class="fas fa-plus"></i><br/>importer</button>
+                <button class="btn btn-primary" onclick="db_export();"><i class="fas fa-plus"></i><br/>exporter</button>
+                <button class="btn btn-primary" onclick="db_new();"><i class="fas fa-plus"></i><br/>nouv.</button>
+                <button class="btn btn-primary" onclick="db_edit();"><i class="fas fa-edit"></i><br/>édit.</button>
+                <button class="btn btn-primary" onclick="db_delete();"><i class="fas fa-trash"></i><br/>suppr.</button>
+                <button class="btn btn-primary" onclick="db_test();"><i class="fas fa-plus"></i><br/>Tester Connection</button>
         </div>
       </div>
     </nav>
     <div class="cotainer-fluid" style="margin-top: 52px;">
-      
-      <div class="row">
+            <table id="tbl_childs" class="table table-bordered table-hover table-striped">
+                    <thead class="thead-dark">
+                            <th data-checkbox="true"></th>
+                            <th data-sortable="true">Nom</th>
+                            <th data-sortable="true">Type</th>
+                            <th data-sortable="true">VPN</th>
+                            <th data-sortable="true">URL</th>
+                            <th data-sortable="true">Status</th>
+                    <tfoot></tfoot>
+                    <tbody></tbody>
+                </table>
+      <!-- <div class="row">
         <div class="col-sm-12">
           <div class="card">
             <div class="card-heading">
@@ -31,7 +47,7 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
     <script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
     <script src="../../node_modules/jquery/dist/jquery.min.js" type="text/javascript"></script>
@@ -39,11 +55,12 @@
     <script src="../../node_modules/bootstrap-table/dist/bootstrap-table.min.js"></script>
     <script src="../../node_modules/@fortawesome/fontawesome-free/js/all.min.js"></script>
     <script src="../../js/moduleglobal.js"></script>
-    <script src="../../js/database.js"></script>
+    <!-- <script src="../../js/database.js"></script> -->
     <!--<script src="chrome://creorga/content/js/tools.js" type="text/javascript"></script>-->
     <!-- <script src="js/creorga.js" type="text/javascript"></script> -->
     <!-- <script src="js/labels.js" type="text/javascript"></script> -->
     <script src="index.js" type="text/javascript"></script>
+    <script src="dbconfig.js" type="text/javascript"></script>
     <script>if (window.module) module = window.module;</script>
   </body>
 </html>
diff --git a/modules/settings.old/index.js b/modules/settings.old/index.js
new file mode 100644
index 0000000..f4a8bae
--- /dev/null
+++ b/modules/settings.old/index.js
@@ -0,0 +1,7 @@
+function initpage(){
+    console.log("Loading Settings!");
+}
+
+function db_new(){
+    parent.userapp.loadmodulepage('settings','db',null);
+}
\ No newline at end of file
diff --git a/modules/settings/js/multisite_reader.js b/modules/settings.old/js/multisite_reader.js
similarity index 100%
rename from modules/settings/js/multisite_reader.js
rename to modules/settings.old/js/multisite_reader.js
diff --git a/modules/settings/multisite.xul b/modules/settings.old/multisite.xul
similarity index 100%
rename from modules/settings/multisite.xul
rename to modules/settings.old/multisite.xul
diff --git a/modules/settings/support/js/multisite.js b/modules/settings.old/support/js/multisite.js
similarity index 100%
rename from modules/settings/support/js/multisite.js
rename to modules/settings.old/support/js/multisite.js
diff --git a/modules/settings/support/js/update.js b/modules/settings.old/support/js/update.js
similarity index 100%
rename from modules/settings/support/js/update.js
rename to modules/settings.old/support/js/update.js
diff --git a/modules/settings/support/multisite.html b/modules/settings.old/support/multisite.html
similarity index 100%
rename from modules/settings/support/multisite.html
rename to modules/settings.old/support/multisite.html
diff --git a/modules/settings/support/support.xul b/modules/settings.old/support/support.xul
similarity index 100%
rename from modules/settings/support/support.xul
rename to modules/settings.old/support/support.xul
diff --git a/modules/settings/support/update.html b/modules/settings.old/support/update.html
similarity index 100%
rename from modules/settings/support/update.html
rename to modules/settings.old/support/update.html
diff --git a/modules/settings/form_datastore.html b/modules/settings/form_datastore.html
new file mode 100644
index 0000000..5e16f77
--- /dev/null
+++ b/modules/settings/form_datastore.html
@@ -0,0 +1,135 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<link rel="stylesheet" href="../../node_modules/bootstrap/dist/css/bootstrap.min.css">
+<link rel="stylesheet" href="../../node_modules/bootstrap-table/dist/bootstrap-table.min.css">
+<link rel="stylesheet" href="../../node_modules/@fortawesome/fontawesome-free/css/fontawesome.min.css">
+<link rel="stylesheet" href="../../css/invoicejournal.epic.css">
+<link rel="stylesheet" href="../../css/app.css">
+<title>Datenbank-Einstellungen</title>
+</head>
+<body>
+        <nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
+        <button class="btn btn-primary" onclick="parent.browserapp.loadmodule('settings');"><i class="fas fa-chevron-left"></i><br>Back</button>
+                <a class="navbar-brand" href="#">&nbsp; Datenbank-Einstellungen</a>
+                <div class="ml-auto">
+           
+           <div class="btn-group" role="group" aria-label="Basic example">
+                <button class="btn btn-primary" onclick="datastore.save();"><i class="fas fa-save"></i><br/>Speichern</button>
+                <button class="btn btn-primary" onclick="datastore.test();"><i class="fas fa-sync"></i><br/>Testen</button>
+                <button class="btn btn-danger" onclick="datastore.test();" id="btnconnection"><i class="fas fa-wifi"></i><br/>Verbinden</button>
+                
+           </div>
+                </div>
+              </nav>
+    <div class="cotainer-fluid" style="margin-top: 52px;">    
+      <div class="row">
+        <div class="col-md-12">
+          <div class="card">
+          <div class="card-body">
+          <div class="form-group">
+            <label for="name" >Name</label>
+            <input type="text" class="form-control" id="name" name="name"/>
+          </div>
+        </div>
+        </div>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-md-4">
+          <div class="card">
+            <div class="card-header"> Verbindung </div>
+            <div class="card-body">
+              <div class="form-group">
+                <label for="type">Verbindungs-Typ</label>
+                <select id="type" name="type" class="form-control">
+                  <option value="local">Lokal</option>
+                  <option value="local">LAN</option>
+                  <option value="Cloud">Cloud</option>
+                </select>
+              </div>
+              <div class="form-group">
+                <label for="server">Server</label>
+                  <input type="text" class="form-control" id="server" name="server"/>
+              </div>
+              <div class="form-group">
+                <label for="dbfile">Datenbank</label>
+                <input type="text" class="form-control" id="dbfile" name="dbfile"/>
+              </div>
+              <div class="form-group">
+                <label for="type">VPN</label>
+                <select id="vpn" name="vpn" class="form-control">
+                  <option value=""></option>
+                </select>
+              </div>
+          </div>
+        </div>
+        </div>
+        <div class="col-md-4">
+            <div class="card">
+              <div class="card-header">
+                Standard Werte
+              </div>
+              <div class="card-body">
+                <div class="form-group">
+                  <label for="dbname">Mehrwert-Steuer(%)</label>
+                  <input type="text" class="form-control" id="vat" name="vat"/>
+                </div>
+                <div class="form-group">
+                  <label for="dbname">Währung (Symbol)</label>
+                  <input type="text" class="form-control" id="currency" name="currency"/>
+                </div>      
+              </div>
+            </div>
+          </div>
+          <div class="col-md-4">
+              <div class="card">
+                <div class="card-header">
+                  E-Mail Server
+                </div>
+                <div class="card-body">
+                    <div class="form-group">
+                      <label for="mailserver">Email-Server</label>
+                      <input type="text" class="form-control" id="mailserver" name="mailserver"/>
+                    </div>
+                    <div class="form-group">
+                      <label for="mailport">Verschlüsselung/Port</label>
+                      <div class="input-group">
+                      <select id="mailencryption" name="mailencryption" class="form-control">
+                          <option value="">None</option>
+                          <option value="TLS">TLS</option>
+                          <option value="SSL">SSL</option>
+                        </select>
+                      <input type="text" class="form-control" id="mailport" name="mailport"/>
+                    </div>
+                    </div>
+                    <div class="form-group">
+                      <label for="maillogin">Login</label>
+                      <input type="text" class="form-control" id="maillogin" name="maillogin"/>
+                    </div>
+                    <div class="form-group">
+                      <label for="mailpassword">Passwort</label>
+                      <input type="password" class="form-control" id="mailpassword" name="mailpassword"/>
+                    </div>
+                </div>
+              </div>
+            </div>
+      </div>
+      </div>
+
+<script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
+<script src="../../node_modules/jquery/dist/jquery.min.js"></script>
+<script src="../../node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
+<script src="../../node_modules/bootstrap-table/dist/bootstrap-table.min.js"></script>
+<script src="../../node_modules/@fortawesome/fontawesome-free/js/all.min.js"></script>
+<script src="../../js/moduleglobal.js"></script>
+<script src="../../js/database.js"></script>
+<script src="form_datastore.js"></script>
+<script src="lib/datastore.js"></script>
+<script src="lib/printtemplate.js"></script>
+<script src="lib/emailtemplate.js"></script>
+<script>if (window.module) module = window.module;</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/modules/settings/form_datastore.js b/modules/settings/form_datastore.js
new file mode 100644
index 0000000..8aaa4ea
--- /dev/null
+++ b/modules/settings/form_datastore.js
@@ -0,0 +1,14 @@
+function initpage(){
+    console.log("ID:" + mpref.cfg.id);
+    if (mpref.cfg.id){
+        loadform();
+    }
+}
+
+function loadform(){
+    var pref = parent.usersystem.getPreference(mpref.cfg.id);
+    console.log(pref);
+    for (var i in pref){
+        $("#" + i).val(pref[i]);
+    }
+}
diff --git a/modules/settings/index.html b/modules/settings/index.html
index f9a2741..205c241 100644
--- a/modules/settings/index.html
+++ b/modules/settings/index.html
@@ -1,67 +1,56 @@
 <!DOCTYPE html>
-<html>
-  <head>
-  <title>Dashboard</title>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link href="../../node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../node_modules/bootstrap-table/dist/bootstrap-table.min.css" rel="stylesheet" type="text/css">
-  <link href="../../node_modules/@fortawesome/fontawesome-free/css/fontawesome.min.css" rel="stylesheet" type="text/css">
-  <link href="../../css/creorga.epic.css" rel="stylesheet" type="text/css">
-  <link href="../../css/app.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-    <nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
-      <a class="navbar-brand" href="#">Configuration</a>
-      <div class="ml-auto">
-        <div class="btn-group" role="group" aria-label="Basic example">
-                <button class="btn btn-primary" onclick="db_import();"><i class="fas fa-plus"></i><br/>importer</button>
-                <button class="btn btn-primary" onclick="db_export();"><i class="fas fa-plus"></i><br/>exporter</button>
-                <button class="btn btn-primary" onclick="db_new();"><i class="fas fa-plus"></i><br/>nouv.</button>
-                <button class="btn btn-primary" onclick="db_edit();"><i class="fas fa-edit"></i><br/>édit.</button>
-                <button class="btn btn-primary" onclick="db_delete();"><i class="fas fa-trash"></i><br/>suppr.</button>
-                <button class="btn btn-primary" onclick="db_test();"><i class="fas fa-plus"></i><br/>Tester Connection</button>
-        </div>
-      </div>
-    </nav>
-    <div class="cotainer-fluid" style="margin-top: 52px;">
-            <table id="tbl_childs" class="table table-bordered table-hover table-striped">
-                    <thead class="thead-dark">
-                            <th data-checkbox="true"></th>
-                            <th data-sortable="true">Nom</th>
-                            <th data-sortable="true">Type</th>
-                            <th data-sortable="true">VPN</th>
-                            <th data-sortable="true">URL</th>
-                            <th data-sortable="true">Status</th>
-                    <tfoot></tfoot>
-                    <tbody></tbody>
-                </table>
-      <!-- <div class="row">
-        <div class="col-sm-12">
-          <div class="card">
-            <div class="card-heading">
-              <h3 class="cadr-title">&nbsp;Informations Utiles</h3>
-            </div>
-            <div class="card-body" id="infopanel">
-              pas d'informations utiles pour l'instant!
-            </div>
-          </div>
-        </div>
-      </div> -->
-    </div>
-    <script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
-    <script src="../../node_modules/jquery/dist/jquery.min.js" type="text/javascript"></script>
-    <script src="../../node_modules/bootstrap/dist/js/bootstrap.bundle.min.js" type="text/javascript"></script>
-    <script src="../../node_modules/bootstrap-table/dist/bootstrap-table.min.js"></script>
-    <script src="../../node_modules/@fortawesome/fontawesome-free/js/all.min.js"></script>
-    <script src="../../js/moduleglobal.js"></script>
-    <!-- <script src="../../js/database.js"></script> -->
-    <!--<script src="chrome://creorga/content/js/tools.js" type="text/javascript"></script>-->
-    <!-- <script src="js/creorga.js" type="text/javascript"></script> -->
-    <!-- <script src="js/labels.js" type="text/javascript"></script> -->
-    <script src="index.js" type="text/javascript"></script>
-    <script src="dbconfig.js" type="text/javascript"></script>
-    <script>if (window.module) module = window.module;</script>
-  </body>
-</html>
+<html lang="en">
+<head>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<link rel="stylesheet" href="../../node_modules/bootstrap/dist/css/bootstrap.min.css">
+<link rel="stylesheet" href="../../node_modules/bootstrap-table/dist/bootstrap-table.min.css">
+<link rel="stylesheet" href="../../node_modules/@fortawesome/fontawesome-free/css/fontawesome.min.css">
+<link rel="stylesheet" href="../../css/invoicejournal.epic.css">
+<link rel="stylesheet" href="../../css/app.css">
+<title>Einstellungen</title>
+</head>
+<body>
+        <nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
+                <a class="navbar-brand" href="#">Einstellungen</a>
+                <div class="ml-auto">
+           <div class="btn-group" role="group" aria-label="Basic example">
+                <button class="btn btn-primary" onclick="datastore.import();"><i class="fas fa-file-import"></i><br/>importieren</button>
+                <button class="btn btn-primary" onclick="datastore.export();"><i class="fas fa-file-export"></i><br/>exportieren</button>
+                <button class="btn btn-primary" onclick="datastore.new();"><i class="fas fa-plus"></i><br/>Neu</button>
+                <button class="btn btn-primary" onclick="datastore.edit();"><i class="fas fa-edit"></i><br/>Bearb.</button>
+                <button class="btn btn-primary" onclick="datastore.delete();"><i class="fas fa-trash"></i><br/>Löschen</button>
 
+           </div>
+                </div>
+              </nav>
+    <div class="cotainer-fluid" style="margin-top: 52px;">            
+    <!-- <button class="btn btn-secondary" onclick="parent.usersystem.showError('MyError','My Error Message from settings!');">Show Error</button> -->
+    <table class="table table-bordered table-hover table-striped" id="tbl_datasets">
+        <thead class="thead-dark">
+          <tr>
+            <th data-checkbox="true"></th>
+            <th data-sortable="true">Name</th>
+            <th data-sortable="true">Database</th>
+            <th data-sortable="true">Server</th>
+            <th data-sortable="true">Type</th>
+            <th data-sortable="true">VPN</th>
+            <th>Verbunden</th>
+          </tr>
+        </thead>
+        <tfoot></tfoot>
+        <tbody></tbody>
+      </table>
+    </div>
+<script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
+<script src="../../node_modules/jquery/dist/jquery.min.js"></script>
+<script src="../../node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
+<script src="../../node_modules/bootstrap-table/dist/bootstrap-table.min.js"></script>
+<script src="../../node_modules/@fortawesome/fontawesome-free/js/all.min.js"></script>
+<script src="../../js/moduleglobal.js"></script>
+<script src="../../js/database.js"></script>
+<script src="lib/datastore.js"></script>
+<script src="index.js"></script>
+<script>if (window.module) module = window.module;</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/modules/settings/index.js b/modules/settings/index.js
index f4a8bae..3bc9e74 100644
--- a/modules/settings/index.js
+++ b/modules/settings/index.js
@@ -1,7 +1,71 @@
+var winh = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);
+var tblh = winh-54;
+
 function initpage(){
-    console.log("Loading Settings!");
+    console.log(parent.usersystem.getsysinfo());
+    loadtable();
+    //parent.usersystem.setProperty("testproperty",{id:"TEST"});
+}
+
+function loadtable(){
+
+    var connected=parent.browserapp.currentdataset();
+
+    var localds = parent.usersystem.getLocalDataSets();
+    console.log(localds);
+    for (var i in localds){
+      var prop = parent.usersystem.getPreference(localds[i]);
+      console.log("PROP");
+      console.log(connected +"<=>"+ localds[i]);
+      
+      console.log(prop);
+      var row = '<tr id="' + localds[i] + '">' +
+      '<td></td>' +
+      '<td>'+prop.name+'</td>' +
+      '<td>'+prop.dbfile+'</td>' +
+      '<td>'+prop.server+'</td>' +
+      '<td>'+prop.type+'</td>' +
+      '<td>'+prop.vpn+'</td>' +     
+      '<td class="btn-'+ ((localds[i]==connected)?'success':'secondary')+'"></td>'+
+      '</tr>';
+      $("#tbl_datasets").append(row);
+
+      //$("#globaldatasets").append('<option value="'+ds[i]+'">'+prop.name+'</option>');
+    }
+    $('#tbl_datasets').bootstrapTable({
+        pagination: false,
+        search: false,
+        height: tblh,
+        clickToSelect: true
+    });
 }
 
-function db_new(){
-    parent.userapp.loadmodulepage('settings','db',null);
-}
\ No newline at end of file
+// function settings_edit(){
+//     var settings_id= getTableSelectionID();
+//     if (settings_id){
+//       parent.browserapp.loadmodulepage('settings','form_datastore',{"id":settings_id});
+//     }
+    
+//   }
+
+function getTableSelectionID(){
+    var sel = $('#tbl_datasets').bootstrapTable('getSelections');
+    var id = null;
+    
+    if (sel){  id=sel[0]._id; }
+    console.log("Selected ID:" + id);
+    return id;
+  }
+  
+  function getTableSelectionIDs(){
+    var sel = $('#tbl_datasets').bootstrapTable('getSelections');
+    var ids = [];
+    if (sel){  
+      for (var s in sel){
+        ids.push(s._id);
+      }
+    }
+    return ids;
+  }
+
+  
\ No newline at end of file
diff --git a/modules/settings/lib/datastore.js b/modules/settings/lib/datastore.js
new file mode 100644
index 0000000..834821a
--- /dev/null
+++ b/modules/settings/lib/datastore.js
@@ -0,0 +1,46 @@
+var datastore = {
+    new: function(){
+        parent.browserapp.loadmodulepage('settings','form_datastore',{"id":""});
+    },
+    edit: function(){
+        var settings_id= getTableSelectionID();
+        console.log(settings_id);
+        if (settings_id){
+            parent.browserapp.loadmodulepage('settings','form_datastore',{"id":settings_id});
+        }
+    },
+    delete: function(){
+        
+    },
+    import: function(){
+        
+    },
+    export: function(){
+        
+    },
+    test: function(){
+        
+    },
+    save: function(){
+        var dts ={};
+        $("input,select").each(function(){
+            var inp = $(this);    
+            //console.log(inp);
+            dts[inp.attr("id")] = inp.val();
+        });
+        console.log(dts);
+        console.log(mpref);
+        if (mpref.cfg.id == ""){
+            var keyname = dts['name'].toLowerCase();
+            console.log(keyname);
+            keyname = keyname.replace(/[^a-z0-9-_]/g,"");
+            console.log(keyname);
+            mpref.cfg.id = "db."+ keyname;
+        }
+        if (dts.name){
+            console.log("Before save:" + mpref.cfg.id);
+            parent.usersystem.setPreference(mpref.cfg.id,dts);
+        }
+       
+    }
+}
\ No newline at end of file
diff --git a/modules/staff/coworker.html b/modules/staff/coworker.html
deleted file mode 100644
index 572013d..0000000
--- a/modules/staff/coworker.html
+++ /dev/null
@@ -1,610 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-
-  <title>Employé(e)</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="cache-control" content="max-age=0" />
-  <meta http-equiv="cache-control" content="no-cache" />
-  <meta http-equiv="expires" content="0" />
-  <meta http-equiv="expires" content="Tue, 01 Jan 1970 1:00:00 GMT" />
-  <meta http-equiv="pragma" content="no-cache" />
-  <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-  <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-  <link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/dataTables.bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css">
-  <!-- <link href="../../web/css/bootstrap-timepicker.min.css" rel="stylesheet" type="text/css"> -->
-  <link href="../../web/css/glyphicons.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/jquery.minicolors.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/creorga.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-
-    <div class="container-fluid">
-        <br/>
-        <!--<span class="pagehead" id="pagehead">Collaborateur</span>&nbsp;-->
-          <input type="hidden" value="" id="staff_uuid">
-                <table style="width: 100%;">
-                  <tbody>
-                    <tr>
-                      <td style="width: 50%">
-                        <form>
-                        <div class="field form-inline">
-                          <label for="staff_surname">Nom / Prénom</label>
-                          <input type="text" value="" id="staff_surname" class="form-control">
-                          <input type="text" value="" id="staff_prename" class="form-control">
-                        </div>
-
-                        <div class="field">
-                          <label for="staff_address">Adresse</label> <input type="text" value="" id="staff_address" class="form-control">
-                        </div>
-
-                        <div class="field form-inline">
-                          <label for="staff_zip">CP / Ville</label>
-                          <input type="text" value="" size="5" id="staff_zip" class="form-control">
-                          <input type="text" value="" id="staff_city" class="form-control">
-                        </div>
-
-                        <div class="field">
-                          <label for="staff_country">Pays</label> <input type="text" value="" id="staff_country" class="form-control">
-                        </div>
-                        <div class="field form-inline">
-                          <label for="staff_phone">Tel / E-Mail</label>
-                          <input type="text" value="" id="staff_phone" class="form-control">
-                          <input type="text" value="" id="staff_email" class="form-control">
-                        </div>
-                        </form>
-                        
-                      </td>
-
-                      <td style="width: 50%;">
-                        <form>
-                        <div class="field form-inline" id="date-container">
-                          <label for="staff_entrydate" style="width: 200px;">Date d'entrée / de sortie</label>
-                          <div id="dt_staff_entrydate" class="input-group date">
-                            <input type="date" class="form-control" value="" limits="0" placeholder="dd.mm.yyyy"  id="staff_entrydate"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                          </div>
-                        
-                          <div id="dt_staff_exitdate" class="input-group date">
-                            <input type="date" class="form-control" value="" limits="0" placeholder="dd.mm.yyyy" id="staff_exitdate"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                          </div>
-                        </div>
-                  
-                        <div class="field">
-                          <label for="staff_jobtitle">Position / Contrat</label> <input type="text" value="" id="staff_jobtitle" class="form-control">
-                        </div>
-                        <table style="width: 100%;">
-                        <tr><td style="width: 40%;"><div class="field">
-                          <label for="staff_weekhours">heures/semaine</label>
-                          <div class="input-group number">
-                            <input type="number" value="" id="staff_weekhours" style="text-align: right;" class="form-control">
-
-                            <div class="input-group-addon">h</div>
-                          </div>
-                        </div></td><td style="width: 40%;"><div class="field">
-                          <label for="staff_maxdayhours">heures/jour</label>
-                          <div class="input-group number">
-                            <input type="number" value="" id="staff_maxdayhours" style="text-align: right;" class="form-control">
-
-                            <div class="input-group-addon">h</div>
-                          </div>
-                        </div></td><td style="width:20%"><div class="field" >
-                            <label for="staff_color">Couleur</label>
-                            <div class="input-group">
-                            <input type="hidden" id="staff_color" class="form-control " value="">
-                            </div>
-                        </div></td></tr>
-                        </table>
-                        <div class="field">
-                          <label for="staff_iban">Compte Bancaire</label> <input type="text" value="" id="staff_iban" class="form-control">
-                        </div>
-                        <div class="field" id="pwddata">
-                          <label for="staff_password">Mot de Passe</label> 
-                          <div class="input-group">
-                          	<input type="password" value="" id="staff_password" class="form-control">
-                          	<div class="input-group-addon">(Min: 4 charatères)</div> 
-                          </div>
-                        </div>
-                        
-                        </form>
-                        
-                      </td>
-                    </tr>
-                  </tbody>
-                </table>
-              </div>
-              <div class="tabbable">
-            <ul class="nav nav-tabs" id="tabgrouphead">
-              <li><a data-toggle="tab" href="#activity">Organisation interne</a></li>
-              <li><a data-toggle="tab" href="#vacancy">Congé</a></li>
-            </ul>
-
-            <div class="tab-content">
-              
-              <div id="activity" class="tab-pane">
-                <div class="form-group form-inline">
-                      <label for="year_organisation">Année:</label>
-                      <div class="input-group">
-                        <select id="year_organisation" class="selyear">
-                          
-                        </select>
-                    </div>
-                <button onclick="dlg_event({'uuid':''},'ins');" class="btn btn-primary" type="button"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span>&nbsp;Activité</button>
-                </div>
-                 <table id="tbl_activity" class="table table-striped">
-                  
-                </table>
-              </div>
-              <div id="vacancy" class="tab-pane">
-                <div class="form-group form-inline">
-                      <label for="year_vacancy">Année:</label>
-                      <div class="input-group">
-                        <select id="year_vacancy" class="selyear">
-                          
-                        </select>
-                    </div>
-                  <button onclick="dlg_vacancy({'uuid':''},'ins');" class="btn btn-primary" type="button"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span>&nbsp;Congé</button>
-                      <div class="form-group">
-                        <label for="vacancy_total">congé normale</label>
-                        
-                        <div class="input-group" style="width: 120px;">
-                          <input type="text" id="vacancyyeartotal" class="form-control" value="" onblur="saveyearvacdays();">
-                          <span class="input-group-addon">h</span>
-                        </div>
-                        
-                      </div>
-                      <!--<div class="form-group">
-                        <label for="vacancylastyearrest">congé à récupérer</label>
-                        
-                        <div class="input-group" style="width: 120px;">
-                          <input type="text" id="vacancylastyearrest" class="form-control" value="0" readonly="1">
-                          <span class="input-group-addon">h</span>
-                        </div>
-                        
-                      </div>-->
-                </div>
-              
-                        <table id="tbl_vacancy" class="table table-striped">
-                          
-                        </table>
-                    
-              
-              <div id="vacancystatus" style=" white-space: nowrap; width: 100%; text-align: center;"></div>  
-              
-            </div>
-          </div>
-              </div>
-<!-- EVENT  DLG begin -->
-<div class="modal fade" id="edit_event">
-          <div class="modal-dialog" style="width: 800px; max-width: 800px;">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title">Editer Activité</h4>
-              </div>
-              <div class="modal-body" style=" height: 550px; max-height: 550px ">
-<div id="frmeditevent">
-                  <input type="hidden" value="0" id="uuid" />
-                  <input type="hidden" value="" id="staffuuid" />
-                  <input type="hidden" value="" id="description" />
-                  <input type="hidden" value="" id="color" />
-                  <input type="hidden" value="" id="location" />
-                  <div class="form-inline row">
-                    <label for="staffname" class="col-md-2">Employé(e)</label>
-                    <input value="" id="staffname" readonly class="form-control col-md-8" style="width: 80%;" ></select>
-                  </div> 
-                  <div class="row">
-                    <div class="form-inline">
-                  <div id="date-container">
-                    <label class="col-md-3">Dates début / fin</label>
-                    <div id="dt_datefrom" class="input-group date">
-                      <input type="date" class="form-control" value="" limits="1" placeholder="dd.mm.yyyy" id="datefrom"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                    <div id="dt_dateto" class="input-group date">
-                      <input type="date" class="form-control" value="" limits="1" placeholder="dd.mm.yyyy" id="dateto"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                  </div>
-                  </div>
-                  </div>
-                  <div class="row">
-                  <div class="form-inline ">
-                    <label   class="col-md-3">heures début / fin</label>
-                    <div class="input-group bootstrap-timepicker time">
-                      <input type="text" class="form-control timepicker" placeholder="" value="" id="timefrom">
-                    </div>
-                    <div class="input-group bootstrap-timepicker time">
-                      <input type="text" class="form-control timepicker" placeholder="" value="" id="timeto">
-                    </div>
-                  </div>
-                  </div>
-                  <div class="row">
-                    
-                  </div>
-                  <div class="row">
-                    <div class="panel panel-default">
-                      <div class="panel-heading">
-                        <h3 class="panel-title">Récurrence
-                        <select id="freq" onchange="setfreq();">
-                          <option value="">pas de récurrence</option>
-                          <option value="daily">quotidienne</option>
-                          <option value="weekly">hebdomaire</option>
-                          <option value="monthly">mensuelle</option>
-                        </select>
-                        </h3>
-                      </div>
-                    <div class="panel-body">
-                        <div class="row">
-                        <div class="form-inline" id="freqinterval">
-                          <label>interval: tous les</label>
-                          <input class="form-control" type="number" id="interval" style="width: 50px;" value="1"/>
-                          <label id="lblfreq"></label>
-                        </div>
-                        </div>
-                        <div class="row" id="freqweekly">
-                           <div class="form-inline">
-                            <label>jours de semaine:</label>
-                            <!--<input class="col-md-2 form-control" style="width: 50px;" type="number" id="xtimes_num" value="1"/>-->
-                            <!--<label class="col-md-2">semaines,le </label>-->
-                            <div class="btn-group form-inline" id="weekly_byday" data-toggle="buttons">
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="weekly_byday_mo" value="MO" /> Lundi
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="weekly_byday_tu" value="TU" /> Mardi
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="weekly_byday_we" value="WE" /> Mercredi
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="weekly_byday_th" value="TH" /> Jeudi
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="weekly_byday_fr" value="FR" /> Vendredi
-                            </label>
-                            <label class="btn btn-primary">
-                            <input type="checkbox" id="weekly_byday_sa" value="SA" /> Samedi
-                            </label>
-                            <!--<label class="btn btn-primary">-->
-                            <!--  <input type="checkbox" id="weekly_byday_su" value="SU" /> Di-->
-                            <!--</label>-->
-                           </div>
-                           </div>
-                        </div>
-                        <div class="row" id="freqmonthly">
-                          <div class="form-inline">
-                            <div class="btn-group" data-toggle="buttons" id="monthly_by">
-                            <label class="btn btn-primary active">
-                              <input type="radio" id="pnl_monthly_byday" value="monthly_byday" checked="1"/> par jour de semaine
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="radio" id="pnl_monthly_bymonthday" value="monthly_bymonthday"/> par jour du mois
-                            </label>
-                            </div>
-                          </div>
-                          <div class="form-inline" id="freq_monthly_byday">
-                            <!--<label class="col-md-2">tous les</label>-->
-                            <!--<input class="col-md-2 form-control" type="number" id="xtimes_num"  style="width: 50px;" value="1"/>-->
-                            <!--<label class="col-formmd-2">mois, le </label><br/>-->
-                            <div class="btn-group" data-toggle="buttons" id="monthly_bydaypos">
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="monthly_bydaypos_1" value="1" /> 1ier
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="monthly_bydaypos_2" value="2" /> 2ième
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="monthly_bydaypos_3" value="3" /> 3ième
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="monthly_bydaypos_4" value="4" /> 4ième
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="monthly_bydaypos_5" value="5" /> 5ième
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="monthly_bydayppos_last-1" value="-1" /> dernier
-                            </label>
-                          </div>
-                            <br/>
-                            <div class="btn-group" data-toggle="buttons" id="monthly_bydaywday">
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="monthly_bydaywday_mo" value="MO" /> Lundi
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="monthly_bydaywday_tu" value="TU" /> Mardi
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="monthly_bydaywday_we" value="WE" /> Merecredi
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="monthly_bydaywday_th" value="TH" /> Jeudi
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="monthly_bydaywday_fr" value="FR" /> Vendredi
-                            </label>
-                            <label class="btn btn-primary">
-                            <input type="checkbox" id="monthly_bydaywday_sa" value="SA" /> Samedi
-                            </label>
-                            <!--<label class="btn btn-primary">-->
-                            <!--  <input type="checkbox" id="monthly_bydaywday_su" value="SU" /> Di-->
-                            <!--</label>-->
-                           </div>
-                            </div>
-                           <div class="form-inline" id="freq_monthly_bymonthday">
-                            <div class="btn-group" data-toggle="buttons" id="monthly_bymonthday">
-                            <label class="btn btn-primary" style="width: 40px; border-radius: 0px;">
-                              <input type="checkbox" id="monthly_bymonthday_1" value="1" />1
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_2" value="2" />2
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_3" value="3" />3
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_4" value="4" />4
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_5" value="5" />5
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_6" value="6" />6
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_7" value="7" />7
-                            </label>                      
-                            <br/>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_8" value="8" />8
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_9" value="9" />9
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_10" value="10" /> 10
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_11" value="11" /> 11
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_12" value="12" /> 12
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_13" value="13" /> 13
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_14" value="14" /> 14
-                            </label>
-                           
-                            <br/>
-                            
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_15" value="15" /> 15
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_16" value="16" /> 16
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_17" value="17" /> 17
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_18" value="18" /> 18
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_19" value="19" /> 19
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_20" value="20" /> 20
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_21" value="21" /> 21
-                            </label>
-                           
-                            <br/>
-                            
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_22" value="22" /> 22
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_23" value="23" /> 23
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_24" value="24" /> 24
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_25" value="25" /> 25
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_26" value="26" /> 26
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_27" value="27" /> 27
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_28" value="28" /> 28
-                            </label>
-                           
-                            <br/>
-                            
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_29" value="29" /> 29
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_31" value="31" /> 30
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_31" value="31" /> 31
-                            </label>
-                            <label class="btn btn-primary" style="width: 157px;" >
-                              <input type="checkbox" id="monthly_bymonthday_-1" value="-1" /> dernier
-                            </label>
-                            
-                            <br/>
-                            <label class="btn btn-primary" style="width: 138px;">
-                              <input type="checkbox" id="monthly_bymonthday_-2" value="-2" /> av.-dernier
-                            </label>
-                            <label class="btn btn-primary" style="width: 138px; border-radius: 0px;">
-                              <input type="checkbox" id="monthly_bymonthday_-3" value="-3" /> av.-av.-dernier
-                            </label>
-                           </div>
-                            
-                          </div>
-                          
-                          
-                          
-                          <br/>
-                          
-                        </div>
-                    </div>
-                    
-                  </div>
-                  </div>
-</div>
-                </div>
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" id="btndeleteevent" onclick="confirm_delete_event();" class="btn">Supprimer</button>
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Annuler</button> <button onclick="save_event();" id="btn_save_event" class="btn btn-primary">Accepter</button>
-              </div>
-              </div>
-            </div>
-          </div>
-        <div class="modal fade" id="confirm_delete_event">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-
-                <h4 class="modal-title">Supprimer Activité</h4>
-              </div><!-- dialog contents -->
-
-              <div class="modal-body">
-                Êtes vous sûre de supprimer cette Activité?<br>
-                
-              </div><!-- dialog buttons -->
-
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Non</button> <button onclick="delete_event();" class="btn btn-primary">Oui</button>
-              </div>
-            </div>
-          </div>
-        </div>
-<!-- EVENT DLG end -->
-        <div class="modal fade" id="edit_vacancy">
-          <div class="modal-dialog" style="width: 800px; max-width: 800px;">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title">Editer Congé</h4>
-              </div>
-              <div class="modal-body" style="height: 410px; max-height: 410px; ">
-<div id="frmeditvacancy">
-                  <input type="hidden" value="0" id="uuid" />
-                  <input type="hidden" value="" id="staffuuid" />
-                  <!--<div class="form-inline row">-->
-                  <!--  <label for="location" class="col-md-2">Lieu</label>-->
-                  <!--  <input type="text" value="" id="location"  nullable="true" class="form-control col-md-8" style="width: 80%;">-->
-                  <!--</div>-->
-                  
-                  <div class="form-inline row">
-                    <label for="dailyduration" class="col-md-3">Journée</label>
-                    <select value="" id="dailyduration"  class="form-control" onchange="setdailydurationfields();">
-                      <option value="1.0">Journée(s) complet(s)</option>
-                      <option value="0.4">demi(s) Journée(s)</option>
-                      <option value="0.">quelques heures</option>
-                    </select>
-                  </div>
-                  
-                    <div class="row form-inline">
-                    <label class="col-md-3">Date début</label>
-                    <div id="dt_vacdatefrom" class="input-group date">
-                      <input type="date" class="form-control" value="" limits="1" placeholder="dd.mm.yyyy" id="vacdatefrom"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                  </div>
-                  <div class="row form-inline">
-                    <label class="col-md-3">Date fin</label>
-                    <div id="dt_vacdateto" class="input-group date">
-                      <input type="date" class="form-control" value="" limits="1" placeholder="dd.mm.yyyy" id="vacdateto"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                  </div>
-                  
-                  <div id="ftimefrom" class="row form-inline">
-                  
-                    <label   class="col-md-3">heure début</label>
-                    <div class="input-group bootstrap-timepicker time">
-                      <input type="text" class="form-control timepicker" placeholder="" value="" id="timefrom">
-                    </div>
-                  </div>
-                  <div class="form-inline row" id="fhours">
-                    <label for="description" class="col-md-3">nbr. d'heures</label>
-                    <input type="text" value="" id="hours"  nullable="true" class="form-control col-md-6" style="width: 20%;">
-    				
-                  </div>
-                  
-                  <div class="form-inline row">
-                    <label for="type" class="col-md-3">Type de congé</label>
-                    <select id="type" value="">
-                      <option value="0">Congé normal</option>
-                      <option value="1">Congé expetionelle</option> 
-                      <option value="-1">Congé de maladie</option>
-                    </select>          
-                  </div>
-                  <div class="form-inline row">
-                    <label for="description" class="col-md-3">Description</label>
-                    <input type="text" value="" id="description"  nullable="true" class="form-control col-md-6" style="width: 70%;">
-    
-                  </div>
-                  <div class="row" style="height: 120px;"></div>
-                </div>
-              </div>
-              <div class="modal-footer">
-                <button aria-hidden="true" onclick="accept_vacancy();" data-dismiss="modal" id="btnacceptvacancy" class="btn">Valider Congé</button>
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Annuler</button>
-                <button onclick="save_vacancy();" class="btn btn-primary">Accepter</button>
-              </div>
-              </div>
-            </div>
-          </div>
-          <div class="modal fade" id="confirm_delete_vacancy">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-
-                <h4 class="modal-title">Supprimer Congé</h4>
-              </div><!-- dialog contents -->
-
-              <div class="modal-body">
-                Êtes vous sûre de supprimer ce congé?<br>
-                
-              </div><!-- dialog buttons -->
-
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Non</button> <button onclick="delete_vacancy();" class="btn btn-primary">Oui</button>
-              </div>
-            </div>
-          </div>
-        
-        
-      </div>
-  <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-  <script src="../../web/js/moment-with-locales.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
-  <script src="../../web/js/jquery.minicolors.min.js" type="text/javascript"></script>
-  <script src="../calendar/js/rrule.js" type="text/javascript"></script>
-  <script src="../calendar/js/nlp.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/encrypt.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/navigation.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/system.js" type="text/javascript"></script>
-  <script src="../../web/js/creorga.js" type="text/javascript"></script>
-  <script src="../../web/js/labels.js" type="text/javascript"></script>
-  <script src="js/coworker.js" type="text/javascript"></script>
-</body>
-</html>
diff --git a/modules/staff/coworker_basic.html b/modules/staff/coworker_basic.html
deleted file mode 100644
index 308e77c..0000000
--- a/modules/staff/coworker_basic.html
+++ /dev/null
@@ -1,332 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-
-  <title>Employé(e)</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="cache-control" content="max-age=0" />
-  <meta http-equiv="cache-control" content="no-cache" />
-  <meta http-equiv="expires" content="0" />
-  <meta http-equiv="expires" content="Tue, 01 Jan 1970 1:00:00 GMT" />
-  <meta http-equiv="pragma" content="no-cache" />
-  <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-  <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-  <link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/dataTables.bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-timepicker.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/glyphicons.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/jquery.minicolors.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/creorga.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-
-    <div class="container-fluid">
-        <br/>
-        <!--<span class="pagehead" id="pagehead">Collaborateur</span>&nbsp;-->
-          <input type="hidden" value="" id="staff_uuid">
-                <table style="width: 100%;">
-                  <tbody>
-                    <tr>
-                      <td style="width: 50%">
-                        <form>
-                        <div class="field form-inline">
-                          <label for="staff_surname">Nom / Prénom</label>
-                          <input type="text" value="" id="staff_surname" class="form-control">
-                          <input type="text" value="" id="staff_prename" class="form-control">
-                        </div>
-
-                        <div class="field">
-                          <label for="staff_address">Adresse</label> <input type="text" value="" id="staff_address" class="form-control">
-                        </div>
-
-                        <div class="field form-inline">
-                          <label for="staff_zip">CP / Ville</label>
-                          <input type="text" value="" size="5" id="staff_zip" class="form-control">
-                          <input type="text" value="" id="staff_city" class="form-control">
-                        </div>
-
-                        <div class="field">
-                          <label for="staff_country">Pays</label> <input type="text" value="" id="staff_country" class="form-control">
-                        </div>
-                        <div class="field form-inline">
-                          <label for="staff_phone">Tel / E-Mail</label>
-                          <input type="text" value="" id="staff_phone" class="form-control">
-                          <input type="text" value="" id="staff_email" class="form-control">
-                        </div>
-                        </form>
-                        
-                      </td>
-
-                      <td style="width: 50%;">
-                        <form>
-                        <div class="field form-inline" id="date-container">
-                          <label for="staff_entrydate" style="width: 200px;">Date d'entrée / de sortie</label>
-                          <div id="dt_staff_entrydate" class="input-group date">
-                            <input type="date" class="form-control" value="" limits="0" placeholder="dd.mm.yyyy"  id="staff_entrydate" readonly="1"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                          </div>
-                        
-                          <div id="dt_staff_exitdate" class="input-group date">
-                            <input type="date" class="form-control" value="" limits="0" placeholder="dd.mm.yyyy" id="staff_exitdate" readonly="1"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                          </div>
-                        </div>
-                  
-                        <div class="field">
-                          <label for="staff_jobtitle">Position / Contrat</label> <input type="text" value="" id="staff_jobtitle"  readonly="1" class="form-control">
-                        </div>
-                        <table style="width: 100%;">
-                        <tr><td style="width: 50%;"><div class="field">
-                          <label for="staff_weekhours">heures/semaine</label>
-                          <div class="input-group number">
-                            <input type="number" value="" id="staff_weekhours" style="text-align: right;" class="form-control"  readonly="1">
-
-                            <div class="input-group-addon">h</div>
-                          </div>
-                        </div></td><td style="width:50%"><div class="field" >
-                            <label for="staff_color">Couleur</label>
-                            <div class="input-group">
-                            <input type="text" id="staff_color" class="form-control" value=""  readonly="1">
-                            </div>
-                        </div></td></tr>
-                        </table>
-                        <div class="field">
-                          <label for="staff_iban">Compte Bancaire</label> <input type="text" value="" id="staff_iban" class="form-control">
-                        </div>
-                        <div class="field" id="pwddata">
-                          <label for="staff_password">Mot de Passe</label> 
-                          <div class="input-group">
-                          	<input type="password" value="" id="staff_password" class="form-control">
-                          	<div class="input-group-addon">(Min: 4 charatères)</div> 
-                          </div>
-                        </div>
-                        
-                        </form>
-                        
-                      </td>
-                    </tr>
-                  </tbody>
-                </table>
-              </div>
-              <div class="tabbable">
-            <ul class="nav nav-tabs" id="tabgrouphead">
-              <li><a data-toggle="tab" href="#activity">Organisation interne</a></li>
-              <li><a data-toggle="tab" href="#vacancy">Congé</a></li>
-            </ul>
-
-            <div class="tab-content">
-              
-              <div id="activity" class="tab-pane">
-                <div class="form-group form-inline">
-                      <label for="year_organisation">Année:</label>
-                      <div class="input-group">
-                        <select id="year_organisation" class="selyear">
-                          
-                        </select>
-                    </div>
-                
-                </div>
-                 <table id="tbl_activity" class="table table-striped">
-                  
-                </table>
-              </div>
-              <div id="vacancy" class="tab-pane">
-                <div class="form-group form-inline">
-                      <label for="year_vacancy">Année:</label>
-                      <div class="input-group">
-                        <select id="year_vacancy" class="selyear">
-                          
-                        </select>
-                    </div>
-                  <button onclick="dlg_vacancy({'uuid':''},'ins');" class="btn btn-primary" type="button"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span>&nbsp;demande de Congé</button>
-                      <div class="form-group">
-                        <label for="vacancy_total">congé normale</label>
-                        
-                        <div class="input-group" style="width: 120px;">
-                          <input type="text" id="vacancyyeartotal" class="form-control" value="" readonly="1">
-                          <span class="input-group-addon">h</span>
-                        </div>
-                        
-                      </div>
-                      <div class="form-group">
-                        <label for="vacancylastyearrest">congé à récupérer</label>
-                        
-                        <div class="input-group" style="width: 120px;">
-                          <input type="text" id="vacancylastyearrest" class="form-control" value="0" readonly="1">
-                          <span class="input-group-addon">h</span>
-                        </div>
-                        
-                      </div>
-                      
-                </div>
-              <table>
-                <tr>
-                    <td style="width: 800px; vertical-align: top;">
-                        <table id="tbl_vacancy" class="table table-striped">
-                  
-                        </table>
-                    </td>
-                    <td>
-                        <table style="width: 100%;" class="table table-striped table-bordered">
-                            <thead>
-                                <tr><th colspan="5">Congé <span id="lblyear"></span></th></tr>
-                                <tr><th>&nbsp;</th><th>&nbsp;</th><th colspan="2">planification</th><th>&nbsp;</th></tr>
-                                <tr><th>Type</th><th>ouvert</th><th>demandé</th><th>validé</th><th>pris</th></tr>
-                            </thead>
-                            <tbody>
-                                <tr>
-                                	<td>normale</td>
-                                	<td class="alignright" id="vacnopen">&nbsp;</td>
-                                	<td class="alignright" id="vacnasked">&nbsp;</td>
-                                	<td class="alignright" id="vacnplanned">&nbsp;</td>
-                                	<td class="alignright" id="vacntaken">&nbsp;</td>
-                                </tr>
-                                <tr>
-                                	<td>exceptionelle</td>
-                                	<td class="alignright" id="vaceopen">&nbsp;</td>
-                                	<td class="alignright" id="vaceasked">&nbsp;</td>
-                                	<td class="alignright" id="vaceplanned">&nbsp;</td>
-                                	<td class="alignright" id="vacetaken">&nbsp;</td>
-                                </tr>
-                                <tr>
-                                	<td>maladie</td>
-                                	<td class="alignright" id="vacmopen">&nbsp;</td>
-                                	<td class="alignright" id="vacmasked">&nbsp;</td>
-                                	<td class="alignright" id="vacmplanned">&nbsp;</td>
-                                	<td class="alignright" id="vacmtaken">&nbsp;</td>
-                                </tr>
-                            </tbody>
-                            <tfoot>
-                                <tr>
-                                	<th>total</th>
-                                	<th class="alignright" id="vactopen">&nbsp;</th>
-                                	<td class="alignright" id="vactasked">&nbsp;</td>
-                                	<th class="alignright"  id="vactplanned">&nbsp;</th>
-                                	<th class="alignright" id="vacttaken">&nbsp;</th>
-                                </tr>
-                            </tfoot>
-                        </table>
-                    </td>
-                </tr>
-              </table>    
-              
-              <div id="vacancystatus" style=" white-space: nowrap; width: 100%; text-align: center;"></div>  
-              
-            </div>
-          </div>
-              </div>
-
-        <div class="modal fade" id="edit_vacancy">
-          <div class="modal-dialog" style="width: 800px; max-width: 800px;">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title">Editer Congé</h4>
-              </div>
-              <div class="modal-body" style="height: 410px; max-height: 410px; ">
-<div id="frmeditvacancy">
-                  <input type="hidden" value="0" id="uuid" />
-                  <input type="hidden" value="" id="staffuuid" />
-
-                  
-                  <div class="form-inline row">
-                    <label for="dailyduration" class="col-md-3">Journée</label>
-                    <select value="" id="dailyduration"  class="form-control" onchange="setdailydurationfields();">
-                      <option value="1.0">Journée(s) complet(s)</option>
-                      <option value="0.4">demi(s) Journée(s)</option>
-                      <option value="0.">quelques heures</option>
-                    </select>
-                  </div>
-                  
-                    <div class="row form-inline">
-                    <label class="col-md-3">Date début</label>
-                    <div id="dt_vacdatefrom" class="input-group date">
-                      <input type="date" class="form-control" value="" limits="1" placeholder="dd.mm.yyyy" id="vacdatefrom"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                  </div>
-                  <div class="row form-inline">
-                    <label class="col-md-3">Date fin</label>
-                    <div id="dt_vacdateto" class="input-group date">
-                      <input type="date" class="form-control" value="" limits="1" placeholder="dd.mm.yyyy" id="vacdateto"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                  </div>
-                  
-                  <div id="ftimefrom" class="row form-inline">
-                  
-                    <label   class="col-md-3">heure début</label>
-                    <div class="input-group bootstrap-timepicker time">
-                      <input type="text" class="form-control timepicker" placeholder="" value="" id="timefrom">
-                    </div>
-                  </div>
-                  <div class="form-inline row" id="fhours">
-                    <label for="description" class="col-md-3">nbr. d'heures</label>
-                    <input type="text" value="" id="hours"  nullable="true" class="form-control col-md-6" style="width: 20%;">
-    				
-                  </div>
-                  <div class="form-inline row">
-                    <label for="type" class="col-md-3">Type de congé</label>
-                    <select id="type" value="">
-                      <option value="0">Congé normal</option>
-                      <option value="1">Congé expetionelle</option> 
-                      <option value="-1">Congé de maladie</option>
-                    </select>          
-                  </div>
-                  <div class="form-inline row">
-                    <label for="description" class="col-md-3">Description</label>
-                    <input type="text" value="" id="description"  nullable="true" class="form-control col-md-6" style="width: 70%;">
-    
-                  </div>
-                  <div class="row" style="height: 120px;"></div>
-                </div>
-              </div>
-              <div class="modal-footer">
-                
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Annuler</button>
-                <button onclick="save_vacancy();" class="btn btn-primary">Envoyer la demande</button>
-              </div>
-              </div>
-            </div>
-          </div>
-          <div class="modal fade" id="confirm_delete_vacancy">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-
-                <h4 class="modal-title">Supprimer Congé</h4>
-              </div><!-- dialog contents -->
-
-              <div class="modal-body">
-                Êtes vous sûre de supprimer ce congé?<br>
-                
-              </div><!-- dialog buttons -->
-
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Non</button> <button onclick="delete_vacancy();" class="btn btn-primary">Oui</button>
-              </div>
-            </div>
-          </div>
-        
-        
-      </div>
-  <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-  <script src="../../web/js/moment-with-locales.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
-  <!-- <script src="../../web/js/bootstrap-timepicker.min.js" type="text/javascript"></script> -->
-  <script src="../../web/js/bootstrap-multiselect.js" type="text/javascript"></script>
-  <script src="../calendar/js/rrule.js" type="text/javascript"></script>
-  <script src="../calendar/js/nlp.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/encrypt.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/navigation.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/system.js" type="text/javascript"></script>
-  <script src="../../web/js/creorga.js" type="text/javascript"></script>
-  <script src="../../web/js/labels.js" type="text/javascript"></script>
-  <script src="js/coworker_basic.js" type="text/javascript"></script>
-</body>
-</html>
diff --git a/modules/staff/img/staff.png b/modules/staff/img/staff.png
deleted file mode 100644
index 679ba253a3706d14c84a8a151bd206fcc2272aea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 597
zcmV-b0;>IqP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;0hTGD>&*|4Fv!I0pdwS
zK~z}7?Uuhw9YGMsKktxOXoxZTT$`Ycjcu?Dq)EU^5z_1*5QslwAz2I}q>#s&DqtXj
zc5aBEL{La?p}injDcHCHMFbHGlb2>6xrDpjJM}Qd`*yc8yYroyFEa;q)N#isg&dR-
zPl0bhYwUO*7}wIS7fL`GF$R3}xD0A(*KR_f!4te0m<Zfo0M=6OcLKkFl9txyCIB=6
zjR69WQi3l7&uRpe5$C`YE$!*QzEL1RHE&6k5p%#xpdIJ{%0M@;uZ(z*mq6a&&w=3-
zt+fEtg%WTX`%o^Lz-7RGm50F3YiM9PaHl^r0WIw@uoVbciS@t1z2}=PWo1Nb<`!sa
zhdkyZ;6v>D1<;eBN{hFpfe5(gvL6LD0&}H?0cFH`o?VdE(;q;uBe4hE&+=XjQcL^A
zH;PMuZ`rf~pMlp-3zZB(tB&L+;A>(9lo2h!TVOIrHdAgxzH(FVae~hwa0ZNMX*UyF
zpp1A2i~`~snm7Y0T3W4)c%Lx!A}wt-aUClohJg9B<&qOspwDSy6?o{*yMbdZ?fGA<
zlo3n7$}I)2CAAH_0cK<82f(hY@*ii9%5RDzU<Q~=u$?&Zevc>)5wPU>k5~qFiX;GV
j5wLd^O`wiC{(t-irfhTDukY7400000NkvXXu0mjf(318&

diff --git a/modules/staff/js/coworker.js b/modules/staff/js/coworker.js
deleted file mode 100644
index 9030fe7..0000000
--- a/modules/staff/js/coworker.js
+++ /dev/null
@@ -1,1150 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg )
-var pconfig = null;
-var delplan = null;
-var delvacation = null;
-var wh= window.innerHeight -440;
-var curdatediff = null;
-var redate = /\d\d.\d\d.\d\d\d\d/;
-var curfreq ={};
-var maxdayhours = null;
-var maxhalfdayhours = null;
-//var lictype = apppref.getpreference("support.lictype"); 
-
-function initdata() {
-  load_helpers();
-  var pdata = apppref.getpreference("pageconfig.coworker");
-  if (pdata != '') {
-    pconfig = JSON.parse(pdata);
-  }
-  //"get CoWorker cfg:" +JSON.stringify(pconfig) + "\n");
-  if (!pconfig.year) {
-    pconfig.year=new Date().getFullYear();
-  }
-  if (!pconfig.printlayout) {
-    pconfig.printlayout = 'list';
-    apppref.setpreference("pageconfig.coworker",pconfig);
-  }
-  var cdatasql = "SELECT jobtitle, prename, surname, address, zip, city, country, strftime('%d.%m.%Y',entrydate) as entrydate, strftime('%d.%m.%Y',exitdate) as exitdate, iban, bic, accountname, phone, email, uuid,color,weekhours,maxdayhours,case when password is not null and length(password) > 3 then 1 else 0 end as passwordset  FROM staff where uuid='" + pconfig.uuid + "';";
-  var cdata = appdb.dbquery(cdatasql);
-  cdata = cdata.sqldata[0];
-  for (var ci in cdata) {
-    if (document.getElementById("staff_" + ci)) {
-      document.getElementById("staff_" + ci).setAttribute('value', cdata[ci]);
-    }
-
-  }
-  
-  var crdata = appdb.dbquery("select stafflist from creche;");
-  if ((crdata) && (crdata.sqldata[0].stafflist == "1")){
-	  $("#pwddata").hide();
-  }
-  if (cdata) {
-    set_infoheader(cdata.prename + " " + cdata.surname);
-  }
-  $('#staff_color').minicolors({theme:'bootstrap'});
-  set_selectyears();
-  //load_staff_selection('staffuuid');
-
-  if (pconfig && pconfig.activetab) {
-    $('a[href="#'+pconfig.activetab+'"]').tab('show');
-  }else{
-    $('a[href="#vacancy"]').tab('show');
-    pconfig.activetab = 'vacancy';
-  }
-  
-//  if (pconfig && pconfig.vacancyunit){
-//    //dump("has vacancy unit:" + pconfig.vacancyunit + "\n");
-//    $('#vacancy_unit').val(pconfig.vacancyunit);
-//  }else {
-    pconfig.vacancyunit = "hours";
-//    $('#vacancy_unit').val("days");
-//  }
-    
-  $('#frmeditvacancy #vacdatefrom').on("blur",function (e) {
-    var ok = true;
-    if ($('#frmeditvacancy #vacdatefrom').val().match(redate)) {
-      $('#btn_save_vacancy').removeAttr("disabled");
-    }else {
-      ok = false;
-      $('#btn_save_vacancy').attr("disabled","1");
-    }
-    if ((ok == true) && ($('#frmeditvacancy #vacdateto').val() != '')) {
-      var tmpdt1 = encodeparam($('#frmeditvacancy #vacdatefrom').val(),'date');
-      var nd = new Date(tmpdt1.replace(/'/g,''));
-      var xd = new Date(nd.getFullYear(),nd.getMonth(),nd.getDate() + curdatediff);
-      $('#frmeditvacancy #vacdateto').val(xd.toLocaleFormat("%d.%m.%Y"));
-      var tmpdt2 = encodeparam($('#frmeditvacancy #vacdateto').val(),'date');
-      if (tmpdt1 > tmpdt2) {
-        $('#btn_save_vacancy').attr("disabled","1");
-      } else {
-        $('#btn_save_vacancy').removeAttr("disabled");
-      }
-      
-    }
-  });
-  $('#frmeditvacancy #vacdateto').on("blur",function (e) {
-    var ok = true;
-    if ($('#frmeditvacancy #vacdateto').val().match(redate)) {
-      $('#btn_save_vacancy').removeAttr("disabled");
-    }else {
-      ok = false;
-      $('#btn_save_vacancy').attr("disabled","1");
-    }
-    curdatediff=daysBetween(new Date(encodeparam($('#frmeditvacancy #vacdatefrom').val(),'date').replace(/'/g,'')),new Date(encodeparam($('#frmeditvacancy #vacdateto').val(),'date').replace(/'/g,''))); 
-    if ((ok == true) && ($('#frmeditvacancy #vacdateto').val() != '')) {
-      var tmpdt1 = encodeparam($('#frmeditvacancy #vacdatefrom').val(),'date');
-      var tmpdt2 = encodeparam($('#frmeditvacancy #vacdateto').val(),'date');
-      if (tmpdt1 > tmpdt2) {
-        $('#btn_save_vacancy').attr("disabled","1");
-      } else {
-        $('#btn_save_vacancy').removeAttr("disabled");
-      }
-      
-    }
-  });
-  $('#dailyduration').on('change',function(e){
-    if ($('#dailyduration').val() == "1.0"){
-    	$('#frmeditvacancy #hours').val(maxdayhours);
-    }
-    if ($('#dailyduration').val() == "0.4"){
-    	$('#frmeditvacancy #hours').val(maxhalfdayhours);
-    }
-  });
-  $('#staff_color').on('change',function(e){
-    saveonfocusout('staff_color');
-  });
-  //$('#frmeditevent #color').minicolors({theme:'bootstrap',position: 'bottom right'});
-  $("#weekly_byday :input").change(function() {
-    if (this.checked) {
-      this.setAttribute("checked",true);
-    }else {
-      this.removeAttribute("checked");
-    }
-
-});
-  $("#monthly_bydaypos :input").change(function() {
-
-    if (this.checked) {
-      this.setAttribute("checked",true);
-    }else {
-      this.removeAttribute("checked");
-    }
-
-});
-  $("#monthly_bydaywday :input").change(function() {
-
-    if (this.checked) {
-      this.setAttribute("checked",true);
-    }else {
-      this.removeAttribute("checked");
-    }
-
-});
-  $("#monthly_bymonthday :input").change(function() {
-
-    if (this.checked) {
-      this.setAttribute("checked",true);
-    }else {
-      this.removeAttribute("checked");
-    }
-
-});
-  $("#monthly_by :input").change(function() {
-    var xd = this.id.split("_");
-    curfreq.freqtype=xd[2];
-
-      this.setAttribute("checked",true);
-
-    $('#freq_monthly_byday').hide();
-    $('#freq_monthly_bymonthday').hide();
-    $('#pnl_monthly_byday').removeAttr("checked");
-    $('#pnl_monthly_bymonthday').removeAttr("checked");
-
-    $('#freq_' + this.value).show();
-
-});
-
-  $('#frmeditevent #datefrom').on("blur",function (e) {
-    var ok = true;
-    if ($('#frmeditevent #datefrom').val().match(redate)) {
-      $('#btn_save_event').removeAttr("disabled");
-    }else {
-      ok = false;
-      $('#btn_save_event').attr("disabled","1");
-    }
-    if ((ok == true) && ($('#frmeditevent #dateto').val() != '')) {
-      var tmpdt1 = encodeparam($('#frmeditevent #datefrom').val(),'date');
-      var tmpdt2 = encodeparam($('#frmeditevent #dateto').val(),'date');
-      if (tmpdt1 >= tmpdt2) {
-        $('#btn_save_event').attr("disabled","1");
-      } else {
-        $('#btn_save_event').removeAttr("disabled");
-      }
-      
-    }
-  });
-  $('#frmeditevent #dateto').on("blur",function (e) {
-    var ok = true;
-    if ($('#frmeditevent #dateto').val().match(redate)) {
-      $('#btn_save_event').removeAttr("disabled");
-    }else {
-      ok = false;
-      $('#btn_save_event').attr("disabled","1");
-    }
-    if ((ok == true) && ($('#frmeditevent #dateto').val() != '')) {
-      var tmpdt1 = encodeparam($('#frmeditevent #datefrom').val(),'date');
-      var tmpdt2 = encodeparam($('#frmeditevent #dateto').val(),'date');
-
-      if (tmpdt1 >= tmpdt2) {
-        $('#btn_save_event').attr("disabled","1");
-      } else {
-        $('#btn_save_event').removeAttr("disabled");
-      }
-      
-    }
-  });
-
-}
-
-$('.selyear').on( "change", function(e){ 
-  e.preventDefault();
-
-  $(".selyear").val($(this).val());
-  pconfig.year = $(this).val();
-  apppref.setpreference("pageconfig.coworker",pconfig);
-  if ($(this).attr('id') == "year_organisation") {
-    load_event_data();
-  }else if ($(this).attr('id') == "year_vacancy") {
-    load_table_vacancy();
-  }
-});
-
-$('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
-     var tn =  e.target.toString();
-     pconfig.activetab = tn.substring(tn.lastIndexOf("#")+1);
-     //dump(JSON.stringify(pconfig) + "\n");
-     apppref.setpreference("pageconfig.coworker",pconfig);
-     if (pconfig.activetab == 'activity') {
-       load_event_data();
-     }
-     if (pconfig.activetab == 'vacancy') {
-       load_table_vacancy();
-     }
- });
-
-function load_event_data() {
-  dump("Load event Table!\n");
-  var where = new Array();
-
-    where.push(" st.uuid in ('"+ pconfig.uuid + "')");
-
-  $("div.panel-daybody").html("");
-  var sql = "SELECT cal.uuid, cal.datefrom, cal.dateto, '<div style=\"display:none;\">' || strftime('%Y%m%d',cal.datefrom) ||'</div>' || strftime('%d.%m.%Y',cal.datefrom) AS tbldatefrom ,strftime('%Y%m%d',cal.datefrom) AS strdatefrom, strftime('%Y%m%d',cal.dateto)   AS strdateto,cal.timefrom, cal.timeto, cal.description, cal.location, cal.color, cal.freq, '[\"' || GROUP_CONCAT(sp.staffuuid,'\",\"') || '\"]' as staffuuid, GROUP_CONCAT(coalesce(st.surname,'') || ' ' || coalesce(st.prename,''), '<br/>' ) as staffnames ,'[\"' || GROUP_CONCAT(st.color,'\",\"') || '\"]' as staffcolors from eventcalendar cal " +" join staffplanning sp on (cal.uuid=sp.eventcalendaruuid " + " AND sp.staffuuid in ('"+ pconfig.uuid +"')) left join staff st on (sp.staffuuid=st.uuid) "+
-  " where (cal.datefrom between '" + $('#year_organisation').val() + "-01-01' and '" + $('#year_organisation').val() + "-12-31' and (cal.dateto >= '" + $('#year_organisation').val() + "-01-01' or cal.dateto is null)) or (cal.dateto between '" + $('#year_organisation').val() + "-01-01' and '" + $('#year_organisation').val() + "-12-31' and cal.datefrom < '" + $('#year_organisation').val() + "-01-01') or ((cal.datefrom <= '" + $('#year_organisation').val() + "-01-01') and ((cal.dateto >= '" + $('#year_organisation').val() + "-12-31') or cal.dateto is null)) "+ ((where.length > 0)?" AND (" + where.join(" or ") + ")":"")+"  group by cal.uuid order by cal.datefrom,cal.dateto;";
-  
-  var caldata = appdb.dbquery(sql);
-
-  caldata = caldata.sqldata;
-  
-  var headerdata = getlabels("act,datefrom,hours,recurrance");
-  $("#tbl_activity").html("");
-  
-  var hrow = headerdata;
-  var tdclass= new Array();
-  var tblheader = '<tr>';
-
-  for (var h=0;h<hrow.length;h++){
-    tdclass.push(headerdata[h].class);
-    tblheader += '<th class="' + headerdata[h].class +'">'+ headerdata[h].title+'</th>';
-  }
-  tblheader += '</tr>';
-  
-  $("#tbl_activity").append("<thead>" + tblheader + "</thead>");
-  $("#tbl_activity").append("<tbody>");
-  var tblbody = [];
-  for (var c in caldata) {
-    var tblrow = "<tr>";
-    tblrow += '<td class="noprint"><button type="button" class="btn btn-primary" onclick="dlg_event({uuid:\''+caldata[c].uuid+'\'},\'upd\');" title="editer"><span class="glyphicon glyphicon-pencil"></span></button></td>';
-    //tblrow += "<td><span style=\"display: none;\">"+caldata[c].description+"</span><strong style=\"color:"+ caldata[c].color +"\">" + caldata[c].description + "</strong></td>";
-    //tblrow += "<td>" + caldata[c].staffnames + "</td>";
-    tblrow += "<td>" + caldata[c].tbldatefrom + "</td>";
-    tblrow += "<td>" + caldata[c].timefrom + "- " + caldata[c].timeto + "</td>";
-
-    var freq2 = caldata[c].freq;
-    if (freq2 != '') {
-
-      freq2 += ';DTSTART='+caldata[c].strdatefrom + 'T000000Z';
-      if (caldata[c].dateto != ''){
-        freq2 += ';UNTIL='+caldata[c].strdateto + 'T000000Z';
-      }
-    }
-
-    try {
-
-    var rule2 = RRule.fromString(freq2);
-
-    
-    tblrow += "<td>" + rule2.toText() + "</td>";
-
-    } catch (ex){
-      //"ERROR! loading data!" + ex  + " FREQ:" + freq2 + "\n");
-    }
-    tblrow += "</tr>";
-    tblbody.push(tblrow);
-  }
-  
-  //load table
-  $("#tbl_activity").append(tblbody.join(''));
-  $("#tbl_activity").append("</tbody>");
-
-  tblcal = $("#tbl_activity").dataTable({
-    "language": {
-      "url": "../../web/js/locale/datatable_fr.json"
-    },
-    "paging": false,
-    "scrollY": wh + "px",
-    "scrollCollapse": true,
-    "ordering": true,
-    "info": false,
-    "filter": false,
-    "destroy": true
-  });
-  
-  //$('#tbl_activity').on( 'search.dt', function () {
-  //  
-  //  pconfig.filter = tblcal.api().search();
-  //
-  //  apppref.setpreference("pageconfig.calactivity",pconfig);
-  //} );
-
-  //$('#tbl_activity').on( 'order.dt', function () {
-  //  pconfig.order= tblcal.fnSettings().aaSorting;
-  //
-  //  apppref.setpreference("pageconfig.calactivity",pconfig);
-  //  
-  //} );
-  
-//    if (pconfig.filter) {
-//      tblcal.fnFilter(pconfig.filter);
-//    }
-    if (pconfig.order) {
-      tblcal.fnSort(pconfig.order);
-    }
-    if (/*(!pconfig.filter) && */ (!pconfig.order)) {
-      tblcal.fnDraw();
-    }
-}
-
-function load_table_vacancy() {
-	//maxdayhours = (parseFloat($("#staff_weekhours").val())/5).toFixed(2);
-  //maxhalfdayhours = (maxdayhours/2).toFixed(2);
-  var yearvacanysql = "select hours from staffvacancydays where staffuuid='"+ pconfig.uuid+"' and vacancyyear='"+ $("#year_vacancy").val() +"';";
-  var yearvac = appdb.dbquery(yearvacanysql);
-  var nvyear = "";
-  //jsdump("XXSQL:" + JSON.stringify(yearvac) + "\n");
-  if (yearvac.sqldata){
-    nvyear = yearvac.sqldata[0].hours;
-  }
-  $("#vacancyyeartotal").val(nvyear);
-  var vacdatasql = "SELECT '<button type=\"button\" class=\"btn btn-primary\" onclick=\"dlg_vacancy({''uuid'':'''|| uuid || '''},''upd'');\"><span class=\"glyphicon glyphicon-pencil\"></span></button>" +
-  "<button type=\"button\" class=\"btn btn-danger\" onclick=\"confirm_delete_vacancy(''' || uuid || ''');\"><span class=\"glyphicon glyphicon-remove\"></span></button>' AS action," + "vacyear," +
-  "strftime('%d.%m.%Y', datefrom) as datefrom,strftime('%d.%m.%Y', dateto) as dateto,printf(\"%.2f\",hours) || 'h' as dayhours,description," +
-  "case when type=0 and accepted != '1' then printf(\"%.2f\",case when hours < maxdayhours  then hours when hours > maxdayhours  then maxdayhours else hours end) || 'h' else '' end as thnormalnv," +
-  "case when type=1 and accepted != '1' then printf(\"%.2f\",case when hours < maxdayhours  then hours when hours > maxdayhours  then maxdayhours else hours end) || 'h' else '' end as thextranv," +
-  "case when type=-1 and accepted != '1' then printf(\"%.2f\",case when hours < maxdayhours  then hours when hours > maxdayhours  then maxdayhours else hours end) || 'h' else '' end as thillnv," +
-  "case when type=0  and accepted = '1'then printf(\"%.2f\",case when hours < maxdayhours  then hours when hours > maxdayhours  then maxdayhours else hours end) || 'h' else '' end as thnormalval," +
-  "case when type=1  and accepted = '1' then printf(\"%.2f\",case when hours < maxdayhours  then hours when hours > maxdayhours  then maxdayhours else hours end) || 'h' else '' end as thextraval," +
-  "case when type=-1  and accepted = '1' then printf(\"%.2f\",case when hours < maxdayhours  then hours when hours > maxdayhours  then maxdayhours else hours end) || 'h' else '' end as thillval," +
-  "case when type=0 then 'normal' when type=1 then 'exceptionnelle' when type=-1 then 'maladie' end as vacancytype,case when accepted='1' and type != -1 then '<span style=\"font-weight: bold; color: green;\">OUI</span>' else '<span style=\"font-weight: bold; color: red\">NON</span>' end as accepted FROM (" +
-  "select vc.uuid,vc.vacyear,vc.datefrom,vc.dateto,vc.type,vc.description,vc.accepted," +
-  "((strftime('%s',vc.dateto) - strftime('%s',vc.datefrom)) /84600) + 1 as days," +
-  "((((strftime('%s',vc.dateto) - strftime('%s',vc.datefrom)) /84600) + 1) / 7) * (7 - (st.weekhours / st.maxdayhours)) as day_to_much," +
-  "(select count(v.vacancydate) from vacancy v where v.vacancydateto is null and strftime('%s',v.vacancydate) not in ('0','6') and v.vacancydate between vc.datefrom and vc.dateto) as vdays,st.weekhours,st.weekhours / maxdayhours as days_per_week,vc.timefrom,vc.timeto,st.maxdayhours, " +
-  "cast(cast(strftime(\"%s\",vc.timeto) as int)- cast(strftime(\"%s\",vc.timefrom) as int) as real)/3600 as hours " +
-  "from vacancycalendar vc join staff st on (vc.staffuuid=st.uuid) where vc.staffuuid='"+ pconfig.uuid+"' and vc.vacyear=" + pconfig.year+");";
-  //   var vacdatasql = "SELECT '<button type=\"button\" class=\"btn btn-primary\" onclick=\"dlg_vacancy({''uuid'':'''|| uuid || '''},''upd'');\"><span class=\"glyphicon glyphicon-pencil\"></span></button> <button type=\"button\" class=\"btn btn-danger\" onclick=\"confirm_delete_vacancy(''' || uuid || ''');\"><span class=\"glyphicon glyphicon-remove\"></span></button>' AS action,vacyear," +
-//    "CASE WHEN datefrom!=dateto THEN 'du:' || strftime('%d.%m.%Y', CASE WHEN datefrom < DATE('"+ pconfig.year +"-01-01') THEN DATE('"+ pconfig.year +"-01-01') ELSE datefrom END) || '<br/>au: ' || strftime('%d.%m.%Y', CASE WHEN dateto > DATE('"+ pconfig.year +"-12-31') THEN DATE('"+ pconfig.year +"-12-31') ELSE dateto END) ELSE strftime('%d.%m.%Y',datefrom) END AS planningdaterange," +
-//   //"case when datefrom!=dateto then strftime('%d.%m.%Y',case when datefrom < date('"+ pconfig.year +"-01-01') then 'de: ' date('"+ pconfig.year +"-01-01') else datefrom end) || '<br/>à: ' || strftime('%d.%m.%Y',case when dateto > date('"+ pconfig.year +"-12-31') then date('"+ pconfig.year +"-12-31') else dateto end) else strftime('%d.%m.%Y',datefrom) end as planningdaterange, " +
-// "case when  timefrom=timeto then '"+ maxdayhours+ "' || 'h' else printf(\"%.2f\",cast(cast(strftime(\"%s\",timeto) as int)- cast(strftime(\"%s\",timefrom) as int) as real)/3600) || 'h' || case when timefrom!='00:00' then '<br/> à partir de ' || timefrom else '' end end as hourrange," +
-//    //"case when  timefrom=timeto then '8h' when  (cast(substr(timeto,1,2) as int) - cast(substr(timefrom,1,2) as int))= 4 then '4h' || case when timefrom!='00:00' then '<br/> à partir de ' || timefrom else '' end else (cast(substr(timeto,1,2) as int) - cast(substr(timefrom,1,2) as int)) || 'h' || case when timefrom!='00:00' then '<br/> à partir de ' || timefrom else '' end end as hourrange, "+ 
-// "description, " +
-// "case when type=0 then 'normal' when type=1 then 'exceptionnelle' when type=-1 then 'maladie' end as vacancytype,case when accepted='1' and type != -1 then '<span style=\"font-weight: bold; color: green;\">OUI</span>' else '<span style=\"font-weight: bold; color: red\">NON</span>' end as accepted FROM vacancycalendar where staffuuid='"+ pconfig.uuid +"' and (strftime('%Y',dateto)='"+ pconfig.year +"' or strftime('%Y',datefrom)='"+ pconfig.year +"');";
-//jsdump("XXSQL:" + vacdatasql + "\n");
-var vacdata = appdb.dbqueryarray(vacdatasql);
-//jsdump("XXSQL:" + JSON.stringify(vacdata) + "\n");
-  
-  $('#tbl_vacancy').html("");
-  //$('#tbl_vacancy').append('<tfoot><tr><th></th><th colspan="4" style="text-align: center;"></th></tr></tfoot>');
-  //getlastyearsrest();
-  //calcvacancy();
-  //vacdata.sqlhead.join(",") + "\n");
-  var headerdata = getlabels(vacdata.sqlhead.join(","));
-  
-  
-  $("#tbl_vacancy").dataTable({
-    "language": {
-      "url": "../../web/js/locale/datatable_fr.json"
-    },
-    "data": vacdata.sqldata,
-    "columns": headerdata,
-    "paging": false,
-    "scrollY": wh + "px",
-    "scrollCollapse": true,
-    "ordering": true,
-    "info": false,
-    "filter": false,
-    "destroy": true
-  });
-  
-}
-
-function dlg_vacancy(uuid, type) {
-	//select weekhours/5 = max daily hours
-	maxdayhours = (parseFloat($("#staff_weekhours").val())/5).toFixed(2);
-	maxhalfdayhours = (maxdayhours/2).toFixed(2);
-    var evdata = {
-      uuid: 0,
-      description: '',
-      vacdatefrom:new Date().toLocaleFormat("%d.%m.%Y"),
-      vacdateto:new Date().toLocaleFormat("%d.%m.%Y"),
-      staffuuid:[pconfig.uuid],
-      timefrom: '00:00',
-      hours: maxdayhours,
-      type:'0',
-      //dailyduration:'1.0',
-      //hourmax: whr
-    };
-    
-    if (type == 'upd') {
-    	var evsql = "select uuid,vacdatefrom,vacdateto,timefrom,description,staffuuid,case when hours = '0.00' then '" + maxdayhours +"' else hours end as hours,accepted from (SELECT uuid, strftime(\"%d.%m.%Y\",datefrom) as vacdatefrom, strftime(\"%d.%m.%Y\",dateto) as vacdateto, timefrom, description, '"+pconfig.uuid+"' as staffuuid,type, printf(\"%.2f\",cast((cast(strftime(\"%s\",timeto) as int)- cast(strftime(\"%s\",timefrom) as int))/3600 as real)) as hours,accepted FROM vacancycalendar where uuid='" + uuid.uuid + "');";
-     //var evsql = "SELECT uuid, strftime(\"%d.%m.%Y\",datefrom) as vacdatefrom, strftime(\"%d.%m.%Y\",dateto) as vacdateto, timefrom, description, '"+pconfig.uuid+"' as staffuuid,type, case when timefrom!=timeto then '0.' || (cast(substr(timeto,1,2) as int) - cast(substr(timefrom,1,2) as int)) else 1.0 end as dailyduration,null as hours,accepted FROM vacancycalendar where uuid='" + uuid.uuid + "';";
-      //dump("EVSQL: " + evsql + "\n");
-      evdata = appdb.dbquery(evsql);
-      evdata = evdata.sqldata[0];
-      if (evdata.type == -1){
-        $("#btnacceptvacancy").hide();
-      }else {
-        $("#btnacceptvacancy").show();
-      }
-      if (evdata.hours >= maxdayhours) {
-    	  evdata.hours=maxdayhours;
-    	  $('#dailyduration select').val("1.0");
-      } else if (evdata.hours == maxhalfdayhours){
-    	  $('#dailyduration select').val("0.4");
-      } else {
-    	  $('#dailyduration select').val("0.");
-      }
-
-    }else {
-    	$('#dailyduration select').val("1.0");
-    }
-    for (var w in evdata) {
-      if ((w == 'datefrom') || (w == 'dateto')) {
-        w='vac' + w;
-      }
-      
-      if ($("#frmeditvacancy #" + w)) {
-    	 //dump(w + "->"+evdata[w]+"\n");
-    	  if (w == "type"){
-    		  $("#frmeditvacancy #" + w + " select").val(evdata[w]);
-    	  } else {
-    		  $("#frmeditvacancy #" + w).val(evdata[w]);  
-    	  }
-    	  
-        
-      }
-      
-    }
-    
-    setdailydurationfields();
-    $("#edit_vacancy").modal('show');
-}
-
-function confirm_delete_vacancy(uuid) {
-  delvacation = uuid;
-  $("#confirm_delete_vacancy").modal('show');
-  return false;
-}
-
-function delete_vacancy() {
-  var delsql = "DELETE FROM vacancycalendar where uuid='" + delvacation+"';";
-  appdb.dbexec(delsql);
-  load_table_vacancy();
-  delvacancy=null;
-  $("#confirm_delete_vacancy").modal('hide');
-  
-  return false;
-}
-
-function setdailydurationfields() {
-  var dd = $('#dailyduration :selected').val();
-  if (dd=='1.0') {
-    //$("#ftimefrom").hide();
-    $("#hours").prop("disabled",true);
-  }else if (dd=='0.4') {
-    //$("#ftimefrom").show();
-    $("#hours").prop("disabled",true);
-  }else if (dd=='0.') {
-    //$("#ftimefrom").show();
-    $("#hours").prop("disabled",false);
-  }
-}
-
-function save_vacancy() {
-  var type = 'ins';
-  var cuuid = "";
-  if ($("#frmeditvacancy #uuid").val() != 0) {
-    type = 'upd';
-    cuuid = $("#frmeditvacancy #uuid").val();
-  }
-  var evsvdata = {
-		  uuid:cuuid,
-		  datefrom: $("#frmeditvacancy #vacdatefrom").val(),
-		  dateto: $("#frmeditvacancy #vacdateto").val(),
-		  timefrom: $("#frmeditvacancy #timefrom").val(),
-		  hours: $("#frmeditvacancy #hours").val(),
-		  description: $("#frmeditvacancy #description").val(),
-		  staffuuid: $("#frmeditvacancy #staffuuid").val(),
-      type: $("#frmeditvacancy #type").val()
-  }
-  var savesql = "";
-  if (type == 'ins') {
-	  savesql = "INSERT INTO vacancycalendar (uuid, datefrom, dateto, timefrom, timeto, description, staffuuid, type,vacyear) VALUES "
-        +"('" + appdb.generate_uuid() + "', date("+encodeparam(evsvdata.datefrom, 'date')+"), date("+encodeparam(evsvdata.dateto, 'date')+"), "+encodeparam(evsvdata.timefrom, 'text')+", strftime(\"%H:%M\",time("+encodeparam(evsvdata.timefrom, 'text')+",'+"+evsvdata.hours+" hours')), "+encodeparam(evsvdata.description, 'text')+", "+encodeparam(evsvdata.staffuuid, 'text')+","+evsvdata.type+","+encodeparam(evsvdata.datefrom, 'year')+");";
-  } else {
-      savesql = "UPDATE vacancycalendar SET vacyear=" + encodeparam(evsvdata.datefrom, 'year') + ", datefrom = date("+encodeparam(evsvdata.datefrom, 'date')+"), dateto = date("+encodeparam(evsvdata.dateto, 'date')+"), timefrom = "+encodeparam(evsvdata.timefrom, 'text')+", timeto = strftime(\"%H:%M\",time("+encodeparam(evsvdata.timefrom, 'text')+",'+"+evsvdata.hours+" hours')), description = "+encodeparam(evsvdata.description, 'text')+", staffuuid = "+encodeparam(evsvdata.staffuuid, 'text')+", type = "+evsvdata.type+" WHERE uuid = '"+evsvdata.uuid+"';";
-  }
-  //dump("VACSAVESQL:" + savesql + "\n");
-  appdb.dbexec(savesql);
-  load_table_vacancy();
-
-  $("#frmeditvacancy #uuid").val("0");
-  $("#edit_vacancy").modal('hide');
-}
-
-
-function set_selectyears() {
-   
-  var years = appdb.dbquery("select strftime('%Y',coalesce(min(entrydate),date('now','-1 year'))) as minyear, strftime('%Y',date('now', '+1 year')) as maxyear  from staff where uuid='"+pconfig.uuid+"';");
-  var minyear = parseInt(years.sqldata[0].minyear);
-  var maxyear = parseInt(years.sqldata[0].maxyear);
-  for (var y=minyear;y<=maxyear;y++){
-    
-    var sel = "";
-    if (y == pconfig.year) {
-      sel=' selected="1" ';
-      
-    }
-    
-    $(".selyear").append("<option value=\""+y+"\""+sel+">"+y+"</option>");
-  }
-  
-}
-
-// function calcvacancy() {
-//   //"Calc Vacancy Data!\n");
-//   var csel = "select days,hours from staffvacancydays where staffuuid='"+pconfig.uuid+"' and vacancyyear='"+pconfig.year+"';";
-//   //"SQL:"+ csel +"\n");
-//   var cnum = appdb.dbquery(csel);
-  
-//   if (cnum.sqldata.length > 0) {
-//     if (pconfig.vacancyunit == "hours"){
-//       if ((!cnum.sqldata[0].hours) || (cnum.sqldata[0].hours === "")){
-//         cnum.sqldata[0].hours = cnum.sqldata[0].days * 8;
-//       }
-//       $('#vacancyyeartotal').val(cnum.sqldata[0].hours);
-//     }else{
-//       $('#vacancyyeartotal').val(cnum.sqldata[0].days);  
-//     }
-    
-//   }else {
-//     $('#vacancyyeartotal').val("");
-//   }
-//   var vdays = (($('#vacancyyeartotal').val() === "")?"":cnum.sqldata[0].days);
-//   var weekhours = $('#staff_weekhours').val();
-//   if (vdays === '') {
-//     $('#vacancystatus').html('<div class="alert alert-danger" style="padding: 2px;">Pas de jours de congés configuré pour l\'année '+ pconfig.year+'!</div>');
-//     return;
-//   }else if (weekhours === '') {
-//     $('#vacancystatus').html('<div class="alert alert-danger">Pas de heures par semaine configurées!</div>');
-//     return;
-//   }
-
-//   var vcalcsql = "select printf(\"%.2f\",(sum(dayhours) / ("+weekhours+"/5))) as days, printf(\"%.2f\",SUM(dayhours)) as hours,"+
-//   "taken,type,accepted from (" +
-//   "select vd.daydate,case when daydate <= date('now')   then 1 else 0 end as taken,case when vc.timefrom=vc.timeto then cast ("+weekhours+"/5 as real) else cast(cast(strftime(\"%s\",vc.timeto) as int)- cast(strftime(\"%s\",vc.timefrom) as int) as real)/3600 end as dayhours,type,case when type != -1 then accepted else '1' end as accepted "+
-//   "from vacancycalendar vc left join ( "+ 
-//   "select daydate from ( ";
-//   var df = new Date(pconfig.year,0,1);
-//   var dt = new Date(pconfig.year,11,31);
-//   var yd = [];
-//   for (var dx=df;dx<=dt;dx.setDate(dx.getDate()+1)){
-//     yd.push("select date('"+dx.toLocaleFormat('%Y-%m-%d')+"') as daydate");
-//   }
-//   vcalcsql += yd.join(" UNION ") + 
-//   ") yd where strftime('%w',daydate) not in ('0','6') and daydate not in (select vacancydate from vacancy where vacancydate between '"+pconfig.year+"-01-01' and '"+pconfig.year+"-12-31' and vacancydateto is null) " +
-//   ") vd on (vd.daydate between vc.datefrom and vc.dateto) " +
-//   "left join staffvacancydays svd on (vc.staffuuid=svd.staffuuid) " +
-//   "where vc.staffuuid='"+pconfig.uuid+ "' and daydate is not null group by daydate) group by type,taken,accepted;";
-//   //dump("SQL2:" + vcalcsql + "\n");
-//   var vcalc = appdb.dbquery(vcalcsql);
-//   vcalc = vcalc.sqldata;
-//   //dump(JSON.stringify(vcalc)+ "\n");
-//   vhours = vdays * 8;
-//   var vac = {};
-//   $("#lblyear").html(pconfig.year);
-//   vac.normal = {taken:{hours:0,days:0},open:{vhours:parseFloat(vhours), days:parseFloat(vdays)},accepted:{hours:0,days:0},asked:{hours:0,days:0}};
-//   vac.extra = {taken:{hours:0,days:0},open:{hours:0, days:0},accepted:{hours:0,days:0},asked:{hours:0,days:0}};
-//   vac.ill = {taken:{hours:0,days:0},open:{hours:0, days:0},accepted:{hours:0,days:0},asked:{hours:0,days:0}};
-//   vac.total = {taken:{hours:0,days:0},open:{hours:0, days:0},accepted:{hours:0,days:0},asked:{hours:0,days:0}};
-//   //dump(JSON.stringify(vac) + "\n");
-//   if (vcalc) {
-//     for (var c in vcalc){
-//       if (vcalc[c].type == '0' ){ //normal
-//         if (vcalc[c].taken == '1'){
-//             if  (vcalc[c].accepted=='1'){
-//         	vac.normal.taken.days = vac.normal.taken.days + parseFloat(vcalc[c].days);
-//                 vac.normal.taken.hours = vac.normal.taken.hours + parseFloat(vcalc[c].hours);
-//             } else {
-//         	vac.normal.asked.days = vac.normal.asked.days + parseFloat(vcalc[c].days);
-//                 vac.normal.asked.hours = vac.normal.asked.hours + parseFloat(vcalc[c].hours);
-//             }
-          
-//         } else if (vcalc[c].taken == '0') {
-//           if (vcalc[c].accepted=='1'){
-//               vac.normal.accepted.days = vac.normal.accepted.days + parseFloat(vcalc[c].days);
-//               vac.normal.accepted.hours = vac.normal.accepted.hours + parseFloat(vcalc[c].hours);
-//           } else {
-//               vac.normal.asked.days = vac.normal.asked.days + parseFloat(vcalc[c].days);
-//               vac.normal.asked.hours = vac.normal.asked.hours + parseFloat(vcalc[c].hours);
-//           }
-          
-//         }
-//         vac.normal.open.days = parseFloat(vdays) - vac.normal.taken.days - vac.normal.accepted.days - vac.normal.asked.days;
-//         vac.normal.open.hours = parseFloat(vhours) - vac.normal.taken.hours - vac.normal.accepted.hours - vac.normal.asked.hours;
-//         //total
-        
-//       } else if (vcalc[c].type == '1' ){ //extra
-//         if (vcalc[c].taken == '1'){
-//             if  (vcalc[c].accepted=='1'){
-//         	vac.extra.taken.days =  vac.extra.taken.days + parseFloat(vcalc[c].days);
-//         	vac.extra.taken.hours = vac.extra.taken.hours + parseFloat(vcalc[c].hours);
-//             } else {
-//         	vac.extra.asked.days = vac.extra.asked.days + parseFloat(vcalc[c].days);
-//                 vac.extra.asked.hours = vac.extra.asked.hours + parseFloat(vcalc[c].hours);
-//             }
-//         } else if (vcalc[c].taken == '0'){
-//             if (vcalc[c].accepted=='1'){
-//         	vac.extra.accepted.days = vac.extra.accepted.days + parseFloat(vcalc[c].days);
-//         	vac.extra.accepted.hours = vac.extra.accepted.hours + parseFloat(vcalc[c].hours);
-//             } else {
-//         	vac.extra.asked.days = vac.extra.asked.days + parseFloat(vcalc[c].days);
-//                 vac.extra.asked.hours = vac.extra.asked.hours + parseFloat(vcalc[c].hours);
-//             }
-//         }
-//         vac.extra.open.days = 0;
-//         vac.extra.open.hours = 0;
-//       } else if (vcalc[c].type == '-1' ){ //ill
-//         if (vcalc[c].taken == '1'){
-//           vac.ill.taken.days =  vac.ill.taken.days + parseFloat(vcalc[c].days);
-//           vac.ill.taken.hours = vac.ill.taken.hours + parseFloat(vcalc[c].hours);
-//         } else if (vcalc[c].taken == '0'){
-//             if  (vcalc[c].accepted=='1'){
-//         	vac.ill.accepted.days = vac.ill.accepted.days + parseFloat(vcalc[c].days);
-//         	vac.ill.accepted.hours = vac.ill.accepted.hours + parseFloat(vcalc[c].hours);
-//             } else {
-//         	vac.ill.asked.days = vac.ill.asked.days + parseFloat(vcalc[c].days);
-//                 vac.ill.asked.hours = vac.ill.asked.hours + parseFloat(vcalc[c].hours);
-//             }
-//         }
-//         vac.ill.open.days = 0;
-//         vac.ill.open.hours = 0;
-
-//       }
-//       vac.total.taken.days = vac.normal.taken.days + vac.extra.taken.days + vac.ill.taken.days;
-//       vac.total.taken.hours = vac.normal.taken.hours + vac.extra.taken.hours + vac.ill.taken.hours;
-//       vac.total.open.days = vac.normal.open.days + vac.extra.open.days + vac.ill.open.days;
-//       vac.total.open.hours = vac.normal.open.hours + vac.extra.open.hours + vac.ill.open.hours;
-//       vac.total.accepted.days = vac.normal.accepted.days + vac.extra.accepted.days + vac.ill.accepted.days;
-//       vac.total.accepted.hours = vac.normal.accepted.hours + vac.extra.accepted.hours + vac.ill.accepted.hours;
-//       vac.total.asked.days = vac.normal.asked.days + vac.extra.asked.days + vac.ill.asked.days;
-//       vac.total.asked.hours = vac.normal.asked.hours + vac.extra.asked.hours + vac.ill.asked.hours;
-//     }
-//     //JSON.stringify(vac) + "\n");
-//     if (pconfig.vacancyunit == 'days'){
-//       $("#vacnopen").html(((vac.normal.open.days && vac.normal.open.days != 0)?vac.normal.open.days.toFixed(2)+" j":"&nbsp;"));
-//       $("#vacntaken").html(vac.normal.taken.days.toFixed(2)+" j");
-//       $("#vacnasked").html(vac.normal.asked.days.toFixed(2)+" j");
-//       $("#vacnplanned").html(vac.normal.accepted.days.toFixed(2)+" j");
-    
-//       $("#vaceopen").html("&nbsp;");
-//       $("#vacetaken").html(vac.extra.taken.days.toFixed(2)+" j");
-//       $("#vaceasked").html(vac.extra.asked.days.toFixed(2)+" j");
-//       $("#vaceplanned").html(vac.extra.accepted.days.toFixed(2)+" j");
-    
-//       $("#vacmopen").html("&nbsp;");
-//       $("#vacmtaken").html(vac.ill.taken.days.toFixed(2)+" j");
-//       $("#vacmasked").html(vac.ill.asked.days.toFixed(2)+" j");
-//       $("#vacmplanned").html(vac.ill.accepted.days.toFixed(2)+" j");
-    
-//       $("#vactopen").html(vac.total.open.days.toFixed(2)+" j");
-//       $("#vacttaken").html(vac.total.taken.days.toFixed(2)+" j");
-//       $("#vactasked").html(vac.total.asked.days.toFixed(2)+" j");
-//       $("#vactplanned").html(vac.total.accepted.days.toFixed(2)+" j");
-//     } else {
-//       vac.normal.open.hours=vac.normal.open.hours + parseInt($("#vacancylastyearrest").val());
-//       $("#vacnopen").html(((vac.normal.open.hours && vac.normal.open.hours != 0)?vac.normal.open.hours.toFixed(2)+" h":"&nbsp;"));
-//       $("#vacntaken").html(((vac.normal.taken.hours && vac.normal.taken.hours > 0)?vac.normal.taken.hours.toFixed(2)+" h":"&nbsp;"));
-//       $("#vacnasked").html(((vac.normal.asked.hours && vac.normal.asked.hours > 0)?vac.normal.asked.hours.toFixed(2)+" h":"&nbsp;"));
-//       $("#vacnplanned").html(((vac.normal.accepted.hours && vac.normal.accepted.hours > 0)?vac.normal.accepted.hours.toFixed(2)+" h":"&nbsp;"));
-      
-//       $("#vacetaken").html(((vac.extra.taken.hours && vac.extra.taken.hours > 0)?vac.extra.taken.hours.toFixed(2)+" h":"&nbsp;"));
-//       $("#vaceasked").html(((vac.extra.asked.hours && vac.extra.asked.hours > 0)?vac.extra.asked.hours.toFixed(2)+" h":"&nbsp;"));
-//       $("#vaceplanned").html(((vac.extra.accepted.hours && vac.extra.accepted.hours > 0)?vac.extra.accepted.hours.toFixed(2)+" h":"&nbsp;"));
-      
-//       $("#vacmtaken").html(((vac.ill.taken.hours && vac.ill.taken.hours > 0)?vac.ill.taken.hours.toFixed(2)+" h":"&nbsp;"));
-//       $("#vacmasked").html(((vac.ill.asked.hours && vac.ill.asked.hours > 0)?vac.ill.asked.hours.toFixed(2)+" h":"&nbsp;"));
-//       $("#vacmplanned").html(((vac.ill.accepted.hours && vac.ill.accepted.hours > 0)?vac.ill.accepted.hours.toFixed(2)+" h":"&nbsp;"));
-      
-//       $("#vactopen").html(((vac.total.open.hours && vac.total.open.hours > 0)?vac.total.open.hours.toFixed(2)+" h":"&nbsp;"));
-//       $("#vacttaken").html(((vac.total.taken.hours && vac.total.taken.hours > 0)?vac.total.taken.hours.toFixed(2)+" h":"&nbsp;"));
-//       $("#vactasked").html(((vac.total.asked.hours && vac.total.asked.hours > 0)?vac.total.asked.hours.toFixed(2)+" h":"&nbsp;"));
-//       $("#vactplanned").html(((vac.total.accepted.hours && vac.total.accepted.hours > 0)?vac.total.accepted.hours.toFixed(2)+" h":"&nbsp;"));
-      
-//     }
-    
-//     //dump(JSON.stringify(vac) + " - Set data vacancy status\n");
-//     //  var hdata = "&nbsp;<span style=\"font-weight: normal;\"><span style=\"text-decoration: underline;\">pris:</span> <strong>"+ vac.taken.hours +" h</strong> ("+ vac.taken.days.toFixed(2)+" jour(s)) - ";
-//     //  hdata += "&nbsp;<span style=\"text-decoration: underline;\">planifié:</span> <strong>"+ vac.rest.hours+" h</strong> ("+ vac.rest.days.toFixed(2)+" jour(s)) - ";
-//     //  hdata += "&nbsp;<span style=\"text-decoration: underline;\">ouvert:</span> <strong>"+ vac.open.hours +" h</strong> ("+ vac.open.days.toFixed(2)+" jour(s))";
-//     //  if (vac.ill > 0) {
-//     //    hdata += " - &nbsp;(<span style=\"text-decoration: underline;\">maladie:</span> <strong>"+ vac.ill.hours+" h</strong> ("+ vac.ill.days.toFixed(2)+" jour(s)))</span>";
-//     //  }
-//       //dump("HTML: --" + document.getElementById("vacancystatus").innerHTML +"//\n->" + hdata + "\n");
-//       //$("#vacancystatus").html("");
-//       //if ($("#vacancystatus")){
-//       //dump("vacancystatus exists\n");
-//       //  
-//       //}
-//       $("#vacancystatus").html("");
-//   }
-//   else {
-//     $("#vacancystatus").html("");
-//   }
-// }
-
-function saveyearvacdays() {
-  var csel = "select * from staffvacancydays where staffuuid='"+pconfig.uuid+"' and vacancyyear='"+pconfig.year+"';";  
-  var days = 0;
-  var hours = 0;
-  if ($('#vacancyyeartotal').val() === ""){
-    return;
-  }
-  if (pconfig.vacancyunit == "hours"){
-    days = parseFloat($('#vacancyyeartotal').val().replace(',','.')) / 8;
-    hours = $('#vacancyyeartotal').val();
-  }else {
-    days = parseFloat($('#vacancyyeartotal').val().replace(',','.'));
-    hours = parseFloat($('#vacancyyeartotal').val().replace(',','.')) * 8;
-  }
-  var cnum = appdb.dbquery(csel);
-  var inssql = "INSERT INTO staffvacancydays (staffuuid,vacancyyear,days,hours) VALUES ('"+pconfig.uuid+"','"+pconfig.year+"',"+days+","+hours+");";
-  if (cnum.sqldata.length > 0) {
-    inssql = "UPDATE staffvacancydays SET days="+days+",hours="+hours+" where staffuuid='"+pconfig.uuid+"' and vacancyyear='"+pconfig.year+"';";
-  }
-  appdb.dbexec(inssql);
-  //calcvacancy();
-}
-
-// function setvacancyunit(){
-//   var vacunit = $('#vacancy_unit').val();
-//   if ($('#vacancyyeartotal').val() !== ""){
-//     var vacval = parseFloat($('#vacancyyeartotal').val().replace(',','.'));
-//     if (((!pconfig.vacancyunit) || (pconfig.vacancyunit == 'days')) && (vacunit == 'hours')){
-//       $('#vacancyyeartotal').val(vacval * 8);
-//     }else if (pconfig.vacancyunit != vacunit){
-//       $('#vacancyyeartotal').val(vacval / 8);
-//     }
-//   }
-//   //dump("vacunit: " + vacunit + "\n");
-//   pconfig.vacancyunit = vacunit;
-//   apppref.setpreference("pageconfig.coworker",pconfig);
-// }
-
-function dlg_event(uuid, type) {
-
-  //$('#staffuuid').multiselect('deselectAll', false);
-  //$('#staffuuid').multiselect('updateButtonText');
-  if (type== "ins") {
-    
-    $('#btndeleteevent').hide();
-    
-  }else {
-    $('#btndeleteevent').show();
-  }
-  $('#frmeditevent #freqinterval').hide();
-  $('#frmeditevent #freqmonthly').hide();
-  $('#frmeditevent #freqweekly').hide();
-  $('#frmeditevent #freq_monthly_byday').show();
-  $('#frmeditevent #freq_monthly_bymonthday').hide();
-  $('#frmeditevent #freq').val("");
-  $('#frmeditevent .active').removeClass('active');
-  if ((type == 'upd') || (type == 'ins')) {
-
-    var evdata = {
-      uuid: '0',
-      description: '',
-      activityuuid:'',
-      location: '',
-      color: '',
-      datefrom:new Date().toLocaleFormat("%d.%m.%Y"),
-      dateto:'',
-      staffuuid: pconfig.uuid,
-      timefrom: '00:00',
-      timeto: '00:00',
-      freq: '',
-      staffname: $("#staff_prename").val() + " " + $("#staff_surname").val()
-    };
-    //jsdump(JSON.stringify(pconfig) + "\n");
-    //jsdump(JSON.stringify(evdata) + "\n");
-    if (type == 'upd') {
-     var evsql = "SELECT uuid, strftime(\"%d.%m.%Y\",datefrom) as datefrom, strftime(\"%d.%m.%Y\",dateto) as dateto, timefrom, timeto, description, location, color, freq,  '"+ pconfig.uuid+"' as staffuuid FROM eventcalendar ev left join staffplanning st on (ev.uuid=st.eventcalendaruuid) where ev.uuid='" + uuid.uuid + "' group by ev.uuid;";
-      evdata = appdb.dbquery(evsql);
-      evdata = evdata.sqldata[0];
-      evdata['staffname'] = $("#staff_prename").val() + " " + $("#staff_surname").val();
-      if (evdata.freq != '') {
-        var tmpfreq = evdata.freq.split(';');
-        for (var t in tmpfreq){
-          if (tmpfreq[t] != '') {
-            var spl = tmpfreq[t].split("=");
-            evdata[spl[0].toLowerCase()] = spl[1].toLowerCase();
-          }
-        }
-      }
-    }
-    for (var w in evdata) {
-      if ($("#frmeditevent #" + w)) {
-        // if (w == 'staffuuid') {
-        //   if (evdata[w] == '') {
-        //     $("#frmeditevent #" + w).multiselect('select',[]);
-        //   } else {
-        //     $("#frmeditevent #" + w).multiselect('select',evdata[w].split(','));
-        //   }
-          
-        // }
-        // else if (w == 'color') {
-        //   $("#frmeditevent #color").val(evdata[w]);
-        //   $('#frmeditevent #color').minicolors('value',{color: evdata[w]});
-        // }
-        // else {
-          $("#frmeditevent #" + w).val(evdata[w]);  
-        // }
-      }
-    }
-    if ((evdata.freq == 'weekly') && (evdata.byday)) {
-      var bd = evdata.byday.split(',');
-      for (var i in bd){
-        document.getElementById('weekly_byday_' + bd[i]).setAttribute("checked",true);
-        $('#frmeditevent #weekly_byday_' + bd[i]).parent().addClass("active");
-      }
-    }
-    if (evdata.freq == 'monthly') {
-       $('#freq_monthly_byday').hide();
-       $('#freq_monthly_bymonthday').hide();
-       $('#pnl_monthly_byday').removeAttr("checked");
-       $('#pnl_monthly_bymonthday').removeAttr("checked");
-      if (evdata.byday) {
-        document.getElementById('pnl_monthly_byday').setAttribute("checked",true);
-        $('#frmeditevent #pnl_monthly_byday').parent().addClass("active");
-        $('#freq_monthly_byday').show();
-        var bd = evdata.byday.split(',');
-        var adpos = new Array();
-        var awday = new Array();
-        for (var i in bd){
-          var wday = bd[i].substr(bd[i].length-2);
-          var pos = bd[i].substring(0,bd[i].length-2);
-          awday.push(wday.toLowerCase());
-          adpos.push(pos);
-        }
-
-        for (var i in adpos){
-          document.getElementById('monthly_bydaypos_' + adpos[i]).setAttribute("checked",true);
-          $('#frmeditevent #monthly_bydaypos_' + adpos[i]).parent().addClass("active");
-        }
-        for (var i in awday){
-          document.getElementById('monthly_bydaywday_' + awday[i]).setAttribute("checked",true);
-          $('#frmeditevent #monthly_bydaywday_' + awday[i]).parent().addClass("active");
-        }
-      }else if (evdata.bymonthday) {
-        document.getElementById('pnl_monthly_bymonthday').setAttribute("checked",true);
-        $('#frmeditevent #pnl_monthly_bymonthday').parent().addClass("active");
-        $('#freq_monthly_bymonthday').show();
-        var bd = evdata.bymonthday.split(',');
-        for (var i in bd){
-          document.getElementById('monthly_bymonthday_' + bd[i]).setAttribute("checked",true);
-          $('#frmeditevent #monthly_bymonthday_' + bd[i]).parent().addClass("active");
-        }
-      }
-    }
-    setfreq();
-    $("#edit_event").modal('show');
-  } 
-}
-
-
-function save_event() {
-  var sql1 = new Array();
-  var sql2 = new Array();
-  if ($('#timefrom').val() == $('#timeto').val() || $('#timefrom').val() == "00:00" || $('#timeto').val() == "00:00"){
-    errormsg("Erreur","les heures doivent être différent et différent de la valeur 00:00!");
-    return false;
-  }
-  if ($('#timefrom').val() > $('#timeto').val()){
-    errormsg("Erreur","l'heure de début ne peux pas être supérieur à l'heure de fin!");
-    return false;
-  }
-  if (!$('#staffuuid').val()){
-    errormsg("Erreur","Vous devez selectionner au moin 1 membre du staff!");
-    return false;
-  }
-  if ($('#dateto').val() != '' && (encodeparam($('#datefrom').val()) > encodeparam($('#dateto').val()))  ) {
-    errormsg("Erreur","La Date début ne peut pas être supérieur à la date fin!");
-    return false;
-  }
-  var type = 'ins';
-  var cuuid = "";
-  if ($("#frmeditevent #uuid").val() != 0) {
-    type = 'upd';
-    cuuid = $("#frmeditevent #uuid").val();
-  } else {
-    cuuid = appdb.generate_uuid();
-  }
-  var freqdata = {};
-  var cfreq = $("#frmeditevent #freq").val();
-  $("#frmeditevent :input").each(function() {
-    var input = $(this);
-    
-    if (input.attr("id") && (input.attr("id") != "staffuuid") && (input.attr("id") != "staffname")) {
-      if ((input.attr("type") == "checkbox") && (input.attr("id").indexOf(cfreq) >= 0)){
-        var xd = input.attr("id").split("_");
-        if (input.attr("checked")) {
-          if (!freqdata[xd[1]]) {
-            freqdata[xd[1]] = new Array();
-          }
-          freqdata[xd[1]].push(input.val());
-        }
-      }
-      else if ((input.attr("type") == "radio") && (input.attr("id").indexOf(cfreq) >= 0)) {
-        var xd = input.attr("id").split("_");
-        if (input.attr("checked")) { 
-          freqdata['freqtype'] = xd[2];
-        }
-      }
-      else if ((input.attr("type") != "checkbox") && ((input.attr("type") != "radio"))){
-        if ((input.attr("id") == 'interval') || (input.attr("id") == 'freq')) {
-          freqdata[input.attr("id")] = input.val();
-        } else if ((type == 'ins') && (input.attr("id") != 'staffuuid')) {
-          
-          sql1.push('"' + input.attr("id") + '"');
-          if (input.attr("id") == 'uuid') {
-            if (input.val() == "" || input.val() == "0") {
-              sql2.push("'" + cuuid + "'");
-            } else {
-              sql2.push("'" + input.val() + "'");
-            }
-          } else {
-            var ival = encodeparam(input.val(), input.attr('type'));
-            sql2.push(ival);
-          }
-        } else {
-          if ((input.attr("id") != 'uuid') && (input.attr("id") != 'staffuuid')){
-            var ival = encodeparam(input.val(), input.attr('type'));
-            sql2.push('"' + input.attr("id") + '"=' + ival);
-          }
-        }
-      }
-    }
-
-  });
-  if (!freqdata.freqtype) {
-    freqdata['freqtype'] = curfreq.freqtype;
-  }
-
-  var strfreq ="";
-  if (cfreq != "") {
-    strfreq='FREQ=' + cfreq.toUpperCase()+';INTERVAL=' + freqdata.interval +';';
-    if ((cfreq == 'weekly') && (freqdata.byday)){
-      strfreq += 'BYDAY=' + freqdata.byday.join(","); 
-    }
-    if ((cfreq == 'monthly') && (freqdata.bydaypos) || ((freqdata.bydaywday)) || (freqdata.bymonthday)){
-      strfreq += freqdata.freqtype.toUpperCase() + '=';
-      if (freqdata.freqtype == 'bymonthday') {
-        strfreq += freqdata.bymonthday.join(',') + ";"
-      }else {
-        var abyday = new Array();
-        for (var p in freqdata.bydaypos){
-          for (var w in freqdata.bydaywday){
-            abyday.push(freqdata.bydaypos[p] + freqdata.bydaywday[w]);
-          }
-        }
-        strfreq += abyday.join(",");
-      }
-    }
-    if (strfreq.slice(-1) == ';') {
-      strfreq = strfreq.substring(0,strfreq.length-1);
-    }
-  }
-  var staffuuids = $('#staffuuid').val();
-  var delsql = "";
-  var xsql = [];
-  if (type != 'ins') {
-   xsql.push("DELETE FROM staffplanning where eventcalendaruuid = '"+cuuid+"';");
-  }
-  var staffinssql = "";
-  
-  if (staffuuids && (staffuuids.length != 0)) {
-    
-    staffinssql = "INSERT INTO staffplanning (eventcalendaruuid,staffuuid) VALUES ";
-    var tmps = [];
-    var curcoworkerok = false;
-    for (var s in staffuuids){
-      if (staffuuids[s] == pconfig.uuid){
-        curcoworkerok = true;
-      }
-      tmps.push("('"+cuuid+"','"+staffuuids[s]+"')");
-    }
-    if (!curcoworkerok){
-      tmps.push("('"+cuuid+"','"+pconfig.uuid+"')");
-    } 
-    staffinssql += tmps.join(',') + ";";  
-    xsql.push(staffinssql);
-  }
-  if (staffuuids.length == 0){
-    staffinssql = "INSERT INTO staffplanning (eventcalendaruuid,staffuuid) VALUES ('"+cuuid+"','"+pconfig.uuid+"');";
-    xsql.push(staffinssql);
-  }
-  
-
-  
-  if (type == 'upd') {
-    sql2.push('freq=' + encodeparam(strfreq));
-    xsql.push("UPDATE eventcalendar SET " + sql2.join(',') + " where \"uuid\"='" + cuuid + "';");
-  } else {
-    sql1.push('freq');
-    sql2.push(encodeparam(strfreq));
-    xsql.push("INSERT INTO eventcalendar (" + sql1.join(',') + ") VALUES (" + sql2.join(',') + ");");
-  }
-  dump(JSON.stringify(xsql));
-  for (var i in xsql){
-	  appdb.dbexec(xsql[i]);
-  }
-  
-  load_event_data();
-   
-  $("#frmeditevent #uuid").val("0");
-  $("#edit_event").modal('hide');
-}
-
-function confirm_delete_event() {
-  $("#confirm_delete_event").modal('show');
-  return false;
-}
-
-function delete_event() {
-	appdb.dbexec("DELETE FROM eventcalendar where uuid='" + $('#frmeditevent #uuid').val()+"';");
-	appdb.dbexec("DELETE FROM staffplanning where eventcalendaruuid='" + $('#frmeditevent #uuid').val()+"';");
-  load_event_data();
-  $("#confirm_delete_event").modal('hide');
-  
-  return false;
-}
-
-
-
-function setfreq() {
-
-  curfreq.freq = $('#freq option:selected').val();
-
-  $('#freqinterval').hide();
-  $('#freqmonthly').hide();
-  $('#freqweekly').hide();
-  if (curfreq.freq != "") {
-
-    $('#lblfreq').text(lblfreq[curfreq.freq]);
-    $('#freqinterval').show();
-    if (curfreq.freq !=  'daily') {
-      $('#freq' + curfreq.freq).show();
-    }
-  }
-  
-}
-
-// function load_staff_selection(objid,option){
-//   var stdata = appdb.dbquery("select uuid, coalesce(surname,'') || ' ' || coalesce(prename,'') as name,case when color is null then '#000' else color end as color from staff order by surname,prename");
-
-//   stdata = stdata.sqldata;
-//   for (var s in stdata){
-//     $('#' + objid).append('<option value="'+ stdata[s].uuid+'">&lt;span style="color: '+stdata[s].color+';" &gt;' +stdata[s].name+ '&lt;/span&gt;</option>');
-//   }
-  
-//     var copt = {};
-//     if (option) {
-//       copt = option;
-//     }
-//     copt['enableHTML'] = true;
-//     copt['nonSelectedText']="Sélectionner un(e) employé(e)...";
-//     copt['numberDisplayed']=5;
-//     copt['allSelectedText']='Tous';
-//     copt['nSelectedText']=' selections';
-    
-//     $('#' + objid).multiselect(copt);
-  
-// }
-
-function accept_vacancy(){
-    var cuuid = "";
-    if ($("#frmeditvacancy #uuid").val() != 0) {
-      type = 'upd';
-      cuuid = $("#frmeditvacancy #uuid").val();
-    }
-    var xsql = "UPDATE vacancycalendar SET accepted='1' where \"uuid\"='" + cuuid + "';";
-    appdb.dbexec(xsql);
-    load_table_vacancy();
-
-    $("#frmeditvacancy #uuid").val("0");
-    $("#edit_vacancy").modal('hide');
-}
-
-function getlastyearsrest(){
-    var weekhours = $('#staff_weekhours').val();
-    if (weekhours === '') {
-      $("#vacancylastyearrest").val(0);
-      return;
-    }
-    var df = new Date(pconfig.year-1,0,1);
-    var dt = new Date(pconfig.year-1,11,31);
-    var vcalcrestsql = "select (select hours from staffvacancydays where staffuuid='"+pconfig.uuid+ "' and vacancyyear="+df.getFullYear()+")-SUM(dayhours) AS hours from (" +
-    "select vd.daydate,case when daydate <= date('now')   then 1 else 0 end as taken,case when vc.timefrom=vc.timeto then cast ("+weekhours+"/5 as real) else (cast (substr(vc.timeto,1,2) as int) + (cast(substr(vc.timeto,4,5) as int)/60))  - (cast(substr(vc.timefrom,1,2) as int) + (cast(substr(vc.timeto,4,5) as int)/60)) end as dayhours,type,case when type != -1 then accepted else '1' end as accepted "+
-    "from vacancycalendar vc left join ( "+ 
-    "select daydate from ( ";
-    
-    var yd = [];
-    for (var dx=df;dx<=dt;dx.setDate(dx.getDate()+1)){
-      yd.push("select date('"+dx.toLocaleFormat('%Y-%m-%d')+"') as daydate");
-    }
-    vcalcrestsql += yd.join(" UNION ") + 
-    ") yd where strftime('%w',daydate) not in ('0','6') and daydate not in (select vacancydate from vacancy where vacancydate between '"+df.getFullYear()+"-01-01' and '"+dt.getFullYear()+"-12-31' and vacancydateto is null) " +
-    ") vd on (vd.daydate between vc.datefrom and vc.dateto) " +
-    "left join staffvacancydays svd on (vc.staffuuid=svd.staffuuid) " +
-    "where vc.staffuuid='"+pconfig.uuid+ "' and daydate is not null group by daydate) where type in (0,1) and taken=1 and accepted=1 group by taken,accepted;";
-    //dump("SQLREST:" + vcalcrestsql + "\n");
-    var vcalc = appdb.dbquery(vcalcrestsql);
-    //dump(JSON.stringify(vcalc) + "\n");
-    if (vcalc && vcalc.sqldata[0]){
-	
-	$("#vacancylastyearrest").val(vcalc.sqldata[0].hours);
-    }else {
-	$("#vacancylastyearrest").val(0);
-    }
-    return;
-}
diff --git a/modules/staff/js/coworker_basic.js b/modules/staff/js/coworker_basic.js
deleted file mode 100644
index fe62ee4..0000000
--- a/modules/staff/js/coworker_basic.js
+++ /dev/null
@@ -1,827 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg )
-var pconfig = null;
-var delplan = null;
-var delvacation = null;
-var wh= window.innerHeight -440;
-var curdatediff = null;
-var redate = /\d\d.\d\d.\d\d\d\d/;
-var curfreq ={};
-//var lictype = apppref.getpreference("support.lictype"); 
-
-function initdata() {
-  load_helpers();
-  var pdata = apppref.getpreference("pageconfig.coworker");
-  if (pdata != '') {
-    pconfig = JSON.parse(pdata);
-  }
-  //"get CoWorker cfg:" +JSON.stringify(pconfig) + "\n");
-  if (!pconfig.year) {
-    pconfig.year=new Date().getFullYear();
-  }
-  if (!pconfig.printlayout) {
-    pconfig.printlayout = 'list';
-    apppref.setpreference("pageconfig.coworker",pconfig);
-  }
-  var cdatasql = "SELECT jobtitle, prename, surname, address, zip, city, country, strftime('%d.%m.%Y',entrydate) as entrydate, strftime('%d.%m.%Y',exitdate) as exitdate, iban, bic, accountname, phone, email, uuid,color,weekhours,case when password is not null and length(password) > 3 then 1 else 0 end as passwordset  FROM staff where uuid='" + pconfig.uuid + "';";
-  var cdata = appdb.dbquery(cdatasql);
-  cdata = cdata.sqldata[0];
-  for (var ci in cdata) {
-    if (document.getElementById("staff_" + ci)) {
-    	
-        $("#staff_" + ci).val(cdata[ci]);
-        if (ci == "color"){
-        	$("#staff_color").css("background-color",cdata[ci]);
-        	$("#staff_color").val("");
-        }
-      
-    }
-    
-  }
-  var crdata = appdb.dbquery("select stafflist from creche;");
-  if ((crdata) && (crdata.sqldata[0].stafflist == "1")){
-	  $("#pwddata").hide();
-  }
-  if (cdata) {
-    set_infoheader(cdata.prename + " " + cdata.surname);
-  }
-  set_selectyears();
-
-  if (pconfig && pconfig.activetab) {
-    $('a[href="#'+pconfig.activetab+'"]').tab('show');
-  }else{
-    $('a[href="#vacancy"]').tab('show');
-    pconfig.activetab = 'vacancy';
-  }
-  
-//if (pconfig && pconfig.vacancyunit){
-////dump("has vacancy unit:" + pconfig.vacancyunit + "\n");
-//$('#vacancy_unit').val(pconfig.vacancyunit);
-//}else {
-pconfig.vacancyunit = "hours";
-//$('#vacancy_unit').val("days");
-//}
-  
-  $('#frmeditvacancy #vacdatefrom').on("blur",function (e) {
-    var ok = true;
-    if ($('#frmeditvacancy #vacdatefrom').val().match(redate)) {
-      $('#btn_save_vacancy').removeAttr("disabled");
-    }else {
-      ok = false;
-      $('#btn_save_vacancy').attr("disabled","1");
-    }
-    if ((ok == true) && ($('#frmeditvacancy #vacdateto').val() != '')) {
-      var tmpdt1 = encodeparam($('#frmeditvacancy #vacdatefrom').val(),'date');
-      var nd = new Date(tmpdt1.replace(/'/g,''));
-      var xd = new Date(nd.getFullYear(),nd.getMonth(),nd.getDate() + curdatediff);
-      $('#frmeditvacancy #vacdateto').val(xd.toLocaleFormat("%d.%m.%Y"));
-      var tmpdt2 = encodeparam($('#frmeditvacancy #vacdateto').val(),'date');
-      if (tmpdt1 > tmpdt2) {
-        $('#btn_save_vacancy').attr("disabled","1");
-      } else {
-        $('#btn_save_vacancy').removeAttr("disabled");
-      }
-      
-    }
-  });
-  $('#frmeditvacancy #vacdateto').on("blur",function (e) {
-    var ok = true;
-    if ($('#frmeditvacancy #vacdateto').val().match(redate)) {
-      $('#btn_save_vacancy').removeAttr("disabled");
-    }else {
-      ok = false;
-      $('#btn_save_vacancy').attr("disabled","1");
-    }
-    curdatediff=daysBetween(new Date(encodeparam($('#frmeditvacancy #vacdatefrom').val(),'date').replace(/'/g,'')),new Date(encodeparam($('#frmeditvacancy #vacdateto').val(),'date').replace(/'/g,''))); 
-    if ((ok == true) && ($('#frmeditvacancy #vacdateto').val() != '')) {
-      var tmpdt1 = encodeparam($('#frmeditvacancy #vacdatefrom').val(),'date');
-      var tmpdt2 = encodeparam($('#frmeditvacancy #vacdateto').val(),'date');
-      if (tmpdt1 > tmpdt2) {
-        $('#btn_save_vacancy').attr("disabled","1");
-      } else {
-        $('#btn_save_vacancy').removeAttr("disabled");
-      }
-      
-    }
-  });
-  
-  
-  $("#weekly_byday :input").change(function() {
-    if (this.checked) {
-      this.setAttribute("checked",true);
-    }else {
-      this.removeAttribute("checked");
-    }
-
-});
-  $("#monthly_bydaypos :input").change(function() {
-
-    if (this.checked) {
-      this.setAttribute("checked",true);
-    }else {
-      this.removeAttribute("checked");
-    }
-
-});
-  $("#monthly_bydaywday :input").change(function() {
-
-    if (this.checked) {
-      this.setAttribute("checked",true);
-    }else {
-      this.removeAttribute("checked");
-    }
-
-});
-  $("#monthly_bymonthday :input").change(function() {
-
-    if (this.checked) {
-      this.setAttribute("checked",true);
-    }else {
-      this.removeAttribute("checked");
-    }
-
-});
-  $("#monthly_by :input").change(function() {
-    var xd = this.id.split("_");
-    curfreq.freqtype=xd[2];
-
-      this.setAttribute("checked",true);
-
-    $('#freq_monthly_byday').hide();
-    $('#freq_monthly_bymonthday').hide();
-    $('#pnl_monthly_byday').removeAttr("checked");
-    $('#pnl_monthly_bymonthday').removeAttr("checked");
-
-    $('#freq_' + this.value).show();
-
-});
-
-  $('#frmeditevent #datefrom').on("blur",function (e) {
-    var ok = true;
-    if ($('#frmeditevent #datefrom').val().match(redate)) {
-      $('#btn_save_event').removeAttr("disabled");
-    }else {
-      ok = false;
-      $('#btn_save_event').attr("disabled","1");
-    }
-    if ((ok == true) && ($('#frmeditevent #dateto').val() != '')) {
-      var tmpdt1 = encodeparam($('#frmeditevent #datefrom').val(),'date');
-      var tmpdt2 = encodeparam($('#frmeditevent #dateto').val(),'date');
-      if (tmpdt1 >= tmpdt2) {
-        $('#btn_save_event').attr("disabled","1");
-      } else {
-        $('#btn_save_event').removeAttr("disabled");
-      }
-      
-    }
-  });
-  $('#frmeditevent #dateto').on("blur",function (e) {
-    var ok = true;
-    if ($('#frmeditevent #dateto').val().match(redate)) {
-      $('#btn_save_event').removeAttr("disabled");
-    }else {
-      ok = false;
-      $('#btn_save_event').attr("disabled","1");
-    }
-    if ((ok == true) && ($('#frmeditevent #dateto').val() != '')) {
-      var tmpdt1 = encodeparam($('#frmeditevent #datefrom').val(),'date');
-      var tmpdt2 = encodeparam($('#frmeditevent #dateto').val(),'date');
-
-      if (tmpdt1 >= tmpdt2) {
-        $('#btn_save_event').attr("disabled","1");
-      } else {
-        $('#btn_save_event').removeAttr("disabled");
-      }
-      
-    }
-  });
-
-}
-
-$('.selyear').on( "change", function(e){ 
-  e.preventDefault();
-
-  $(".selyear").val($(this).val());
-  pconfig.year = $(this).val();
-  apppref.setpreference("pageconfig.coworker",pconfig);
-  if ($(this).attr('id') == "year_organisation") {
-    load_event_data();
-  }else if ($(this).attr('id') == "year_vacancy") {
-    load_table_vacancy();
-  }
-});
-
-$('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
-     var tn =  e.target.toString();
-     pconfig.activetab = tn.substring(tn.lastIndexOf("#")+1);
-     //dump(JSON.stringify(pconfig) + "\n");
-     apppref.setpreference("pageconfig.coworker",pconfig);
-     if (pconfig.activetab == 'activity') {
-       load_event_data();
-     }
-     if (pconfig.activetab == 'vacancy') {
-       load_table_vacancy();
-     }
- });
-
-function load_event_data() {
-  var where = new Array();
-
-    where.push(" st.uuid in ('"+ pconfig.uuid + "')");
-
-  $("div.panel-daybody").html("");
-  var sql = "SELECT cal.uuid, cal.datefrom, cal.dateto, '<div style=\"display:none;\">' || strftime('%Y%m%d',cal.datefrom) ||'</div>' || strftime('%d.%m.%Y',cal.datefrom) AS tbldatefrom ,strftime('%Y%m%d',cal.datefrom) AS strdatefrom, strftime('%Y%m%d',cal.dateto)   AS strdateto,cal.timefrom, cal.timeto, cal.description, cal.location, cal.color, cal.freq, '[\"' || GROUP_CONCAT(sp.staffuuid,'\",\"') || '\"]' as staffuuid, GROUP_CONCAT(coalesce(st.surname,'') || ' ' || coalesce(st.prename,''), '<br/>' ) as staffnames ,'[\"' || GROUP_CONCAT(st.color,'\",\"') || '\"]' as staffcolors from eventcalendar cal " +" join staffplanning sp on (cal.uuid=sp.eventcalendaruuid " + " AND sp.staffuuid in ('"+ pconfig.uuid +"')) left join staff st on (sp.staffuuid=st.uuid) "+
-  " where (cal.datefrom between '" + $('#year_organisation').val() + "-01-01' and '" + $('#year_organisation').val() + "-12-31' and (cal.dateto >= '" + $('#year_organisation').val() + "-01-01' or cal.dateto is null)) or (cal.dateto between '" + $('#year_organisation').val() + "-01-01' and '" + $('#year_organisation').val() + "-12-31' and cal.datefrom < '" + $('#year_organisation').val() + "-01-01') or ((cal.datefrom <= '" + $('#year_organisation').val() + "-01-01') and ((cal.dateto >= '" + $('#year_organisation').val() + "-12-31') or cal.dateto is null)) "+ ((where.length > 0)?" AND (" + where.join(" or ") + ")":"")+"  group by cal.uuid order by cal.datefrom,cal.dateto;";
-
-  var caldata = appdb.dbquery(sql);
-
-  caldata = caldata.sqldata;
-  
-  var headerdata = getlabels("act,activity,datefrom,hours,recurrance");
-  $("#tbl_activity").html("");
-  
-  var hrow = headerdata;
-  var tdclass= new Array();
-  var tblheader = '<tr>';
-
-  for (var h=0;h<hrow.length;h++){
-    tdclass.push(headerdata[h].class);
-    tblheader += '<th class="' + headerdata[h].class +'">'+ headerdata[h].title+'</th>';
-  }
-  tblheader += '</tr>';
-  
-  $("#tbl_activity").append("<thead>" + tblheader + "</thead>");
-  $("#tbl_activity").append("<tbody>");
-  var tblbody = [];
-  for (var c in caldata) {
-    var tblrow = "<tr>";
-    tblrow += '<td class="noprint">&nbsp;</td>';
-    tblrow += "<td><span style=\"display: none;\">"+caldata[c].description+"</span><strong style=\"color:"+ caldata[c].color +"\">" + caldata[c].description + "</strong></td>";
-    tblrow += "<td>" + caldata[c].tbldatefrom + "</td>";
-    tblrow += "<td>" + caldata[c].timefrom + "- " + caldata[c].timeto + "</td>";
-
-    var freq2 = caldata[c].freq;
-    if (freq2 != '') {
-
-      freq2 += ';DTSTART='+caldata[c].strdatefrom + 'T000000Z';
-      if (caldata[c].dateto != ''){
-        freq2 += ';UNTIL='+caldata[c].strdateto + 'T000000Z';
-      }
-    }
-
-    try {
-
-    var rule2 = RRule.fromString(freq2);
-
-    
-    tblrow += "<td>" + rule2.toText() + "</td>";
-
-    } catch (ex){
-      //"ERROR! loading data!" + ex  + " FREQ:" + freq2 + "\n");
-    }
-    tblrow += "</tr>";
-    tblbody.push(tblrow);
-  }
-  
-  //load table
-  $("#tbl_activity").append(tblbody.join(''));
-  $("#tbl_activity").append("</tbody>");
-
-  tblcal = $("#tbl_activity").dataTable({
-    "language": {
-      "url": "../../web/js/locale/datatable_fr.json"
-    },
-    "paging": false,
-    "scrollY": wh + "px",
-    "scrollCollapse": true,
-    "ordering": true,
-    "info": false,
-    "filter": false,
-    "destroy": true
-  });
-  
-  //$('#tbl_activity').on( 'search.dt', function () {
-  //  
-  //  pconfig.filter = tblcal.api().search();
-  //
-  //  apppref.setpreference("pageconfig.calactivity",pconfig);
-  //} );
-
-  //$('#tbl_activity').on( 'order.dt', function () {
-  //  pconfig.order= tblcal.fnSettings().aaSorting;
-  //
-  //  apppref.setpreference("pageconfig.calactivity",pconfig);
-  //  
-  //} );
-  
-//    if (pconfig.filter) {
-//      tblcal.fnFilter(pconfig.filter);
-//    }
-    if (pconfig.order) {
-      tblcal.fnSort(pconfig.order);
-    }
-    if (/*(!pconfig.filter) && */ (!pconfig.order)) {
-      tblcal.fnDraw();
-    }
-}
-
-function load_table_vacancy() {
-    
-    var vacdatasql = "SELECT case when (datefrom > date('now') or accepted!='1') and type != -1 then '<button type=\"button\" class=\"btn btn-primary\" onclick=\"dlg_vacancy({''uuid'':'''|| uuid || '''},''upd'');\"><span class=\"glyphicon glyphicon-pencil\"></span></button> <button type=\"button\" class=\"btn btn-danger\" onclick=\"confirm_delete_vacancy(''' || uuid || ''');\"><span class=\"glyphicon glyphicon-remove\"></span></button>' else '&nbsp;' end AS action," +
-    "CASE WHEN datefrom!=dateto THEN 'du:' || strftime('%d.%m.%Y', CASE WHEN datefrom < DATE('"+ pconfig.year +"-01-01') THEN DATE('"+ pconfig.year +"-01-01') ELSE datefrom END) || '<br/>au: ' || strftime('%d.%m.%Y', CASE WHEN dateto > DATE('"+ pconfig.year +"-12-31') THEN DATE('"+ pconfig.year +"-12-31') ELSE dateto END) ELSE strftime('%d.%m.%Y',datefrom) END AS planningdaterange," +
-   //"case when datefrom!=dateto then strftime('%d.%m.%Y',case when datefrom < date('"+ pconfig.year +"-01-01') then 'de: ' date('"+ pconfig.year +"-01-01') else datefrom end) || '<br/>à: ' || strftime('%d.%m.%Y',case when dateto > date('"+ pconfig.year +"-12-31') then date('"+ pconfig.year +"-12-31') else dateto end) else strftime('%d.%m.%Y',datefrom) end as planningdaterange, " +
-   "case when  timefrom=timeto then '8h' when  (cast(substr(timeto,1,2) as int) - cast(substr(timefrom,1,2) as int))= 4 then '4h' || case when timefrom!='00:00' then '<br/> à partir de ' || timefrom else '' end else (cast(substr(timeto,1,2) as int) - cast(substr(timefrom,1,2) as int)) || 'h' || case when timefrom!='00:00' then '<br/> à partir de ' || timefrom else '' end end as hourrange, "+ 
- "description, " +
- "case when type=0 then 'normal' when type=1 then 'exceptionnelle' when type=-1 then 'maladie' end as vacancytype,case when accepted='1' and type != -1 then '<span style=\"font-weight: bold; color: green;\">OUI</span>' else '<span style=\"font-weight: bold; color: red\">NON</span>' end as accepted FROM vacancycalendar where staffuuid='"+ pconfig.uuid +"' and (strftime('%Y',dateto)='"+ pconfig.year +"' or strftime('%Y',datefrom)='"+ pconfig.year +"');";
- //dump("XXSQL:" + vacdatasql + "\n");
-var vacdata = appdb.dbqueryarray(vacdatasql);
-
-  
-  $('#tbl_vacancy').html("");
-  //$('#tbl_vacancy').append('<tfoot><tr><th></th><th colspan="4" style="text-align: center;"></th></tr></tfoot>');
-  getlastyearsrest();
-  calcvacancy();
-  //vacdata.sqlhead.join(",") + "\n");
-  var headerdata = getlabels(vacdata.sqlhead.join(","));
-
-  $("#tbl_vacancy").dataTable({
-    "language": {
-      "url": "../../web/js/locale/datatable_fr.json"
-    },
-    "data": vacdata.sqldata,
-    "columns": headerdata,
-    "paging": false,
-    "scrollY": wh + "px",
-    "scrollCollapse": true,
-    "ordering": true,
-    "info": false,
-    "filter": false,
-    "destroy": true
-  });
-  
-}
-
-//function add_coworker() {
-//  var newuuid = appdb.generate_uuid();
-//  appdb.dbexec("insert into staff (uuid) VALUES ('" + newuuid + "');");
-//  globelreq.send_request({
-//    page: 'coworker',
-//    data: {
-//      "uuid": newuuid
-//    },
-//    header: 'HEADER TODO'
-//  });
-//}
-
-function dlg_vacancy(uuid, type) {
-    var evdata = {
-      uuid: 0,
-      description: '',
-      vacdatefrom:new Date().toLocaleFormat("%d.%m.%Y"),
-      vacdateto:new Date().toLocaleFormat("%d.%m.%Y"),
-      staffuuid:pconfig.uuid,
-      timefrom: '00:00',
-      hours: '1',
-      type:'0',
-      dailyduration:'1.0'
-    };
-    
-    if (type == 'upd') {
-     var evsql = "SELECT uuid, strftime(\"%d.%m.%Y\",datefrom) as vacdatefrom, strftime(\"%d.%m.%Y\",dateto) as vacdateto, timefrom, description, '"+pconfig.uuid+"' as staffuuid,type, case when timefrom!=timeto then '0.' || (cast(substr(timeto,1,2) as int) - cast(substr(timefrom,1,2) as int)) else 1.0 end as dailyduration,null as hours,accepted FROM vacancycalendar where uuid='" + uuid.uuid + "';";
-      
-      evdata = appdb.dbquery(evsql);
-      evdata = evdata.sqldata[0];
-      if (evdata.type == -1){
-        $("#btnacceptvacancy").hide();
-      }else {
-        $("#btnacceptvacancy").show();
-      }
-      if (evdata.dailyduration == '1') {
-        evdata.dailyduration = '1.0';
-        evdata.hours = '8';
-      }else {
-        evdata.hours = evdata.dailyduration.substring(2,3);
-        if (evdata.dailyduration != '0.4') {
-          evdata.dailyduration = '0.';
-        }
-      }
-
-    }
-
-    for (var w in evdata) {
-      if ((w == 'datefrom') || (w == 'dateto')) {
-        w='vac' + w;
-      }
-      //dump(w + "\n");
-      if ($("#frmeditvacancy #" + w)) {
-        $("#frmeditvacancy #" + w).val(evdata[w]);
-      }
-    }
-    setdailydurationfields();
-    $("#edit_vacancy").modal('show');
-}
-
-function confirm_delete_vacancy(uuid) {
-  delvacation = uuid;
-  $("#confirm_delete_vacancy").modal('show');
-  return false;
-}
-
-function delete_vacancy() {
-  var delsql = "DELETE FROM vacancycalendar where uuid='" + delvacation+"';";
-  appdb.dbexec(delsql);
-  load_table_vacancy();
-  delvacancy=null;
-  $("#confirm_delete_vacancy").modal('hide');
-  
-  return false;
-}
-
-function setdailydurationfields() {
-  var dd = $('#dailyduration :selected').val();
-  if (dd=='1.0') {
-    $("#ftimefrom").hide();
-    $("#fhours").hide();
-  }else if (dd=='0.4') {
-    $("#ftimefrom").show();
-    $("#fhours").hide();
-  }else if (dd=='0.') {
-    $("#ftimefrom").show();
-    $("#fhours").show();
-  }
-}
-
-function save_vacancy() {
-  var sql1 = new Array();
-  var sql2 = new Array();
-  var type = 'ins';
-  var cuuid = "";
-  if ($("#frmeditvacancy #uuid").val() != 0) {
-    type = 'upd';
-    cuuid = $("#frmeditvacancy #uuid").val();
-  }
-  
-  $("#frmeditvacancy :input").each(function() {
-    var input = $(this);
-    
-    if (input.attr("id")) {
-        
-        if (type == 'ins') {
-          
-          
-          if (input.attr("id") == 'uuid') {
-            sql1.push('"' + input.attr("id") + '"');
-            if (input.val() == "" || input.val() == "0") {
-              sql2.push("'" + appdb.generate_uuid() + "'");
-            } else {
-              sql2.push("'" + input.val() + "'");
-            }
-          } else if (input.attr("id") == 'dailyduration') {
-            sql1.push('"timeto"');
-            if (input.val() == '1.0') {
-              sql2.push("'" +$('#timefrom').val() + "'");
-            }else if (input.val() == '0.4') {
-              var xval = parseInt($('#timefrom').val().substring(1,2)) + 4;
-              if (xval < 10) { xval = "0" + xval;}
-              xval += ":00";
-              sql2.push("'" + xval + "'");
-            }else {
-              var xval = parseInt($('#timefrom').val().substring(1,2)) + parseInt($('#hours').val());
-              if (xval < 10) { xval = "0" + xval;}
-              xval += ":00";
-              sql2.push("'" + xval + "'");
-            }
-          } else if ((input.attr("id") != 'dailyduration') && (input.attr("id") != 'hours')) {
-            var xid = input.attr("id")
-            if ((input.attr("id") == 'vacdatefrom') || (input.attr("id") == 'vacdateto')) {
-
-              sql1.push('"' + input.attr("id").substring(3) + '"');
-            }else {
-              sql1.push('"' + input.attr("id") + '"');
-            }
-            
-            var ival = encodeparam(input.val(), input.attr('type'));
-            sql2.push(ival);
-          }
-        } else {
-          if ((input.attr("id") != 'uuid') && (input.attr("id") != 'dailyduration') && (input.attr("id") != 'hours')) {
-            var ival = encodeparam(input.val(), input.attr('type'));
-            var xid =input.attr("id");
-            if ((input.attr("id") == 'vacdatefrom') || (input.attr("id") == 'vacdateto')) {
-              xid =input.attr("id").substring(3);
-            }
-            sql2.push('"' + xid + '"=' + ival);
-          } else if (input.attr("id") == 'dailyduration') {
-            if (input.val() == '1.0') {
-              sql2.push('"timeto"='+ "'" + $('#timefrom').val() + "'");
-            }else if (input.val() == '0.4') {
-              var xval = parseInt($('#timefrom').val().substring(1,2)) + 4;
-              if (xval < 10) { xval = "0" + xval;}
-              xval += ":00";
-              sql2.push('"timeto"=' +"'" + xval + "'");
-            }else {
-              var xval = parseInt($('#timefrom').val().substring(1,2)) + parseInt($('#hours').val());
-              if (xval < 10) { xval = "0" + xval;}
-              xval += ":00";
-              sql2.push('"timeto"=' +"'" + xval + "'");
-            }
-          }
-        }
-
-    }
-
-  });
-  
-  var xsql = "";
-  if (type == 'upd') {
-    xsql = "UPDATE vacancycalendar SET " + sql2.join(',') + " where \"uuid\"='" + cuuid + "';";
-  } else {
-
-    xsql = "INSERT INTO vacancycalendar (" + sql1.join(',') + ") VALUES (" + sql2.join(',') + ");";
-  }
-
-  appdb.dbexec(xsql);
-  load_table_vacancy();
-
-  $("#frmeditvacancy #uuid").val("0");
-  $("#edit_vacancy").modal('hide');
-}
-
-
-function set_selectyears() {
-   
-  var years = appdb.dbquery("select strftime('%Y',coalesce(min(entrydate),date('now','-1 year'))) as minyear, strftime('%Y',date('now', '+1 year')) as maxyear  from staff where uuid='"+pconfig.uuid+"';");
-  var minyear = parseInt(years.sqldata[0].minyear);
-  var maxyear = parseInt(years.sqldata[0].maxyear);
-  for (var y=minyear;y<=maxyear;y++){
-    
-    var sel = "";
-    if (y == pconfig.year) {
-      sel=' selected="1" ';
-      
-    }
-    
-    $(".selyear").append("<option value=\""+y+"\""+sel+">"+y+"</option>");
-  }
-  
-}
-
-function calcvacancy() {
-    //"Calc Vacancy Data!\n");
-    var csel = "select days,hours from staffvacancydays where staffuuid='"+pconfig.uuid+"' and vacancyyear='"+pconfig.year+"';";
-    //"SQL:"+ csel +"\n");
-    var cnum = appdb.dbquery(csel);
-    
-    if (cnum.sqldata.length > 0) {
-      if (pconfig.vacancyunit == "hours"){
-        if ((!cnum.sqldata[0].hours) || (cnum.sqldata[0].hours === "")){
-          cnum.sqldata[0].hours = cnum.sqldata[0].days * 8;
-        }
-        $('#vacancyyeartotal').val(cnum.sqldata[0].hours);
-      }else{
-        $('#vacancyyeartotal').val(cnum.sqldata[0].days);  
-      }
-      
-    }else {
-      $('#vacancyyeartotal').val("");
-    }
-    var vdays = (($('#vacancyyeartotal').val() === "")?"":cnum.sqldata[0].days);
-    var weekhours = $('#staff_weekhours').val();
-    if (vdays === '') {
-      $('#vacancystatus').html('<div class="alert alert-danger" style="padding: 2px;">Pas de jours de congés configuré pour l\'année '+ pconfig.year+'!</div>');
-      return;
-    }else if (weekhours === '') {
-      $('#vacancystatus').html('<div class="alert alert-danger">Pas de heures par semaine configurées!</div>');
-      return;
-    }
-
-    var vcalcsql = "select printf(\"%.2f\",(sum(dayhours) / ("+weekhours+"/5))) as days, SUM(dayhours) as hours,"+
-    "taken,type,accepted from (" +
-    "select vd.daydate,case when daydate <= date('now')   then 1 else 0 end as taken,case when vc.timefrom=vc.timeto then cast ("+weekhours+"/5 as real) else (cast (substr(vc.timeto,1,2) as int) + (cast(substr(vc.timeto,4,5) as int)/60))  - (cast(substr(vc.timefrom,1,2) as int) + (cast(substr(vc.timeto,4,5) as int)/60)) end as dayhours,type,case when type != -1 then accepted else '1' end as accepted "+
-    "from vacancycalendar vc left join ( "+ 
-    "select daydate from ( ";
-    var df = new Date(pconfig.year,0,1);
-    var dt = new Date(pconfig.year,11,31);
-    var yd = [];
-    for (var dx=df;dx<=dt;dx.setDate(dx.getDate()+1)){
-      yd.push("select date('"+dx.toLocaleFormat('%Y-%m-%d')+"') as daydate");
-    }
-    vcalcsql += yd.join(" UNION ") + 
-    ") yd where strftime('%w',daydate) not in ('0','6') and daydate not in (select vacancydate from vacancy where vacancydate between '"+pconfig.year+"-01-01' and '"+pconfig.year+"-12-31' and vacancydateto is null) " +
-    ") vd on (vd.daydate between vc.datefrom and vc.dateto) " +
-    "left join staffvacancydays svd on (vc.staffuuid=svd.staffuuid) " +
-    "where vc.staffuuid='"+pconfig.uuid+ "' and daydate is not null group by daydate) group by type,taken,accepted;";
-    //dump("SQL2:" + vcalcsql + "\n");
-    var vcalc = appdb.dbquery(vcalcsql);
-    vcalc = vcalc.sqldata;
-    //dump(JSON.stringify(vcalc)+ "\n");
-    vhours = vdays * 8;
-    var vac = {};
-    $("#lblyear").html(pconfig.year);
-    vac.normal = {taken:{hours:0,days:0},open:{vhours:parseFloat(vhours), days:parseFloat(vdays)},accepted:{hours:0,days:0},asked:{hours:0,days:0}};
-    vac.extra = {taken:{hours:0,days:0},open:{hours:0, days:0},accepted:{hours:0,days:0},asked:{hours:0,days:0}};
-    vac.ill = {taken:{hours:0,days:0},open:{hours:0, days:0},accepted:{hours:0,days:0},asked:{hours:0,days:0}};
-    vac.total = {taken:{hours:0,days:0},open:{hours:0, days:0},accepted:{hours:0,days:0},asked:{hours:0,days:0}};
-    //dump(JSON.stringify(vac) + "\n");
-    if (vcalc) {
-      for (var c in vcalc){
-        if (vcalc[c].type == '0' ){ //normal
-          if (vcalc[c].taken == '1'){
-              if  (vcalc[c].accepted=='1'){
-          	vac.normal.taken.days = vac.normal.taken.days + parseFloat(vcalc[c].days);
-                  vac.normal.taken.hours = vac.normal.taken.hours + parseFloat(vcalc[c].hours);
-              } else {
-          	vac.normal.asked.days = vac.normal.asked.days + parseFloat(vcalc[c].days);
-                  vac.normal.asked.hours = vac.normal.asked.hours + parseFloat(vcalc[c].hours);
-              }
-            
-          } else if (vcalc[c].taken == '0') {
-            if (vcalc[c].accepted=='1'){
-                vac.normal.accepted.days = vac.normal.accepted.days + parseFloat(vcalc[c].days);
-                vac.normal.accepted.hours = vac.normal.accepted.hours + parseFloat(vcalc[c].hours);
-            } else {
-                vac.normal.asked.days = vac.normal.asked.days + parseFloat(vcalc[c].days);
-                vac.normal.asked.hours = vac.normal.asked.hours + parseFloat(vcalc[c].hours);
-            }
-            
-          }
-          vac.normal.open.days = parseFloat(vdays) - vac.normal.taken.days - vac.normal.accepted.days - vac.normal.asked.days;
-          vac.normal.open.hours = parseFloat(vhours) - vac.normal.taken.hours - vac.normal.accepted.hours - vac.normal.asked.hours;
-          //total
-          
-        } else if (vcalc[c].type == '1' ){ //extra
-          if (vcalc[c].taken == '1'){
-              if  (vcalc[c].accepted=='1'){
-          	vac.extra.taken.days =  vac.extra.taken.days + parseFloat(vcalc[c].days);
-          	vac.extra.taken.hours = vac.extra.taken.hours + parseFloat(vcalc[c].hours);
-              } else {
-          	vac.extra.asked.days = vac.extra.asked.days + parseFloat(vcalc[c].days);
-                  vac.extra.asked.hours = vac.extra.asked.hours + parseFloat(vcalc[c].hours);
-              }
-          } else if (vcalc[c].taken == '0'){
-              if (vcalc[c].accepted=='1'){
-          	vac.extra.accepted.days = vac.extra.accepted.days + parseFloat(vcalc[c].days);
-          	vac.extra.accepted.hours = vac.extra.accepted.hours + parseFloat(vcalc[c].hours);
-              } else {
-          	vac.extra.asked.days = vac.extra.asked.days + parseFloat(vcalc[c].days);
-                  vac.extra.asked.hours = vac.extra.asked.hours + parseFloat(vcalc[c].hours);
-              }
-          }
-          vac.extra.open.days = 0;
-          vac.extra.open.hours = 0;
-        } else if (vcalc[c].type == '-1' ){ //ill
-          if (vcalc[c].taken == '1'){
-            vac.ill.taken.days =  vac.ill.taken.days + parseFloat(vcalc[c].days);
-            vac.ill.taken.hours = vac.ill.taken.hours + parseFloat(vcalc[c].hours);
-          } else if (vcalc[c].taken == '0'){
-              if  (vcalc[c].accepted=='1'){
-          	vac.ill.accepted.days = vac.ill.accepted.days + parseFloat(vcalc[c].days);
-          	vac.ill.accepted.hours = vac.ill.accepted.hours + parseFloat(vcalc[c].hours);
-              } else {
-          	vac.ill.asked.days = vac.ill.asked.days + parseFloat(vcalc[c].days);
-                  vac.ill.asked.hours = vac.ill.asked.hours + parseFloat(vcalc[c].hours);
-              }
-          }
-          vac.ill.open.days = 0;
-          vac.ill.open.hours = 0;
-
-        }
-        vac.total.taken.days = vac.normal.taken.days + vac.extra.taken.days + vac.ill.taken.days;
-        vac.total.taken.hours = vac.normal.taken.hours + vac.extra.taken.hours + vac.ill.taken.hours;
-        vac.total.open.days = vac.normal.open.days + vac.extra.open.days + vac.ill.open.days;
-        vac.total.open.hours = vac.normal.open.hours + vac.extra.open.hours + vac.ill.open.hours;
-        vac.total.accepted.days = vac.normal.accepted.days + vac.extra.accepted.days + vac.ill.accepted.days;
-        vac.total.accepted.hours = vac.normal.accepted.hours + vac.extra.accepted.hours + vac.ill.accepted.hours;
-        vac.total.asked.days = vac.normal.asked.days + vac.extra.asked.days + vac.ill.asked.days;
-        vac.total.asked.hours = vac.normal.asked.hours + vac.extra.asked.hours + vac.ill.asked.hours;
-      }
-      //JSON.stringify(vac) + "\n");
-      if (pconfig.vacancyunit == 'days'){
-        $("#vacnopen").html(((vac.normal.open.days && vac.normal.open.days != 0)?vac.normal.open.days.toFixed(2)+" j":"&nbsp;"));
-        $("#vacntaken").html(vac.normal.taken.days.toFixed(2)+" j");
-        $("#vacnasked").html(vac.normal.asked.days.toFixed(2)+" j");
-        $("#vacnplanned").html(vac.normal.accepted.days.toFixed(2)+" j");
-      
-        $("#vaceopen").html("&nbsp;");
-        $("#vacetaken").html(vac.extra.taken.days.toFixed(2)+" j");
-        $("#vaceasked").html(vac.extra.asked.days.toFixed(2)+" j");
-        $("#vaceplanned").html(vac.extra.accepted.days.toFixed(2)+" j");
-      
-        $("#vacmopen").html("&nbsp;");
-        $("#vacmtaken").html(vac.ill.taken.days.toFixed(2)+" j");
-        $("#vacmasked").html(vac.ill.asked.days.toFixed(2)+" j");
-        $("#vacmplanned").html(vac.ill.accepted.days.toFixed(2)+" j");
-      
-        $("#vactopen").html(vac.total.open.days.toFixed(2)+" j");
-        $("#vacttaken").html(vac.total.taken.days.toFixed(2)+" j");
-        $("#vactasked").html(vac.total.asked.days.toFixed(2)+" j");
-        $("#vactplanned").html(vac.total.accepted.days.toFixed(2)+" j");
-      } else {
-        vac.normal.open.hours=vac.normal.open.hours + parseInt($("#vacancylastyearrest").val());
-        $("#vacnopen").html(((vac.normal.open.hours && vac.normal.open.hours != 0)?vac.normal.open.hours+" h":"&nbsp;"));
-        $("#vacntaken").html(((vac.normal.taken.hours && vac.normal.taken.hours > 0)?vac.normal.taken.hours+" h":"&nbsp;"));
-        $("#vacnasked").html(((vac.normal.asked.hours && vac.normal.asked.hours > 0)?vac.normal.asked.hours+" h":"&nbsp;"));
-        $("#vacnplanned").html(((vac.normal.accepted.hours && vac.normal.accepted.hours > 0)?vac.normal.accepted.hours+" h":"&nbsp;"));
-        
-        $("#vacetaken").html(((vac.extra.taken.hours && vac.extra.taken.hours > 0)?vac.extra.taken.hours+" h":"&nbsp;"));
-        $("#vaceasked").html(((vac.extra.asked.hours && vac.extra.asked.hours > 0)?vac.extra.asked.hours+" h":"&nbsp;"));
-        $("#vaceplanned").html(((vac.extra.accepted.hours && vac.extra.accepted.hours > 0)?vac.extra.accepted.hours+" h":"&nbsp;"));
-        
-        $("#vacmtaken").html(((vac.ill.taken.hours && vac.ill.taken.hours > 0)?vac.ill.taken.hours+" h":"&nbsp;"));
-        $("#vacmasked").html(((vac.ill.asked.hours && vac.ill.asked.hours > 0)?vac.ill.asked.hours+" h":"&nbsp;"));
-        $("#vacmplanned").html(((vac.ill.accepted.hours && vac.ill.accepted.hours > 0)?vac.ill.accepted.hours+" h":"&nbsp;"));
-        
-        $("#vactopen").html(((vac.total.open.hours && vac.total.open.hours > 0)?vac.total.open.hours+" h":"&nbsp;"));
-        $("#vacttaken").html(((vac.total.taken.hours && vac.total.taken.hours > 0)?vac.total.taken.hours+" h":"&nbsp;"));
-        $("#vactasked").html(((vac.total.asked.hours && vac.total.asked.hours > 0)?vac.total.asked.hours+" h":"&nbsp;"));
-        $("#vactplanned").html(((vac.total.accepted.hours && vac.total.accepted.hours > 0)?vac.total.accepted.hours+" h":"&nbsp;"));
-        
-      }
-      
-      //dump(JSON.stringify(vac) + " - Set data vacancy status\n");
-      //  var hdata = "&nbsp;<span style=\"font-weight: normal;\"><span style=\"text-decoration: underline;\">pris:</span> <strong>"+ vac.taken.hours +" h</strong> ("+ vac.taken.days.toFixed(2)+" jour(s)) - ";
-      //  hdata += "&nbsp;<span style=\"text-decoration: underline;\">planifié:</span> <strong>"+ vac.rest.hours+" h</strong> ("+ vac.rest.days.toFixed(2)+" jour(s)) - ";
-      //  hdata += "&nbsp;<span style=\"text-decoration: underline;\">ouvert:</span> <strong>"+ vac.open.hours +" h</strong> ("+ vac.open.days.toFixed(2)+" jour(s))";
-      //  if (vac.ill > 0) {
-      //    hdata += " - &nbsp;(<span style=\"text-decoration: underline;\">maladie:</span> <strong>"+ vac.ill.hours+" h</strong> ("+ vac.ill.days.toFixed(2)+" jour(s)))</span>";
-      //  }
-        //dump("HTML: --" + document.getElementById("vacancystatus").innerHTML +"//\n->" + hdata + "\n");
-        //$("#vacancystatus").html("");
-        //if ($("#vacancystatus")){
-        //dump("vacancystatus exists\n");
-        //  
-        //}
-        $("#vacancystatus").html("");
-    }
-    else {
-      $("#vacancystatus").html("");
-    }
-  }
-
-
-function setvacancyunit(){
-  var vacunit = $('#vacancy_unit').val();
-  if ($('#vacancyyeartotal').val() !== ""){
-    var vacval = parseFloat($('#vacancyyeartotal').val().replace(',','.'));
-    if (((!pconfig.vacancyunit) || (pconfig.vacancyunit == 'days')) && (vacunit == 'hours')){
-      $('#vacancyyeartotal').val(vacval * 8);
-    }else if (pconfig.vacancyunit != vacunit){
-      $('#vacancyyeartotal').val(vacval / 8);
-    }
-  }
-  //dump("vacunit: " + vacunit + "\n");
-  pconfig.vacancyunit = vacunit;
-  apppref.setpreference("pageconfig.coworker",pconfig);
-}
-
-function setfreq() {
-
-  curfreq.freq = $('#freq option:selected').val();
-
-  $('#freqinterval').hide();
-  $('#freqmonthly').hide();
-  $('#freqweekly').hide();
-  if (curfreq.freq != "") {
-
-    $('#lblfreq').text(lblfreq[curfreq.freq]);
-    $('#freqinterval').show();
-    if (curfreq.freq !=  'daily') {
-      $('#freq' + curfreq.freq).show();
-    }
-  }
-  
-}
-
-function getlastyearsrest(){
-    var weekhours = $('#staff_weekhours').val();
-    if (weekhours === '') {
-      $("#vacancylastyearrest").val(0);
-      return;
-    }
-    var df = new Date(pconfig.year-1,0,1);
-    var dt = new Date(pconfig.year-1,11,31);
-    var vcalcrestsql = "select (select hours from staffvacancydays where staffuuid='"+pconfig.uuid+ "' and vacancyyear="+df.getFullYear()+")-SUM(dayhours) AS hours from (" +
-    "select vd.daydate,case when daydate <= date('now')   then 1 else 0 end as taken,case when vc.timefrom=vc.timeto then cast ("+weekhours+"/5 as real) else (cast (substr(vc.timeto,1,2) as int) + (cast(substr(vc.timeto,4,5) as int)/60))  - (cast(substr(vc.timefrom,1,2) as int) + (cast(substr(vc.timeto,4,5) as int)/60)) end as dayhours,type,case when type != -1 then accepted else '1' end as accepted "+
-    "from vacancycalendar vc left join ( "+ 
-    "select daydate from ( ";
-    
-    var yd = [];
-    for (var dx=df;dx<=dt;dx.setDate(dx.getDate()+1)){
-      yd.push("select date('"+dx.toLocaleFormat('%Y-%m-%d')+"') as daydate");
-    }
-    vcalcrestsql += yd.join(" UNION ") + 
-    ") yd where strftime('%w',daydate) not in ('0','6') and daydate not in (select vacancydate from vacancy where vacancydate between '"+df.getFullYear()+"-01-01' and '"+dt.getFullYear()+"-12-31' and vacancydateto is null) " +
-    ") vd on (vd.daydate between vc.datefrom and vc.dateto) " +
-    "left join staffvacancydays svd on (vc.staffuuid=svd.staffuuid) " +
-    "where vc.staffuuid='"+pconfig.uuid+ "' and daydate is not null group by daydate) where type in (0,1) and taken=1 and accepted=1 group by taken,accepted;";
-    //dump("SQLREST:" + vcalcrestsql + "\n");
-    var vcalc = appdb.dbquery(vcalcrestsql);
-    //dump(JSON.stringify(vcalc) + "\n");
-    if (vcalc && vcalc.sqldata[0]){
-	
-	$("#vacancylastyearrest").val(vcalc.sqldata[0].hours);
-    }else {
-	$("#vacancylastyearrest").val(0);
-    }
-    return;
-}
-
diff --git a/modules/staff/js/staff.js b/modules/staff/js/staff.js
deleted file mode 100644
index 60374b3..0000000
--- a/modules/staff/js/staff.js
+++ /dev/null
@@ -1,120 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg )
-var pconfig = {};
-var delcoworker = null;
-var wh = window.innerHeight - 100;
-var tblstaff = null;
-
-function initdata() {
-
-	  loadtable();
-	  set_infoheader("");
-	  if (!pconfig.printlayout) {
-	    pconfig.printlayout = 'list';
-	    apppref.setpreference("pageconfig.staff", pconfig);
-	  }
-	}
-
-function loadtable() {
-  var sql = "SELECT '<button type=\"button\" class=\"btn btn-primary\" onclick=\"load_coworker(''' || uuid || ''')\" title=\"editer\"><span class=\"glyphicon glyphicon-pencil\"></span></button> <button type=\"button\" class=\"btn btn-danger\" onclick=\"confirm_delete_coworker(''' || uuid || ''');\" title=\"supprimer\"><span class=\"glyphicon glyphicon-remove\"></span></button> ' as action, coalesce(prename,'') || '<br/>' || coalesce(surname,'') as name,case when color is not null then '<div style=\"width: 50px; height: 30px;background-color: ' || color ||';\"></div>' else null end color, coalesce(address,'')|| '<br/>' || coalesce(zip,'') || ' ' || coalesce(city,'') || '<br/>' || coalesce(country,'') as address, case when phone is not null then '<span class=\"glyphicon glyphicon-earphone\" aria-hidden=\"true\"></span>: ' || phone || '<br/>' else '' end || case when email is not null then '<span class=\"glyphicon glyphicon-envelope\" aria-hidden=\"true\"></span>:' || email else '' end as phonemail, coalesce(jobtitle,'') || '<br/>' || case when entrydate is not null then 'à partir du: ' || strftime('%d.%m.%Y',entrydate) else '' end || case when exitdate is not null then ' jusqu''au: ' || strftime('%d.%m.%Y',exitdate) else '' end as jobtitle FROM staff;";
-  //dump("STAFFSQL:" +sql + "\n");
-  var data = appdb.dbqueryarray(sql);
-
-  var headerdata = getlabels(data.sqlhead.join(","));
-  $("#tbl_staff").html("");
-  tblstaff = $("#tbl_staff").dataTable({
-    "language": {
-      "url": "../../web/js/locale/datatable_fr.json"
-    },
-    "data": data.sqldata,
-    "columns": headerdata,
-    "paging": false,
-    "scrollY": wh + "px",
-    "scrollCollapse": true,
-    "ordering": true,
-    "info": false,
-    "filter": true,
-    "destroy": true
-  });
-//  $('#tbl_staff').on('search.dt', function() {
-//    pconfig.filter = tblstaff.api().search();
-//    apppref.setpreference("pageconfig.staff", pconfig);
-//  });
-
-  $('#tbl_staff').on('order.dt', function() {
-    pconfig.order = tblstaff.fnSettings().aaSorting;
-    apppref.setpreference("pageconfig.staff", pconfig);
-
-  });
-//  if (pconfig.filter) {
-//    tblstaff.fnFilter(pconfig.filter);
-//  }
-  if (pconfig.order) {
-    tblstaff.fnSort(pconfig.order);
-  }
-  if (/*(!pconfig.filter) && */ (!pconfig.order)) {
-    tblstaff.fnDraw();
-  }
-}
-
-
-
-function add_coworker() {
-  var newuuid = appdb.generate_uuid();
-  appdb.dbexec("insert into staff (uuid) VALUES ('" + newuuid + "');");
-
-  globelreq.send_request({
-    page: 'coworker',
-    module: 'staff',
-    data: {
-      "uuid": newuuid
-    },
-    header: 'Employé(e)'
-  });
-}
-
-function confirm_delete_coworker(myuuid) {
-  //alert('TEST');
-  delcoworker = myuuid;
-  $("#confirm_delete_coworker").modal('show');
-  return false;
-}
-
-function delete_coworker() {
-  //var frmdata = new Object();
-  //appdb.dbexec("DELETE FROM planningstaff where staffuuid='"+delcoworker +"';");
-  var evdel = appdb.dbquery("select eventcalendaruuid,count(staffuuid) as cnt from staffplanning where staffuuid='" + delcoworker + "';");
-
-  appdb.dbexec("DELETE FROM staffvacancydays where staffuuid='" + delcoworker + "';");
-  appdb.dbexec("DELETE FROM vacancycalendar where staffuuid='" + delcoworker + "';");
-  appdb.dbexec("DELETE FROM staffplanning where staffuuid='" + delcoworker + "';");
-  appdb.dbexec("DELETE FROM staff where uuid='" + delcoworker + "';");
-  for (var e in evdel.sqldata) {
-    if (evdel.sqldata[e].cnt == 1) {
-      appdb.dbexec("DELETE FROM eventcalendar where uuid='" + evdel.sqldata[e].eventcalendaruuid + "';");
-    }
-  }
-  //
-  delcoworker = null;
-  loadtable();
-  //
-  $("#confirm_delete_coworker").modal('hide');
-
-}
-
-function load_coworker(couuid){
-  //"coworker uuid:" + couuid + "\n");
-  var cwdata = apppref.getpreference("pageconfig.coworker"); 
-  var cow = new Object();
-  if (cwdata && cwdata !== ""){
-    cow = JSON.parse(cwdata);
-  }  
-  //dump("Current CoWorker cfg:" +JSON.stringify(cow) + "\n");
-  cow.uuid = couuid;
-  //dump("New CoWorker cfg:" +JSON.stringify(cow) + "\n");
-  apppref.setpreference("pageconfig.coworker",cow);
-  globelreq.send_request({page:'coworker',
-                         module:'staff',
-                         data:null,
-                         header:'Employé(e)'});
-  
-}
\ No newline at end of file
diff --git a/modules/staff/js/staff_basic.js b/modules/staff/js/staff_basic.js
deleted file mode 100644
index c51de6a..0000000
--- a/modules/staff/js/staff_basic.js
+++ /dev/null
@@ -1,122 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg )
-var pconfig = {};
-var wh = window.innerHeight - 100;
-
-function initdata() {
-  set_infoheader("");
-  if (!pconfig.printlayout) {
-    pconfig.printlayout = 'list';
-    apppref.setpreference("pageconfig.staff", pconfig);
-  }
-  load_staff_selection();
-  var stlist = appdb.dbquery("select * from creche;");
-  //dump(JSON.stringify(stlist) + "\n");
-  if ((stlist.sqldata) && stlist.sqldata[0].stafflist == '1'){
-	  $("#stafflist").show();
-	  loadtable_staff();
-	  $("#stafflogin").hide();
-  }
-}
-
-function loadtable_staff() {
-	  var sql = "SELECT '<button type=\"button\" class=\"btn btn-primary\" onclick=\"load_coworker(''' || uuid || ''');\" title=\"editer\"><span class=\"glyphicon glyphicon-pencil\"></span></button> <button type=\"button\" class=\"btn btn-danger\" onclick=\"confirm_delete_coworker(''' || uuid || ''');\" title=\"supprimer\"><span class=\"glyphicon glyphicon-remove\"></span></button> ' as action, coalesce(prename,'') || '<br/>' || coalesce(surname,'') as name,case when color is not null then '<div style=\"width: 50px; height: 30px;background-color: ' || color ||';\"></div>' else null end color, coalesce(address,'')|| '<br/>' || coalesce(zip,'') || ' ' || coalesce(city,'') || '<br/>' || coalesce(country,'') as address, case when phone is not null then '<span class=\"glyphicon glyphicon-earphone\" aria-hidden=\"true\"></span>: ' || phone || '<br/>' else '' end || case when email is not null then '<span class=\"glyphicon glyphicon-envelope\" aria-hidden=\"true\"></span>:' || email else '' end as phonemail, coalesce(jobtitle,'') || '<br/>' || case when entrydate is not null then 'à partir du: ' || strftime('%d.%m.%Y',entrydate) else '' end || case when exitdate is not null then ' jusqu''au: ' || strftime('%d.%m.%Y',exitdate) else '' end as jobtitle FROM staff;";
-	  //dump(sql + "\n");
-	  var data = appdb.dbqueryarray(sql);
-
-	  var headerdata = getlabels(data.sqlhead.join(","));
-	  $("#tbl_staff").html("");
-	  tblstaff = $("#tbl_staff").dataTable({
-	    "language": {
-	      "url": "../../web/js/locale/datatable_fr.json"
-	    },
-	    "data": data.sqldata,
-	    "columns": headerdata,
-	    "paging": false,
-	    "scrollY": wh + "px",
-	    "scrollCollapse": true,
-	    "ordering": true,
-	    "info": false,
-	    "filter": true,
-	    "destroy": true
-	  });
-//	  $('#tbl_staff').on('search.dt', function() {
-//	    pconfig.filter = tblstaff.api().search();
-//	    apppref.setpreference("pageconfig.staff", pconfig);
-//	  });
-
-	  $('#tbl_staff').on('order.dt', function() {
-	    pconfig.order = tblstaff.fnSettings().aaSorting;
-	    apppref.setpreference("pageconfig.staff", pconfig);
-
-	  });
-//	  if (pconfig.filter) {
-//	    tblstaff.fnFilter(pconfig.filter);
-//	  }
-	  if (pconfig.order) {
-	    tblstaff.fnSort(pconfig.order);
-	  }
-	  if (/*(!pconfig.filter) && */ (!pconfig.order)) {
-	    tblstaff.fnDraw();
-	  }
-	}
-
-function load_coworker_basic(){
-  var couuid= $('#sel_staff :selected').val();
-  var copwd = $('#txtpasswd').val();
-  var encpwd = MD5(copwd);
-  var cwpwd = appdb.dbquery("select password from staff where uuid='"+couuid+"';");
-  //dump(cwpwd + "\n");
-  //dump("SQL: select password from staff where uuid='"+couuid+"';\n");
-  //dump("PWD: " + copwd + " ENC: " + encpwd + " CMP: "+ cwpwd.sqldata[0].password +"\n");
-  if (cwpwd.sqldata[0].password == encpwd){
-	  var cwdata = apppref.getpreference("pageconfig.coworker"); 
-	  var cow = new Object();
-	  if (cwdata && cwdata !== ""){
-	    cow = JSON.parse(cwdata);
-	  } 
-	  cow.uuid = couuid;
-	  //dump("New CoWorker cfg:" +JSON.stringify(cow) + "\n");
-	  apppref.setpreference("pageconfig.coworker",cow);
-	  globelreq.send_request({page:'coworker_basic',
-	                         module:'staff',
-	                         data:null,
-	                         header:'Employé(e)'});
-  
-  }
-  
-    
-}
-
-function load_coworker(couuid){
-	  //"coworker uuid:" + couuid + "\n");
-	  var cwdata = apppref.getpreference("pageconfig.coworker"); 
-	  var cow = new Object();
-	  if (cwdata && cwdata !== ""){
-	    cow = JSON.parse(cwdata);
-	  }  
-	  //dump("Current CoWorker cfg:" +JSON.stringify(cow) + "\n");
-	  cow.uuid = couuid;
-	  //dump("New CoWorker cfg:" +JSON.stringify(cow) + "\n");
-	  apppref.setpreference("pageconfig.coworker",cow);
-	  globelreq.send_request({page:'coworker_basic',
-	                         module:'staff',
-	                         data:null,
-	                         header:'Employé(e)'});
-	  
-	}
-
-function load_staff_selection(){
-  var stdata = appdb.dbquery("select uuid, coalesce(surname,'') || ' ' || coalesce(prename,'') as name,case when color is null then '#000' else color end as color from staff where password is not null order by surname,prename");
-  stdata = stdata.sqldata;
-  //JSON.stringify(stdata));
-  for (var s in stdata){
-    $('#sel_staff').append('<option value="'+ stdata[s].uuid+'">' +stdata[s].name+ '</option>');
-  } 
-}
-
-function onselstaff(objid) {
-
-  //pconfig.filterstaff = $('#' + objid).val();
-  //apppref.setpreference("pageconfig.calactivity",pconfig);
-  //load_calendar_data();
-}
\ No newline at end of file
diff --git a/modules/staff/staff.html b/modules/staff/staff.html
deleted file mode 100644
index 7c05876..0000000
--- a/modules/staff/staff.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-
-  <title>Creorga - Staff</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="cache-control" content="max-age=0" />
-  <meta http-equiv="cache-control" content="no-cache" />
-  <meta http-equiv="expires" content="0" />
-  <meta http-equiv="expires" content="Tue, 01 Jan 1970 1:00:00 GMT" />
-  <meta http-equiv="pragma" content="no-cache" />
-  <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-  <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-  <link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/dataTables.bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/glyphicons.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/style.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/creorga.css" rel="stylesheet" type="text/css"><!-- Fav and touch icons -->
-  
-  <link rel="shortcut icon" href="img/favicon.png">
-</head>
-
-<body>
-    <div class="container-fluid"  style="padding-top: 5px;">
-    <!--<span class="pagehead" id="pagehead">Personnel</span>&nbsp-->
-    <div class="btn-group" style="z-index: 10;">
-    <button  onclick="add_coworker();" class="btn btn-primary" type="button" >
-  <span class="glyphicon glyphicon-plus"></span>
-</button>
-    </div>
-    <div style="margin-top: -30px;z-index: -10;">
-    <table id="tbl_staff" class="table table-striped">
-    </table>
-    </div>
-    <div class="modal fade" id="confirm_delete_coworker">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-
-                <h4 class="modal-title">Supprimer un collaborateur</h4>
-              </div><!-- dialog contents -->
-
-              <div class="modal-body">
-                Êtes vous sûre de supprimer ce collaborateur et tous ces données?<br>
-              </div><!-- dialog buttons -->
-
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Non</button> <button onclick="delete_coworker();" class="btn btn-primary">Oui</button>
-              </div>
-            </div>
-          </div>
-        </div>
-        </div>
-  
-  <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/navigation.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/system.js" type="text/javascript"></script>
-  <script src="../../web/js/creorga.js" type="text/javascript"></script>
-  <script src="../../web/js/labels.js" type="text/javascript"></script>
-  <script src="js/staff.js" type="text/javascript"></script>
-</body>
-</html>
diff --git a/modules/staff/staff.xul b/modules/staff/staff.xul
deleted file mode 100644
index 4bcd895..0000000
--- a/modules/staff/staff.xul
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE overlay PUBLIC "-//MOZILLA//DTD XUL V1.0//EN"
-"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<overlay id="ov_staff" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <toolbar id="co_maintoolbar" style="-moz-appearance: none;">
-    <toolbarbutton class="btn btn-default" id="tbb_staff" insertafter="tbb_presences" label="Personnel" image="modules/staff/img/staff.png" orient="vertical" oncommand="navigation.load_appview('staff','staff',null,'Liste du Personnel');"/>
-  </toolbar>
-</overlay>
\ No newline at end of file
diff --git a/modules/staff/staff_basic.html b/modules/staff/staff_basic.html
deleted file mode 100644
index 4688e9b..0000000
--- a/modules/staff/staff_basic.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-
-  <title>Creorga - Staff Basic</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="cache-control" content="max-age=0" />
-  <meta http-equiv="cache-control" content="no-cache" />
-  <meta http-equiv="expires" content="0" />
-  <meta http-equiv="expires" content="Tue, 01 Jan 1970 1:00:00 GMT" />
-  <meta http-equiv="pragma" content="no-cache" />
-  <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-  <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-  <link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/dataTables.bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/glyphicons.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/style.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/creorga.css" rel="stylesheet" type="text/css"><!-- Fav and touch icons -->
-  
-  <link rel="shortcut icon" href="img/favicon.png">
-</head>
-
-<body>
-    <div class="container-fluid"  style="padding-top: 5px;">
-    	<div style="margin-top: -30px;z-index: -10; display: none" id="stafflist">
-    		<table id="tbl_staff" class="table table-striped">
-    		</table>
-    	</div>
-        <div class="container col-xs-12 col-sm-offset-2 col-sm-8 col-md-offset-3 col-md-6 col-lg-offset-4 col-lg-4" id="stafflogin">
-            <br />
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <h1>Login</h1>
-                </div>
-                <div class="panel-body">
-                    <div class="form-group">
-                        <div class="input-group">
-                            <span class="input-group-addon">
-                                <span class="glyphicon glyphicon-user"></span>
-                            </span>
-                            <select id="sel_staff" onchange="onselstaff(this.id);" style="width: 100%">
-                                
-                            </select>
- 
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <div class="input-group">
-                            <span class="input-group-addon">
-                                <span class="glyphicon glyphicon-lock"></span>
-                            </span>
-                            <input id="txtpasswd" type="password" class="form-control" />
-                        </div>
-                    </div>
-                    <button id="btnLogin" class="btn btn-primary" style="width: 100%" onclick="load_coworker_basic();">
-                        <span class="glyphicon glyphicon-log-in"></span>&nbsp;Entrez
-                    </button>
-                </div>
-            </div>
-        </div>
-    </div>
-  
-  <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/encrypt.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/navigation.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/system.js" type="text/javascript"></script>
-  <script src="../../web/js/creorga.js" type="text/javascript"></script>
-  <script src="../../web/js/labels.js" type="text/javascript"></script>
-  <script src="js/staff_basic.js" type="text/javascript"></script>
-</body>
-</html>
diff --git a/modules/staff/staff_basic.xul b/modules/staff/staff_basic.xul
deleted file mode 100644
index b8daf7f..0000000
--- a/modules/staff/staff_basic.xul
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE overlay PUBLIC "-//MOZILLA//DTD XUL V1.0//EN"
-"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<overlay id="ov_staffbasic" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <toolbar id="co_maintoolbar" style="-moz-appearance: none;">
-    <toolbarbutton class="btn btn-default" id="tbb_staff" insertafter="tbb_presences" label="Personnel" image="modules/staff/img/staff.png" orient="vertical" oncommand="navigation.load_appview('staff_basic','staff',null,'Espace Personnel');"/>
-  </toolbar>
-</overlay>
\ No newline at end of file
diff --git a/modules/waitlist/waitlist.html b/modules/waitlist/waitlist.html
deleted file mode 100644
index 9b8b2a0..0000000
--- a/modules/waitlist/waitlist.html
+++ /dev/null
@@ -1,130 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-  <title>Liste d'attente</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-	 <meta http-equiv="cache-control" content="max-age=0" />
-  <meta http-equiv="cache-control" content="no-cache" />
-  <meta http-equiv="expires" content="0" />
-  <meta http-equiv="expires" content="Tue, 01 Jan 1970 1:00:00 GMT" />
-  <meta http-equiv="pragma" content="no-cache" />
-  <link href="css/bootstrap.min.css" rel="stylesheet" type="text/css">
-  <!--<link href="css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-  <link href="css/datatables.min.css" rel="stylesheet" type="text/css">
-  <link href="css/dataTables.bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css">
-  <!-- <link href="css/bootstrap-timepicker.min.css" rel="stylesheet" type="text/css"> -->
-  <link href="css/glyphicons.css" rel="stylesheet" type="text/css">
-	<link href="css/summernote.css" rel="stylesheet" type="text/css">
-  <link href="css/creorga.css" rel="stylesheet" type="text/css"><!-- Fav and touch icons -->
-</head>
-
-<body>
-
-   <div class="container-fluid" style="padding-top: 5px;"><div id="main" class="main">
-   <!--<span class="pagehead" id="pagehead">Liste d'attente</span>&nbsp;-->
-	 <div class="btn-group" style="z-index: 10;">
-   <button onclick="dlg_waitlist({'uuid':''},'ins');" class="btn btn-primary" type="button"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span></button>
-	 <!--<button  onclick="print_list();" class="btn btn-primary" type="button" id="btnprintwaitlist"><span class="glyphicon glyphicon-print" aria-hidden="true"></span></button>-->
-   </div>
-	 <div style="margin-top: -30px;z-index: -10;">
-		<!--<div id="tbl_waitlist_wrapper" class="dataTables_wrapper" >-->
-      <table class="display compact dataTable" width="100%" style="width: 100%;" id="tbl_waitlist" role="grid"></table>
-		<!--</div>-->
-		</div>
-</div>
-   <div class="modal fade" id="edit_waitlist">
-          <div class="modal-dialog"  style="width: 800px; min-width: 800px;">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title">Editer/Ajouter contact</h4>
-              </div>
-              <div class="modal-body" style=" height: 600px; max-height: 600px ">
-
-                <div id="frmeditwaitlist">
-                  <input type="hidden" value="0" id="uuid" />
-                  
-                  <div class="form-group" id="date-container">
-                    <label for="datestart">date de contacte</label>
-                    <div id="dt_waitdate" class="input-group date">
-                      <input type="date" class="form-control" value="" limits="0" placeholder="dd.mm.yyyy"  id="waitdate"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                  </div>
-                  <div class="form-group">
-                    <label for="name">Nom</label>
-                    <input type="text" value="" id="name"  nullable="true" class="form-control">
-                  </div>
-									<div class="row col-md-12">
-                  <div class="form-group col-md-4">
-                    <label for="phone">Téléphone</label>
-                    <input type="text" value="" id="phone"  nullable="true" class="form-control">
-                  </div>
-                  <div class="form-group col-md-4">
-                    <label for="email">E-Mail</label>
-                    <input type="text" value="" id="email"  nullable="true" class="form-control">
-                  </div>
-                  <div class="form-group col-md-4">
-                    <label for="age">Âge</label>
-                    <input type="text" value="" id="age"  nullable="true" class="form-control">
-                  </div>
-									</div>
-                  <div class="form-group">
-                    <label for="note">Remarque</label>
-                    <textarea class="summernote" type="text"  id="note"></textarea>
-                  </div>
-                </div>
-                </div>
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Annuler</button> <button onclick="save_waitlist();" class="btn btn-primary">OK</button>
-              </div>
-              </div>
-
-              
-            </div>
-          </div>
-    
-      
-      <div class="modal fade" id="confirm_delete_waitlist">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-
-                <h4 class="modal-title">Supprimer</h4>
-              </div><!-- dialog contents -->
-
-              <div class="modal-body">
-                Êtes vous sûre de supprimer ce contact?
-
-                
-              </div><!-- dialog buttons -->
-
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Non</button> <button onclick="delete_waitlist();" class="btn btn-primary">Oui</button>
-              </div>
-            </div>
-          </div>
-        </div>
-   </div>
-  <script src="js/jquery.min.js" type="text/javascript"></script>
-  <script src="js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="js/datatables.min.js" type="text/javascript"></script>
-  <script src="js/moment-with-locales.js" type="text/javascript"></script>
-  <script src="js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
-  <!-- <script src="js/bootstrap-timepicker.min.js" type="text/javascript"></script> -->
-	<script src="js/summernote.min.js" type="text/javascript"></script>
-  <script src="js/lang/summernote-fr-FR.min.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/navigation.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/system.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/tools.js" type="text/javascript"></script>
-  <script src="js/labels.js" type="text/javascript"></script>
-  <script src="js/waitlist.js" type="text/javascript"></script>
-  <script src="js/creorga.js" type="text/javascript"></script>
-  
-</body>
-</html>
\ No newline at end of file
diff --git a/modules/waitlist/waitlist.js b/modules/waitlist/waitlist.js
deleted file mode 100644
index 72941a4..0000000
--- a/modules/waitlist/waitlist.js
+++ /dev/null
@@ -1,206 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg )
-
-var pconfig = {};
-var wh= window.innerHeight-130;
-var delwl = null;
-var tblwaitlist = null;
-
-function initdata(){
-  load_helpers();
-  var pdata = apppref.getpreference("pageconfig.waitlist");
-  if (pdata != '') {
-    pconfig = JSON.parse(pdata);
-  }
-  if (!pconfig.printlayout) {
-    pconfig.printlayout = 'list';
-    apppref.setpreference("pageconfig.waitlist",pconfig);
-  }
-
-  loadtextareas(200);
-  set_infoheader("");
-  load_waitlist_table();
-  
-}
-
-//$('#tbl_waitlist').on( 'search.dt', function () {
-//  pconfig.filter = tblwaitlist.api().search();
-//  apppref.setpreference("pageconfig.waitlist",pconfig);
-//} );
-
-$('#tbl_waitlist').on( 'order.dt', function () {
-  pconfig.order= tblwaitlist.fnSettings().aaSorting;
-  apppref.setpreference("pageconfig.waitlist",pconfig);
-} );
-
-function load_waitlist_table(){
-  var waitlistsql = "select uuid, '<span style=\"display:none\">' || strftime('%Y-%m-%d',waitdate) || '</span>' || strftime('%d.%m.%Y',waitdate) as waitdate, name,phone, email, age, note FROM waitlist order by waitdate;";
-  var headerdata = [];
-  headerdata = getlabelswithkey("act,waitdate,contactinfo,childinfo");
-
-  var waitlistdata = appdb.dbquery(waitlistsql);
-  $("#tbl_waitlist").html("");
-  var tblheader = '<tr>';
-  for (var h in headerdata){
-    if ((headerdata[h].keyname == 'act') && (headerdata[h].class.indexOf('action1btn') == -1)){
-      headerdata[h].class +=" action1btn";
-    }
-    tblheader += '<th class="' + headerdata[h].class +'">'+ headerdata[h].title+'</th>';
-
-  }
-  tblheader += '</tr>';
-  tblacc = null;
-  $("#tbl_waitlist").append("<thead>" + tblheader + "</thead>");
-  $("#tbl_waitlist").append("<tbody>");
-  for (var i in waitlistdata.sqldata){
-    var row = waitlistdata.sqldata[i];
-        var tr = '<tr><td class="noprint" style="width: 170px;"><button type="button" class="btn btn-primary" onclick="dlg_waitlist({\'uuid\':\'' +row.uuid + '\'},\'upd\');" title="editer"><span class="glyphicon glyphicon-pencil"></span></button>'+
-        '<button type="button" class="btn btn-danger" onclick="dlg_waitlist({\'uuid\':\'' +row. uuid + '\'},\'del\');" title="supprimer"><span class="glyphicon glyphicon-remove"></span></button>'+
-        '<button type="button" class="btn btn-primary" onclick="add_child(\'' + row.uuid + '\');" title="ajouter enfant"><span class="glyphicons glyphicons-child"></span><span class="glyphicons glyphicons-plus"></span></button></td>';
-        tr += '<td style="width: 100px;">' + row.waitdate + '</td>';
-        tr += '<td style="width: 300px;">' + ((row.name !=='')?row.name + '<br/>':'')+((row.phone !== '')?row.phone + '<br/>':'')+row.email + '</td>';
-        tr += '<td>' + ((row.age !== '')?row.age+ '<br/>':'')  + htmlUnescape(row.note) +  '</td></tr>';
-        $("#tbl_waitlist").append(tr);
-
-    }
-    
-  $("#tbl_waitlist").append("</tbody>");
-  tblwaitlist = $("#tbl_waitlist").dataTable({
-    "language": {
-      "url": "js/locale/datatable_fr.json"
-    },
-
-    "paging": false,
-    "ordering": true,
-    "scrollY": wh + "px",
-    "scrollCollapse": true,
-    "info": true,
-    "filter": true,
-    "destroy": true
-  });
-//  if (pconfig.filter) {
-//    tblwaitlist.fnFilter(pconfig.filter);
-//  }
-  if (pconfig.order) {
-    //dump(JSON.stringify(pconfig.order) + "\n");
-    tblwaitlist.fnSort(pconfig.order);
-  } else {
-    pconfig.order = [[1,"asc"]];
-    tblwaitlist.fnSort(pconfig.order);
-  }
-}
-
-function dlg_waitlist(uuid,type){
-      if ((type == 'upd') || (type == 'ins')) {
-
-        var wlsql = "SELECT  '0' as uuid,strftime('%d.%m.%Y',date('now')) as waitdate, '' as name, '' as phone, '' as email, ''as age, '' as note FROM waitlist LIMIT 1;";
-        if (type == 'upd') {
-
-          wlsql = "SELECT uuid, strftime('%d.%m.%Y',date(waitdate)) as waitdate, name, phone, email, age, note FROM waitlist  where uuid='"+uuid.uuid+"';";
-        }
-        var wldata = appdb.dbquery(wlsql);
-        
-        wldata = wldata.sqldata[0];
-        for (var w in wldata){
-          if ($("#frmeditwaitlist #" +w)) { 
-            if ($("#frmeditwaitlist #"+w).prop("tagName") === "TEXTAREA"){
-              $("#frmeditwaitlist #"+w).summernote('code',htmlUnescape(wldata[w]));
-            }
-            else {
-              $("#frmeditwaitlist #"+w).val(wldata[w]);
-            }
-          }
-        }
-        $("#edit_waitlist").modal('show');
-      }else if (type == 'del') {
-        //dump("UUID to delete: " + JSON.stringify(uuid) + "\n");
-        delwl = uuid.uuid;
-        confirm_delete_waitlist();
-      }
-    }
-    
-  function confirm_delete_waitlist(){
-
-        $("#confirm_delete_waitlist").modal('show');
-        return false;
-      }
-  
-  function delete_waitlist(){
-        
-        var delsql = "DELETE FROM waitlist where uuid='"+delwl +"';";
-        //dump(JSON.stringify(delwl) + " - " + delsql + "\n");
-        appdb.dbexec(delsql);
-        delwl =null;
-        load_waitlist_table();
-
-        $("#confirm_delete_waitlist").modal('hide');
-        
-        return false;
-        }
-  
-   function save_waitlist(){
-        var sql1 = new Array();
-        var sql2 = new Array();
-        var type = 'ins';
-        var cuuid = "";
-        if ($("#frmeditwaitlist #uuid").val() != 0) {
-          type = 'upd';
-          cuuid = $("#frmeditwaitlist #uuid").val();
-        }
-        $("#frmeditwaitlist :input").each(function(){
-          var input = $(this);
-          if (input.attr("id")){
-            if (type == 'ins') {
-              sql1.push('"' + input.attr("id") + '"');
-              if (input.attr("id") == 'uuid') {
-                if (input.val() == "" || input.val() == "0") {
-                  sql2.push("'" + appdb.generate_uuid()+"'");
-                }
-                else {
-                  sql2.push("'" + input.val()+"'");
-                }
-              } else {
-                var ival = encodeparam(input.val(),input.attr('type'));
-                sql2.push(ival);
-              }
-            }else {
-              if (input.attr("id") != 'uuid') {
-                var ival = encodeparam(input.val(),input.attr('type'));
-                sql2.push('"' + input.attr("id") +'"='+ ival);
-              }
-            }
-
-           
-          }
-
-        });
-        var xsql = "";
-        if (type == 'upd') {
-          xsql = "UPDATE waitlist SET "+sql2.join(',')+" where \"uuid\"='" + cuuid +"';";
-        }else {
-          xsql = "INSERT INTO waitlist ("+sql1.join(',')+") VALUES ("+sql2.join(',')+");"; 
-        }
-        
-        appdb.dbexec(xsql);
-        load_waitlist_table();
-        $("#frmeditwaitlist #uuid").val("0");
-        $("#edit_waitlist").modal('hide');
-      }
-
-function print_list(){
-  globelreq.send_request({page:'preview2',data:{page: 'waitlist'}});
-}
-
-function add_child(uuid){
-var newuuid = appdb.generate_uuid();
- var wlsql = "SELECT uuid, name, phone, email, age, note FROM waitlist  where uuid='"+uuid+"';";
-  var wldata = appdb.dbquery(wlsql);
-  appdb.dbexec("insert into childs (uuid,birthday,entrydate,leavedate,remark) VALUES ('" + newuuid + "',date('now','-2 months'),date('now'),date('now'),'"+ appdb.strreplace(wldata.sqldata[0].name + '<br/>' + wldata.sqldata[0].phone + '<br/>' + wldata.sqldata[0].email+  '<br/>' + wldata.sqldata[0].age + '<br/>' +htmlUnescape(wldata.sqldata[0].note)) +"');");
-  appdb.dbexec("DELETE FROM waitlist where waitlist='"+ uuid +"';");
-  globelreq.send_request({
-    page: 'child',
-    data: {
-      "uuid": newuuid
-    },
-    header: 'Enfant'
-  });
-}
\ No newline at end of file
diff --git a/renderer.js b/renderer.js
new file mode 100644
index 0000000..25583a8
--- /dev/null
+++ b/renderer.js
@@ -0,0 +1,71 @@
+const { dialog } = require('electron').remote;
+const fs = require('fs'); 
+const os = require('os');
+var usersystem = {
+    profilepath: function(){
+        var ppath="";
+        if (os.platform() == "darwin"){
+            ppath = os.homedir() + '/Library/Application Support/invoicejournal/';
+        } else if (os.platform() == "Win32") {
+            ppath = os.homedir() + '/AppData/Roaming/invoicejournal/';
+        }
+        return ppath;
+    },
+    selectfile: function(dlgtitle,lastpath,filefilters=null){
+        return dialog.showOpenDialog({title: dlgtitle,defaultPath: lastpath, filters: filefilters, properties: ['openFile'] });
+    },
+    selectdir: function(dlgtitle,lastpath){
+        return dialog.showOpenDialog({title: dlgtitle,defaultPath: lastpath, filters: filefilters, properties: ['openDirectory'] });
+    },
+    showMessage: function(msgTitle,msg,msgdetail,msgtype,msgButtons=["OK"],defautlbtnid=0,cancelbtnid){
+        return dialog.showMessageBox({type: msgtype, //
+                                    title: msgTitle,
+                                    buttons:msgButtons,
+                                    message: msg, 
+                                    detail: msgdetail,
+                                    defaultId: defautlbtnid,
+                                cancelId: cancelbtnid});
+    },
+    showError: function(errtitle,errmsg){
+        dialog.showErrorBox(errtitle, errmsg);
+    },
+    setPreference: function(key,data){
+        //console.log("save preferences to: " + this.profilepath()  + key + ".json");
+        if ((typeof data == 'object') || (typeof data == 'array')){
+            data = JSON.stringify(data);
+        }
+        var result = fs.writeFileSync(this.profilepath()  + key + ".json", data);
+        return result;
+    },
+    getPreference: function(key){
+        var data = null;
+        if (fs.existsSync(this.profilepath()  + key + ".json")){
+            console.log("Read Key:" + key);
+            var data = fs.readFileSync(this.profilepath()  + key + ".json", 'utf-8');
+            if (data.startsWith("{") || data.startsWith("[")){
+                data = JSON.parse(data);
+            }
+            return data;
+        }
+        return data;
+    },
+    getLocalDataSets: function(){
+        var datasets =[];
+        var files = fs.readdirSync(this.profilepath());
+        files.forEach(function(file) {
+            if (file.match('db\..*\.json')){
+                datasets.push(file.replace('.json',''));
+            }
+        });
+        return datasets;
+    },
+    getsysinfo: function(){
+        return {
+            "hostname": os.hostname(),
+            "userdir": os.homedir(),
+            "platform": os.platform(),
+            "userinfo":os.userInfo()
+        }
+    }
+}
+
-- 
2.39.5